dbms: removed useless code [#METR-16739].

2024-11-21 15:12:02 +00:00 · 2015-06-08 23:22:02 +03:00 · 2015-06-08 23:22:02 +03:00 · c94bd2fc09
commit c94bd2fc09
parent 0b3c071eb9
41 changed files with 43 additions and 53 deletions
--- a/dbms/include/DB/DataStreams/AddingConstColumnBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/AddingConstColumnBlockInputStream.h
@ -25,7 +25,7 @@ public:
 		children.push_back(input_);
 	}

-	String getName() const override { return "AddingConstColumnBlockInputStream"; }
+	String getName() const override { return "AddingConstColumn"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/AddingDefaultBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/AddingDefaultBlockInputStream.h
@ -35,7 +35,7 @@ public:
 	{
 	}

-	String getName() const override { return "AddingDefaultBlockInputStream"; }
+	String getName() const override { return "AddingDefault"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/AggregatingBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/AggregatingBlockInputStream.h
@ -32,7 +32,7 @@ public:
 		children.push_back(input_);
 	}

-	String getName() const override { return "AggregatingBlockInputStream"; }
+	String getName() const override { return "Aggregating"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/AggregatingSortedBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/AggregatingSortedBlockInputStream.h
@ -26,7 +26,7 @@ public:
 	{
 	}

-	String getName() const override { return "AggregatingSortedBlockInputStream"; }
+	String getName() const override { return "AggregatingSorted"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/AsynchronousBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/AsynchronousBlockInputStream.h
@ -25,7 +25,7 @@ public:
 		children.push_back(in_);
 	}

-	String getName() const override { return "AsynchronousBlockInputStream"; }
+	String getName() const override { return "Asynchronous"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/CollapsingFinalBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/CollapsingFinalBlockInputStream.h
@ -23,7 +23,7 @@ public:

 	~CollapsingFinalBlockInputStream();

-	String getName() const override { return "CollapsingFinalBlockInputStream"; }
+	String getName() const override { return "CollapsingFinal"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/CollapsingSortedBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/CollapsingSortedBlockInputStream.h
@ -30,7 +30,7 @@ public:
 	{
 	}

-	String getName() const override { return "CollapsingSortedBlockInputStream"; }
+	String getName() const override { return "CollapsingSorted"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/ConcatBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/ConcatBlockInputStream.h
@ -22,7 +22,7 @@ public:
 		current_stream = children.begin();
 	}

-	String getName() const override { return "ConcatBlockInputStream"; }
+	String getName() const override { return "Concat"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/CreatingSetsBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/CreatingSetsBlockInputStream.h
@ -28,7 +28,7 @@ public:
 		children.push_back(input);
 	}

-	String getName() const override { return "CreatingSetsBlockInputStream"; }
+	String getName() const override { return "CreatingSets"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/DistinctBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/DistinctBlockInputStream.h
@ -20,7 +20,7 @@ public:
 	/// Пустой columns_ значит все столбцы.
 	DistinctBlockInputStream(BlockInputStreamPtr input_, const Limits & limits, size_t limit_, Names columns_);

-	String getName() const override { return "DistinctBlockInputStream"; }
+	String getName() const override { return "Distinct"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/ExpressionBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/ExpressionBlockInputStream.h
@ -26,7 +26,7 @@ public:
 		children.push_back(input_);
 	}

-	String getName() const override { return "ExpressionBlockInputStream"; }
+	String getName() const override { return "Expression"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/FilterBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/FilterBlockInputStream.h
@ -22,7 +22,7 @@ public:
 	FilterBlockInputStream(BlockInputStreamPtr input_, ssize_t filter_column_);
 	FilterBlockInputStream(BlockInputStreamPtr input_, const String & filter_column_name_);

-	String getName() const override { return "FilterBlockInputStream"; }
+	String getName() const override { return "Filter"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/IBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/IBlockInputStream.h
@ -51,7 +51,6 @@ public:
 	/** Для вывода дерева преобразований потока данных (плана выполнения запроса).
 	  */
 	virtual String getName() const = 0;
-	virtual String getShortName() const;	/// То же самое, но без BlockInputStream на конце.

 	/** Уникальный идентификатор части конвейера выполнения запроса.
 	  * Источники с одинаковым идентификатором считаются идентичными
--- a/dbms/include/DB/DataStreams/LazyBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/LazyBlockInputStream.h
@ -18,7 +18,7 @@ public:
 	LazyBlockInputStream(Generator generator_)
 		: generator(generator_) {}

-	String getName() const override { return "LazyBlockInputStream"; }
+	String getName() const override { return "Lazy"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/LimitBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/LimitBlockInputStream.h
@ -18,7 +18,7 @@ class LimitBlockInputStream : public IProfilingBlockInputStream
 public:
 	LimitBlockInputStream(BlockInputStreamPtr input_, size_t limit_, size_t offset_ = 0);

-	String getName() const override { return "LimitBlockInputStream"; }
+	String getName() const override { return "Limit"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/MaterializingBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/MaterializingBlockInputStream.h
@ -18,7 +18,7 @@ public:
 		children.push_back(input_);
 	}

-	String getName() const override { return "MaterializingBlockInputStream"; }
+	String getName() const override { return "Materializing"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/MergeSortingBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/MergeSortingBlockInputStream.h
@ -31,7 +31,7 @@ public:
 	MergeSortingBlocksBlockInputStream(Blocks & blocks_, SortDescription & description_,
 		size_t max_merged_block_size_, size_t limit_ = 0);

-	String getName() const override { return "MergeSortingBlocksBlockInputStream"; }
+	String getName() const override { return "MergeSortingBlocks"; }
 	String getID() const override { return getName(); }

 protected:
@ -73,7 +73,7 @@ public:
 		children.push_back(input_);
 	}

-	String getName() const override { return "MergeSortingBlockInputStream"; }
+	String getName() const override { return "MergeSorting"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/MergingAggregatedBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/MergingAggregatedBlockInputStream.h
@ -24,7 +24,7 @@ public:
 		children.push_back(input_);
 	}

-	String getName() const override { return "MergingAggregatedBlockInputStream"; }
+	String getName() const override { return "MergingAggregated"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/MergingSortedBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/MergingSortedBlockInputStream.h
@ -26,7 +26,7 @@ public:
 		children.insert(children.end(), inputs_.begin(), inputs_.end());
 	}

-	String getName() const override { return "MergingSortedBlockInputStream"; }
+	String getName() const override { return "MergingSorted"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/NativeBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/NativeBlockInputStream.h
@ -18,7 +18,7 @@ public:
 	NativeBlockInputStream(ReadBuffer & istr_, UInt64 server_revision_ = 0)
 		: istr(istr_), server_revision(server_revision_) {}

-	String getName() const override { return "NativeBlockInputStream"; }
+	String getName() const override { return "Native"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/NullAndDoCopyBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/NullAndDoCopyBlockInputStream.h
@ -22,7 +22,7 @@ public:
 		children.push_back(input_);
 	}

-	String getName() const override { return "NullAndDoCopyBlockInputStream"; }
+	String getName() const override { return "NullAndDoCopy"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/NullBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/NullBlockInputStream.h
@ -12,7 +12,7 @@ class NullBlockInputStream : public IBlockInputStream
 {
 public:
 	Block read() override { return Block(); }
-	String getName() const override { return "NullBlockInputStream"; }
+	String getName() const override { return "Null"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/OneBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/OneBlockInputStream.h
@ -18,7 +18,7 @@ class OneBlockInputStream : public IProfilingBlockInputStream
 public:
 	OneBlockInputStream(const Block & block_) : block(block_) {}

-	String getName() const override { return "OneBlockInputStream"; }
+	String getName() const override { return "One"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/ParallelAggregatingBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/ParallelAggregatingBlockInputStream.h
@ -34,7 +34,7 @@ public:
 		children.insert(children.end(), inputs.begin(), inputs.end());
 	}

-	String getName() const override { return "ParallelAggregatingBlockInputStream"; }
+	String getName() const override { return "ParallelAggregating"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/PartialSortingBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/PartialSortingBlockInputStream.h
@ -21,7 +21,7 @@ public:
 		children.push_back(input_);
 	}

-	String getName() const override { return "PartialSortingBlockInputStream"; }
+	String getName() const override { return "PartialSorting"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/RemoteBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/RemoteBlockInputStream.h
@ -61,7 +61,7 @@ public:
 	}


-	String getName() const override { return "RemoteBlockInputStream"; }
+	String getName() const override { return "Remote"; }


 	String getID() const override
--- a/dbms/include/DB/DataStreams/RemoveColumnsBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/RemoveColumnsBlockInputStream.h
@ -24,7 +24,7 @@ public:
 		children.push_back(input_);
 	}

-	String getName() const override { return "RemoveColumnsBlockInputStream"; }
+	String getName() const override { return "RemoveColumns"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/SummingSortedBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/SummingSortedBlockInputStream.h
@ -30,7 +30,7 @@ public:
 	{
 	}

-	String getName() const override { return "SummingSortedBlockInputStream"; }
+	String getName() const override { return "SummingSorted"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/TotalsHavingBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/TotalsHavingBlockInputStream.h
@ -28,7 +28,7 @@ public:
 		children.push_back(input_);
 	}

-	String getName() const override { return "TotalsHavingBlockInputStream"; }
+	String getName() const override { return "TotalsHaving"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/DataStreams/UnionBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/UnionBlockInputStream.h
@ -36,7 +36,7 @@ public:
 		children = inputs;
 	}

-	String getName() const override { return "UnionBlockInputStream"; }
+	String getName() const override { return "Union"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/Dictionaries/MySQLBlockInputStream.h
+++ b/dbms/include/DB/Dictionaries/MySQLBlockInputStream.h
@ -90,7 +90,7 @@ public:
 		}
 	}

-	String getName() const override { return "MySQLBlockInputStream"; }
+	String getName() const override { return "MySQL"; }

 	String getID() const override
 	{
--- a/dbms/include/DB/Dictionaries/OwningBufferBlockInputStream.h
+++ b/dbms/include/DB/Dictionaries/OwningBufferBlockInputStream.h
@ -22,7 +22,7 @@ public:
 private:
 	Block readImpl() override { return stream->read(); }

-	String getName() const override { return "OwningBufferBlockInputStream"; }
+	String getName() const override { return "OwningBuffer"; }

 	String getID() const override {  return "OwningBuffer(" + stream->getID() + ")"; }

--- a/dbms/include/DB/Storages/MergeTree/MergeTreeBlockInputStream.h
+++ b/dbms/include/DB/Storages/MergeTree/MergeTreeBlockInputStream.h
@ -100,7 +100,7 @@ public:
 		setTotalRowsApprox(total_rows);
 	}

-	String getName() const override { return "MergeTreeBlockInputStream"; }
+	String getName() const override { return "MergeTree"; }

 	String getID() const override
 	{
--- a/dbms/src/DataStreams/IBlockInputStream.cpp
+++ b/dbms/src/DataStreams/IBlockInputStream.cpp
@ -57,9 +57,9 @@ size_t IBlockInputStream::checkDepthImpl(size_t max_depth, size_t level) const
 void IBlockInputStream::dumpTree(std::ostream & ostr, size_t indent, size_t multiplier)
 {
 	/// Не будем отображать в дереве обёртку потока блоков в AsynchronousBlockInputStream.
-	if (getShortName() != "Asynchronous")
+	if (getName() != "Asynchronous")
 	{
-		ostr << String(indent, ' ') << getShortName();
+		ostr << String(indent, ' ') << getName();
 		if (multiplier > 1)
 			ostr << " × " << multiplier;
 		ostr << std::endl;
@ -91,15 +91,6 @@ void IBlockInputStream::dumpTree(std::ostream & ostr, size_t indent, size_t mult
 }


-String IBlockInputStream::getShortName() const
-{
-	String res = getName();
-	if (0 == strcmp(res.c_str() + res.size() - strlen("BlockInputStream"), "BlockInputStream"))
-		res = res.substr(0, res.size() - strlen("BlockInputStream"));
-	return res;
-}
-
-
 BlockInputStreams IBlockInputStream::getLeaves()
 {
 	BlockInputStreams res;
--- a/dbms/src/DataStreams/IProfilingBlockInputStream.cpp
+++ b/dbms/src/DataStreams/IProfilingBlockInputStream.cpp
@ -19,7 +19,7 @@ Block IProfilingBlockInputStream::read()
 	if (!info.started)
 	{
 		info.total_stopwatch.start();
-		info.stream_name = getShortName();
+		info.stream_name = getName();

 		for (const auto & child : children)
 			if (const IProfilingBlockInputStream * p_child = dynamic_cast<const IProfilingBlockInputStream *>(&*child))
@ -43,7 +43,7 @@ Block IProfilingBlockInputStream::read()
 		Poco::ScopedLock<Poco::FastMutex> lock(mutex);

 		std::cerr << std::endl;
-		std::cerr << "[ " << Poco::ThreadNumber::get() << " ]\t" << getShortName() << std::endl;
+		std::cerr << "[ " << Poco::ThreadNumber::get() << " ]\t" << getName() << std::endl;
 		std::cerr << "[ " << Poco::ThreadNumber::get() << " ]\t";

 		for (size_t i = 0; i < res.columns(); ++i)
--- a/dbms/src/Interpreters/Join.cpp
+++ b/dbms/src/Interpreters/Join.cpp
@ -723,7 +723,7 @@ public:
 	{
 	}

-	String getName() const override { return "NonJoinedBlockInputStream"; }
+	String getName() const override { return "NonJoined"; }

 	String getID() const override
 	{
--- a/dbms/src/Storages/StorageBuffer.cpp
+++ b/dbms/src/Storages/StorageBuffer.cpp
@ -43,7 +43,7 @@ public:
 	BufferBlockInputStream(const Names & column_names_, StorageBuffer::Buffer & buffer_)
 		: column_names(column_names_.begin(), column_names_.end()), buffer(buffer_) {}

-	String getName() const { return "BufferBlockInputStream"; }
+	String getName() const { return "Buffer"; }

 	String getID() const
 	{
--- a/dbms/src/Storages/StorageLog.cpp
+++ b/dbms/src/Storages/StorageLog.cpp
@ -46,7 +46,7 @@ public:
 		: block_size(block_size_), column_names(column_names_), storage(storage_),
 		mark_number(mark_number_), rows_limit(rows_limit_), current_mark(mark_number_), max_read_buffer_size(max_read_buffer_size_) {}

-	String getName() const { return "LogBlockInputStream"; }
+	String getName() const { return "Log"; }

 	String getID() const
 	{
--- a/dbms/src/Storages/StorageMemory.cpp
+++ b/dbms/src/Storages/StorageMemory.cpp
@ -20,7 +20,7 @@ public:
 	MemoryBlockInputStream(const Names & column_names_, BlocksList::iterator begin_, BlocksList::iterator end_)
 		: column_names(column_names_), begin(begin_), end(end_), it(begin) {}

-	String getName() const { return "MemoryBlockInputStream"; }
+	String getName() const { return "Memory"; }

 	String getID() const
 	{
--- a/dbms/src/Storages/StorageSystemNumbers.cpp
+++ b/dbms/src/Storages/StorageSystemNumbers.cpp
@ -19,7 +19,7 @@ public:
 	NumbersBlockInputStream(size_t block_size_, size_t offset_, size_t step_)
 		: block_size(block_size_), next(offset_), step(step_) {}

-	String getName() const { return "NumbersBlockInputStream"; }
+	String getName() const { return "Numbers"; }
 	String getID() const { return "Numbers"; }

 protected:
--- a/dbms/src/Storages/StorageTinyLog.cpp
+++ b/dbms/src/Storages/StorageTinyLog.cpp
@ -42,7 +42,7 @@ public:
 	TinyLogBlockInputStream(size_t block_size_, const Names & column_names_, StorageTinyLog & storage_, size_t max_read_buffer_size_)
 		: block_size(block_size_), column_names(column_names_), storage(storage_), max_read_buffer_size(max_read_buffer_size_) {}

-	String getName() const { return "TinyLogBlockInputStream"; }
+	String getName() const { return "TinyLog"; }

 	String getID() const;