diff --git a/dbms/src/Core/iostream_debug_helpers.cpp b/dbms/src/Core/iostream_debug_helpers.cpp index 3e29ff14e85..57a3d215b69 100644 --- a/dbms/src/Core/iostream_debug_helpers.cpp +++ b/dbms/src/Core/iostream_debug_helpers.cpp @@ -18,7 +18,7 @@ namespace DB std::ostream & operator<<(std::ostream & stream, const IBlockInputStream & what) { - stream << "IBlockInputStream(id = " << what.getID() << ", name = " << what.getName() << ")"; + stream << "IBlockInputStream(name = " << what.getName() << ")"; //what.dumpTree(stream); // todo: set const return stream; } diff --git a/dbms/src/DataStreams/AddingConstColumnBlockInputStream.h b/dbms/src/DataStreams/AddingConstColumnBlockInputStream.h index a62e881e606..e22dd7f4310 100644 --- a/dbms/src/DataStreams/AddingConstColumnBlockInputStream.h +++ b/dbms/src/DataStreams/AddingConstColumnBlockInputStream.h @@ -24,13 +24,6 @@ public: String getName() const override { return "AddingConstColumn"; } - String getID() const override - { - std::stringstream res; - res << "AddingConstColumn(" << children.back()->getID() << ")"; - return res.str(); - } - Block getHeader() const override { Block res = children.back()->getHeader(); diff --git a/dbms/src/DataStreams/AggregatingBlockInputStream.h b/dbms/src/DataStreams/AggregatingBlockInputStream.h index 3e986ab15bd..a28814dcab8 100644 --- a/dbms/src/DataStreams/AggregatingBlockInputStream.h +++ b/dbms/src/DataStreams/AggregatingBlockInputStream.h @@ -30,13 +30,6 @@ public: String getName() const override { return "Aggregating"; } - String getID() const override - { - std::stringstream res; - res << "Aggregating(" << children.back()->getID() << ", " << aggregator.getID() << ")"; - return res.str(); - } - Block getHeader() const override; protected: diff --git a/dbms/src/DataStreams/AggregatingSortedBlockInputStream.h b/dbms/src/DataStreams/AggregatingSortedBlockInputStream.h index 4f8b10c102f..e428b3b7e20 100644 --- a/dbms/src/DataStreams/AggregatingSortedBlockInputStream.h +++ b/dbms/src/DataStreams/AggregatingSortedBlockInputStream.h @@ -28,23 +28,6 @@ public: String getName() const override { return "AggregatingSorted"; } - String getID() const override - { - std::stringstream res; - res << "AggregatingSorted(inputs"; - - for (size_t i = 0; i < children.size(); ++i) - res << ", " << children[i]->getID(); - - res << ", description"; - - for (size_t i = 0; i < description.size(); ++i) - res << ", " << description[i].getID(); - - res << ")"; - return res.str(); - } - bool isGroupedOutput() const override { return true; } bool isSortedOutput() const override { return true; } diff --git a/dbms/src/DataStreams/AsynchronousBlockInputStream.h b/dbms/src/DataStreams/AsynchronousBlockInputStream.h index 5c42d451214..0a80628cf2a 100644 --- a/dbms/src/DataStreams/AsynchronousBlockInputStream.h +++ b/dbms/src/DataStreams/AsynchronousBlockInputStream.h @@ -35,13 +35,6 @@ public: String getName() const override { return "Asynchronous"; } - String getID() const override - { - std::stringstream res; - res << "Asynchronous(" << children.back()->getID() << ")"; - return res.str(); - } - void readPrefix() override { /// Do not call `readPrefix` on the child, so that the corresponding actions are performed in a separate thread. diff --git a/dbms/src/DataStreams/BlockExtraInfoInputStream.h b/dbms/src/DataStreams/BlockExtraInfoInputStream.h index f20b8f2e8fb..6c6bd793f56 100644 --- a/dbms/src/DataStreams/BlockExtraInfoInputStream.h +++ b/dbms/src/DataStreams/BlockExtraInfoInputStream.h @@ -24,13 +24,6 @@ public: String getName() const override { return "BlockExtraInfoInput"; } - String getID() const override - { - std::stringstream res; - res << "BlockExtraInfoInput(" << children.back()->getID() << ")"; - return res.str(); - } - Block getHeader() const override { return children.back()->getHeader(); } protected: diff --git a/dbms/src/DataStreams/BlockInputStreamFromRowInputStream.h b/dbms/src/DataStreams/BlockInputStreamFromRowInputStream.h index cc4dbee0cac..0ab725be9a0 100644 --- a/dbms/src/DataStreams/BlockInputStreamFromRowInputStream.h +++ b/dbms/src/DataStreams/BlockInputStreamFromRowInputStream.h @@ -29,13 +29,6 @@ public: String getName() const override { return "BlockInputStreamFromRowInputStream"; } - String getID() const override - { - std::stringstream res; - res << this; - return res.str(); - } - RowInputStreamPtr & getRowInput() { return row_input; } Block getHeader() const override { return sample; } diff --git a/dbms/src/DataStreams/BlocksListBlockInputStream.h b/dbms/src/DataStreams/BlocksListBlockInputStream.h index b477e34d3ca..6c8852de4a3 100644 --- a/dbms/src/DataStreams/BlocksListBlockInputStream.h +++ b/dbms/src/DataStreams/BlocksListBlockInputStream.h @@ -22,13 +22,6 @@ public: String getName() const override { return "BlocksList"; } - String getID() const override - { - std::stringstream res; - res << this; - return res.str(); - } - protected: Block readImpl() override { diff --git a/dbms/src/DataStreams/CastTypeBlockInputStream.cpp b/dbms/src/DataStreams/CastTypeBlockInputStream.cpp index e792fc8afa4..9dbd0962c93 100644 --- a/dbms/src/DataStreams/CastTypeBlockInputStream.cpp +++ b/dbms/src/DataStreams/CastTypeBlockInputStream.cpp @@ -20,11 +20,6 @@ String CastTypeBlockInputStream::getName() const return "CastType"; } -String CastTypeBlockInputStream::getID() const -{ - return "CastType(" + children.back()->getID() + ")"; -} - Block CastTypeBlockInputStream::readImpl() { Block block = children.back()->read(); diff --git a/dbms/src/DataStreams/CastTypeBlockInputStream.h b/dbms/src/DataStreams/CastTypeBlockInputStream.h index f788254323e..b92a7ffa31f 100644 --- a/dbms/src/DataStreams/CastTypeBlockInputStream.h +++ b/dbms/src/DataStreams/CastTypeBlockInputStream.h @@ -17,8 +17,6 @@ public: String getName() const override; - String getID() const override; - Block getHeader() const override { return ref_definition; } protected: diff --git a/dbms/src/DataStreams/CollapsingFinalBlockInputStream.h b/dbms/src/DataStreams/CollapsingFinalBlockInputStream.h index a7938b498f0..db06a2aa9d3 100644 --- a/dbms/src/DataStreams/CollapsingFinalBlockInputStream.h +++ b/dbms/src/DataStreams/CollapsingFinalBlockInputStream.h @@ -28,23 +28,6 @@ public: String getName() const override { return "CollapsingFinal"; } - String getID() const override - { - std::stringstream res; - res << "CollapsingFinal(inputs"; - - for (size_t i = 0; i < children.size(); ++i) - res << ", " << children[i]->getID(); - - res << ", description"; - - for (size_t i = 0; i < description.size(); ++i) - res << ", " << description[i].getID(); - - res << ", sign_column, " << sign_column_name << ")"; - return res.str(); - } - bool isSortedOutput() const override { return true; } const SortDescription & getSortDescription() const override { return description; } diff --git a/dbms/src/DataStreams/CollapsingSortedBlockInputStream.h b/dbms/src/DataStreams/CollapsingSortedBlockInputStream.h index 9d9043b30c5..7280dda02b1 100644 --- a/dbms/src/DataStreams/CollapsingSortedBlockInputStream.h +++ b/dbms/src/DataStreams/CollapsingSortedBlockInputStream.h @@ -33,23 +33,6 @@ public: String getName() const override { return "CollapsingSorted"; } - String getID() const override - { - std::stringstream res; - res << "CollapsingSorted(inputs"; - - for (size_t i = 0; i < children.size(); ++i) - res << ", " << children[i]->getID(); - - res << ", description"; - - for (size_t i = 0; i < description.size(); ++i) - res << ", " << description[i].getID(); - - res << ", sign_column, " << sign_column << ")"; - return res.str(); - } - protected: /// Can return 1 more records than max_block_size. Block readImpl() override; diff --git a/dbms/src/DataStreams/ColumnGathererStream.cpp b/dbms/src/DataStreams/ColumnGathererStream.cpp index 81a9d3348b0..ba4107f7e8b 100644 --- a/dbms/src/DataStreams/ColumnGathererStream.cpp +++ b/dbms/src/DataStreams/ColumnGathererStream.cpp @@ -30,19 +30,6 @@ ColumnGathererStream::ColumnGathererStream( } -String ColumnGathererStream::getID() const -{ - std::stringstream res; - - res << getName() << "("; - for (size_t i = 0; i < children.size(); ++i) - res << (i == 0 ? "" : ", " ) << children[i]->getID(); - res << ")"; - - return res.str(); -} - - void ColumnGathererStream::init() { sources.reserve(children.size()); @@ -107,13 +94,13 @@ void ColumnGathererStream::fetchNewBlock(Source & source, size_t source_num) } catch (Exception & e) { - e.addMessage("Cannot fetch required block. Stream " + children[source_num]->getID() + ", part " + toString(source_num)); + e.addMessage("Cannot fetch required block. Stream " + children[source_num]->getName() + ", part " + toString(source_num)); throw; } if (0 == source.size) { - throw Exception("Fetched block is empty. Stream " + children[source_num]->getID() + ", part " + toString(source_num), + throw Exception("Fetched block is empty. Stream " + children[source_num]->getName() + ", part " + toString(source_num), ErrorCodes::RECEIVED_EMPTY_DATA); } } diff --git a/dbms/src/DataStreams/ColumnGathererStream.h b/dbms/src/DataStreams/ColumnGathererStream.h index 08ef0f75839..101e8fdccf3 100644 --- a/dbms/src/DataStreams/ColumnGathererStream.h +++ b/dbms/src/DataStreams/ColumnGathererStream.h @@ -61,8 +61,6 @@ public: String getName() const override { return "ColumnGatherer"; } - String getID() const override; - Block readImpl() override; void readSuffixImpl() override; diff --git a/dbms/src/DataStreams/ConcatBlockInputStream.h b/dbms/src/DataStreams/ConcatBlockInputStream.h index 50135e8c1ac..fafcbc6950c 100644 --- a/dbms/src/DataStreams/ConcatBlockInputStream.h +++ b/dbms/src/DataStreams/ConcatBlockInputStream.h @@ -22,25 +22,6 @@ public: String getName() const override { return "Concat"; } - String getID() const override - { - std::stringstream res; - res << "Concat("; - - Strings children_ids(children.size()); - for (size_t i = 0; i < children.size(); ++i) - children_ids[i] = children[i]->getID(); - - /// Let's assume that the order of concatenation of blocks does not matter. - std::sort(children_ids.begin(), children_ids.end()); - - for (size_t i = 0; i < children_ids.size(); ++i) - res << (i == 0 ? "" : ", ") << children_ids[i]; - - res << ")"; - return res.str(); - } - Block getHeader() const override { return children.at(0)->getHeader(); } protected: diff --git a/dbms/src/DataStreams/CreatingSetsBlockInputStream.h b/dbms/src/DataStreams/CreatingSetsBlockInputStream.h index 502b13cab17..85088d1d8fc 100644 --- a/dbms/src/DataStreams/CreatingSetsBlockInputStream.h +++ b/dbms/src/DataStreams/CreatingSetsBlockInputStream.h @@ -35,25 +35,6 @@ public: String getName() const override { return "CreatingSets"; } - String getID() const override - { - std::stringstream res; - res << "CreatingSets("; - - Strings children_ids(children.size()); - for (size_t i = 0; i < children.size(); ++i) - children_ids[i] = children[i]->getID(); - - /// Let's assume that the order of creating sets does not matter. - std::sort(children_ids.begin(), children_ids.end() - 1); - - for (size_t i = 0; i < children_ids.size(); ++i) - res << (i == 0 ? "" : ", ") << children_ids[i]; - - res << ")"; - return res.str(); - } - Block getHeader() const override { return children.back()->getHeader(); } /// Takes `totals` only from the main source, not from subquery sources. diff --git a/dbms/src/DataStreams/DistinctBlockInputStream.cpp b/dbms/src/DataStreams/DistinctBlockInputStream.cpp index f10eda57e05..50949b2f0cc 100644 --- a/dbms/src/DataStreams/DistinctBlockInputStream.cpp +++ b/dbms/src/DataStreams/DistinctBlockInputStream.cpp @@ -18,13 +18,6 @@ DistinctBlockInputStream::DistinctBlockInputStream(const BlockInputStreamPtr & i children.push_back(input); } -String DistinctBlockInputStream::getID() const -{ - std::stringstream res; - res << "Distinct(" << children.back()->getID() << ")"; - return res.str(); -} - Block DistinctBlockInputStream::readImpl() { /// Execute until end of stream or until diff --git a/dbms/src/DataStreams/DistinctBlockInputStream.h b/dbms/src/DataStreams/DistinctBlockInputStream.h index e1061f8a010..60a92e0399a 100644 --- a/dbms/src/DataStreams/DistinctBlockInputStream.h +++ b/dbms/src/DataStreams/DistinctBlockInputStream.h @@ -22,8 +22,6 @@ public: String getName() const override { return "Distinct"; } - String getID() const override; - Block getHeader() const override { return children.at(0)->getHeader(); } protected: diff --git a/dbms/src/DataStreams/DistinctSortedBlockInputStream.cpp b/dbms/src/DataStreams/DistinctSortedBlockInputStream.cpp index 59395d26b23..e9e5d69d047 100644 --- a/dbms/src/DataStreams/DistinctSortedBlockInputStream.cpp +++ b/dbms/src/DataStreams/DistinctSortedBlockInputStream.cpp @@ -19,13 +19,6 @@ DistinctSortedBlockInputStream::DistinctSortedBlockInputStream(const BlockInputS children.push_back(input); } -String DistinctSortedBlockInputStream::getID() const -{ - std::stringstream res; - res << "DistinctSorted(" << children.back()->getID() << ")"; - return res.str(); -} - Block DistinctSortedBlockInputStream::readImpl() { /// Execute until end of stream or until diff --git a/dbms/src/DataStreams/DistinctSortedBlockInputStream.h b/dbms/src/DataStreams/DistinctSortedBlockInputStream.h index c7a3546154b..33c6cef7774 100644 --- a/dbms/src/DataStreams/DistinctSortedBlockInputStream.h +++ b/dbms/src/DataStreams/DistinctSortedBlockInputStream.h @@ -25,8 +25,6 @@ public: String getName() const override { return "DistinctSorted"; } - String getID() const override; - Block getHeader() const override { return children.at(0)->getHeader(); } protected: diff --git a/dbms/src/DataStreams/ExpressionBlockInputStream.cpp b/dbms/src/DataStreams/ExpressionBlockInputStream.cpp index 514d860a022..d274a456c22 100644 --- a/dbms/src/DataStreams/ExpressionBlockInputStream.cpp +++ b/dbms/src/DataStreams/ExpressionBlockInputStream.cpp @@ -13,13 +13,6 @@ ExpressionBlockInputStream::ExpressionBlockInputStream(const BlockInputStreamPtr String ExpressionBlockInputStream::getName() const { return "Expression"; } -String ExpressionBlockInputStream::getID() const -{ - std::stringstream res; - res << "Expression(" << children.back()->getID() << ", " << expression->getID() << ")"; - return res.str(); -} - const Block & ExpressionBlockInputStream::getTotals() { if (IProfilingBlockInputStream * child = dynamic_cast(&*children.back())) diff --git a/dbms/src/DataStreams/ExpressionBlockInputStream.h b/dbms/src/DataStreams/ExpressionBlockInputStream.h index 84a9e9e59e1..a509d1e606e 100644 --- a/dbms/src/DataStreams/ExpressionBlockInputStream.h +++ b/dbms/src/DataStreams/ExpressionBlockInputStream.h @@ -22,7 +22,6 @@ public: ExpressionBlockInputStream(const BlockInputStreamPtr & input, const ExpressionActionsPtr & expression_); String getName() const override; - String getID() const override; const Block & getTotals() override; Block getHeader() const override; diff --git a/dbms/src/DataStreams/FilterBlockInputStream.cpp b/dbms/src/DataStreams/FilterBlockInputStream.cpp index 077d3857058..5bfff19b7a7 100644 --- a/dbms/src/DataStreams/FilterBlockInputStream.cpp +++ b/dbms/src/DataStreams/FilterBlockInputStream.cpp @@ -57,14 +57,6 @@ FilterBlockInputStream::FilterBlockInputStream(const BlockInputStreamPtr & input String FilterBlockInputStream::getName() const { return "Filter"; } -String FilterBlockInputStream::getID() const -{ - std::stringstream res; - res << "Filter(" << children.back()->getID() << ", " << expression->getID() << ", " << filter_column << ")"; - return res.str(); -} - - const Block & FilterBlockInputStream::getTotals() { if (IProfilingBlockInputStream * child = dynamic_cast(&*children.back())) diff --git a/dbms/src/DataStreams/FilterBlockInputStream.h b/dbms/src/DataStreams/FilterBlockInputStream.h index b2ae29d25a2..9cb27d6b1f0 100644 --- a/dbms/src/DataStreams/FilterBlockInputStream.h +++ b/dbms/src/DataStreams/FilterBlockInputStream.h @@ -25,7 +25,6 @@ public: FilterBlockInputStream(const BlockInputStreamPtr & input, const ExpressionActionsPtr & expression_, const String & filter_column_name_); String getName() const override; - String getID() const override; const Block & getTotals() override; Block getHeader() const override; diff --git a/dbms/src/DataStreams/FilterColumnsBlockInputStream.cpp b/dbms/src/DataStreams/FilterColumnsBlockInputStream.cpp index ea39758f098..fa7bb916fe7 100644 --- a/dbms/src/DataStreams/FilterColumnsBlockInputStream.cpp +++ b/dbms/src/DataStreams/FilterColumnsBlockInputStream.cpp @@ -3,18 +3,6 @@ namespace DB { -String FilterColumnsBlockInputStream::getID() const -{ - std::stringstream res; - res << "FilterColumnsBlockInputStream(" << children.back()->getID(); - - for (const auto & it : columns_to_save) - res << ", " << it; - - res << ")"; - return res.str(); -} - Block FilterColumnsBlockInputStream::getHeader() const { Block block = children.back()->getHeader(); diff --git a/dbms/src/DataStreams/FilterColumnsBlockInputStream.h b/dbms/src/DataStreams/FilterColumnsBlockInputStream.h index 68a949e31d4..b2ac83c8fdf 100644 --- a/dbms/src/DataStreams/FilterColumnsBlockInputStream.h +++ b/dbms/src/DataStreams/FilterColumnsBlockInputStream.h @@ -24,8 +24,6 @@ public: return "FilterColumnsBlockInputStream"; } - String getID() const override; - Block getHeader() const override; protected: diff --git a/dbms/src/DataStreams/GraphiteRollupSortedBlockInputStream.h b/dbms/src/DataStreams/GraphiteRollupSortedBlockInputStream.h index c5e85bcf8ae..99d9466408d 100644 --- a/dbms/src/DataStreams/GraphiteRollupSortedBlockInputStream.h +++ b/dbms/src/DataStreams/GraphiteRollupSortedBlockInputStream.h @@ -135,23 +135,6 @@ public: String getName() const override { return "GraphiteRollupSorted"; } - String getID() const override - { - std::stringstream res; - res << "GraphiteRollupSorted(inputs"; - - for (size_t i = 0; i < children.size(); ++i) - res << ", " << children[i]->getID(); - - res << ", description"; - - for (size_t i = 0; i < description.size(); ++i) - res << ", " << description[i].getID(); - - res << ")"; - return res.str(); - } - ~GraphiteRollupSortedBlockInputStream() { if (aggregate_state_created) diff --git a/dbms/src/DataStreams/IBlockInputStream.cpp b/dbms/src/DataStreams/IBlockInputStream.cpp index 27d76576d49..b4cc5444c87 100644 --- a/dbms/src/DataStreams/IBlockInputStream.cpp +++ b/dbms/src/DataStreams/IBlockInputStream.cpp @@ -126,13 +126,5 @@ void IBlockInputStream::getLeavesImpl(BlockInputStreams & res, const BlockInputS (*it)->getLeavesImpl(res, *it); } -/// By default all instances is different streams -String IBlockInputStream::getID() const -{ - std::stringstream res; - res << getName() << "(" << this << ")"; - return res.str(); -}; - } diff --git a/dbms/src/DataStreams/IBlockInputStream.h b/dbms/src/DataStreams/IBlockInputStream.h index 42300c82d9c..77ee6b94157 100644 --- a/dbms/src/DataStreams/IBlockInputStream.h +++ b/dbms/src/DataStreams/IBlockInputStream.h @@ -82,14 +82,6 @@ public: */ virtual String getName() const = 0; - /** The unique identifier of the pipeline part of the query execution. - * Sources with the same identifier are considered identical - * (producing the same data), and can be replaced by one source - * if several queries are executed simultaneously. - * If the source can not be glued together with any other - return the object's address as an identifier. - */ - virtual String getID() const; - /// If this stream generates data in grouped by some keys, return true. virtual bool isGroupedOutput() const { return false; } /// If this stream generates data in order by some keys, return true. diff --git a/dbms/src/DataStreams/InputStreamFromASTInsertQuery.h b/dbms/src/DataStreams/InputStreamFromASTInsertQuery.h index ccd1f3b7ec7..dbcf3799e3e 100644 --- a/dbms/src/DataStreams/InputStreamFromASTInsertQuery.h +++ b/dbms/src/DataStreams/InputStreamFromASTInsertQuery.h @@ -26,7 +26,6 @@ public: void readSuffixImpl() override { return res_stream->readSuffix(); } String getName() const override { return "InputStreamFromASTInsertQuery"; } - String getID() const override { return "InputStreamFromASTInsertQuery(" + toString(std::intptr_t(this)) + ")"; } Block getHeader() const override { return res_stream->getHeader(); } diff --git a/dbms/src/DataStreams/LimitBlockInputStream.h b/dbms/src/DataStreams/LimitBlockInputStream.h index 2715db4c483..9739665243f 100644 --- a/dbms/src/DataStreams/LimitBlockInputStream.h +++ b/dbms/src/DataStreams/LimitBlockInputStream.h @@ -21,13 +21,6 @@ public: String getName() const override { return "Limit"; } - String getID() const override - { - std::stringstream res; - res << "Limit(" << children.back()->getID() << ", " << limit << ", " << offset << ")"; - return res.str(); - } - Block getHeader() const override { return children.at(0)->getHeader(); } protected: diff --git a/dbms/src/DataStreams/MaterializingBlockInputStream.cpp b/dbms/src/DataStreams/MaterializingBlockInputStream.cpp index 264fa1c099f..e0f287d44fa 100644 --- a/dbms/src/DataStreams/MaterializingBlockInputStream.cpp +++ b/dbms/src/DataStreams/MaterializingBlockInputStream.cpp @@ -15,13 +15,6 @@ String MaterializingBlockInputStream::getName() const return "Materializing"; } -String MaterializingBlockInputStream::getID() const -{ - std::stringstream res; - res << "Materializing(" << children.back()->getID() << ")"; - return res.str(); -} - Block MaterializingBlockInputStream::getHeader() const { return materializeBlock(children.back()->getHeader()); diff --git a/dbms/src/DataStreams/MaterializingBlockInputStream.h b/dbms/src/DataStreams/MaterializingBlockInputStream.h index 01e5ae15a1b..dfbad3b14b2 100644 --- a/dbms/src/DataStreams/MaterializingBlockInputStream.h +++ b/dbms/src/DataStreams/MaterializingBlockInputStream.h @@ -12,7 +12,6 @@ class MaterializingBlockInputStream : public IProfilingBlockInputStream public: MaterializingBlockInputStream(const BlockInputStreamPtr & input); String getName() const override; - String getID() const override; Block getHeader() const override; protected: diff --git a/dbms/src/DataStreams/MergeSortingBlockInputStream.h b/dbms/src/DataStreams/MergeSortingBlockInputStream.h index 8a51987808a..613169899d8 100644 --- a/dbms/src/DataStreams/MergeSortingBlockInputStream.h +++ b/dbms/src/DataStreams/MergeSortingBlockInputStream.h @@ -33,7 +33,6 @@ public: size_t max_merged_block_size_, size_t limit_ = 0); String getName() const override { return "MergeSortingBlocks"; } - String getID() const override { return getName(); } bool isGroupedOutput() const override { return true; } bool isSortedOutput() const override { return true; } @@ -82,18 +81,6 @@ public: String getName() const override { return "MergeSorting"; } - String getID() const override - { - std::stringstream res; - res << "MergeSorting(" << children.back()->getID(); - - for (size_t i = 0; i < description.size(); ++i) - res << ", " << description[i].getID(); - - res << ")"; - return res.str(); - } - bool isGroupedOutput() const override { return true; } bool isSortedOutput() const override { return true; } const SortDescription & getSortDescription() const override { return description; } diff --git a/dbms/src/DataStreams/MergingAggregatedBlockInputStream.h b/dbms/src/DataStreams/MergingAggregatedBlockInputStream.h index 1b40f1951cd..b299aff0d1f 100644 --- a/dbms/src/DataStreams/MergingAggregatedBlockInputStream.h +++ b/dbms/src/DataStreams/MergingAggregatedBlockInputStream.h @@ -22,13 +22,6 @@ public: String getName() const override { return "MergingAggregated"; } - String getID() const override - { - std::stringstream res; - res << "MergingAggregated(" << children.back()->getID() << ", " << aggregator.getID() << ")"; - return res.str(); - } - Block getHeader() const override; protected: diff --git a/dbms/src/DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.cpp b/dbms/src/DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.cpp index 25e1b3f648c..56e816cb05a 100644 --- a/dbms/src/DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.cpp +++ b/dbms/src/DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.cpp @@ -96,17 +96,6 @@ Block MergingAggregatedMemoryEfficientBlockInputStream::getHeader() const } -String MergingAggregatedMemoryEfficientBlockInputStream::getID() const -{ - std::stringstream res; - res << "MergingAggregatedMemoryEfficient(" << aggregator.getID(); - for (size_t i = 0, size = children.size(); i < size; ++i) - res << ", " << children.back()->getID(); - res << ")"; - return res.str(); -} - - void MergingAggregatedMemoryEfficientBlockInputStream::readPrefix() { start(); diff --git a/dbms/src/DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.h b/dbms/src/DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.h index 506eb503616..f7b978e9c66 100644 --- a/dbms/src/DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.h +++ b/dbms/src/DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.h @@ -67,8 +67,6 @@ public: String getName() const override { return "MergingAggregatedMemoryEfficient"; } - String getID() const override; - /// Sends the request (initiates calculations) earlier than `read`. void readPrefix() override; diff --git a/dbms/src/DataStreams/MergingSortedBlockInputStream.cpp b/dbms/src/DataStreams/MergingSortedBlockInputStream.cpp index 8ccabeb092b..aee5b34899f 100644 --- a/dbms/src/DataStreams/MergingSortedBlockInputStream.cpp +++ b/dbms/src/DataStreams/MergingSortedBlockInputStream.cpp @@ -24,28 +24,6 @@ MergingSortedBlockInputStream::MergingSortedBlockInputStream( children.insert(children.end(), inputs_.begin(), inputs_.end()); } -String MergingSortedBlockInputStream::getID() const -{ - std::stringstream res; - res << "MergingSorted("; - - Strings children_ids(children.size()); - for (size_t i = 0; i < children.size(); ++i) - children_ids[i] = children[i]->getID(); - - /// The order does not matter. - std::sort(children_ids.begin(), children_ids.end()); - - for (size_t i = 0; i < children_ids.size(); ++i) - res << (i == 0 ? "" : ", ") << children_ids[i]; - - for (size_t i = 0; i < description.size(); ++i) - res << ", " << description[i].getID(); - - res << ")"; - return res.str(); -} - void MergingSortedBlockInputStream::init(Block & header, MutableColumns & merged_columns) { /// Read the first blocks, initialize the queue. diff --git a/dbms/src/DataStreams/MergingSortedBlockInputStream.h b/dbms/src/DataStreams/MergingSortedBlockInputStream.h index 8b0c1d3ac07..a8e0c4bf488 100644 --- a/dbms/src/DataStreams/MergingSortedBlockInputStream.h +++ b/dbms/src/DataStreams/MergingSortedBlockInputStream.h @@ -70,8 +70,6 @@ public: String getName() const override { return "MergingSorted"; } - String getID() const override; - bool isGroupedOutput() const override { return true; } bool isSortedOutput() const override { return true; } const SortDescription & getSortDescription() const override { return description; } diff --git a/dbms/src/DataStreams/NativeBlockInputStream.h b/dbms/src/DataStreams/NativeBlockInputStream.h index 90f6d2b3b39..14ce18347e3 100644 --- a/dbms/src/DataStreams/NativeBlockInputStream.h +++ b/dbms/src/DataStreams/NativeBlockInputStream.h @@ -74,13 +74,6 @@ public: String getName() const override { return "Native"; } - String getID() const override - { - std::stringstream res; - res << this; - return res.str(); - } - static void readData(const IDataType & type, IColumn & column, ReadBuffer & istr, size_t rows, double avg_value_size_hint); Block getHeader() const override; diff --git a/dbms/src/DataStreams/NullAndDoCopyBlockInputStream.h b/dbms/src/DataStreams/NullAndDoCopyBlockInputStream.h index 4a3712b6603..d03996be53f 100644 --- a/dbms/src/DataStreams/NullAndDoCopyBlockInputStream.h +++ b/dbms/src/DataStreams/NullAndDoCopyBlockInputStream.h @@ -28,13 +28,6 @@ public: String getName() const override { return "NullAndDoCopy"; } - String getID() const override - { - std::stringstream res; - res << "copy from " << input->getID(); - return res.str(); - } - Block getHeader() const override { return {}; } protected: diff --git a/dbms/src/DataStreams/NullableAdapterBlockInputStream.cpp b/dbms/src/DataStreams/NullableAdapterBlockInputStream.cpp index 1411ed794f5..60fe4013595 100644 --- a/dbms/src/DataStreams/NullableAdapterBlockInputStream.cpp +++ b/dbms/src/DataStreams/NullableAdapterBlockInputStream.cpp @@ -23,13 +23,6 @@ NullableAdapterBlockInputStream::NullableAdapterBlockInputStream( children.push_back(input); } -String NullableAdapterBlockInputStream::getID() const -{ - std::stringstream res; - res << "NullableAdapterBlockInputStream(" << children.back()->getID() << ")"; - return res.str(); -} - Block NullableAdapterBlockInputStream::readImpl() { Block block = children.back()->read(); diff --git a/dbms/src/DataStreams/NullableAdapterBlockInputStream.h b/dbms/src/DataStreams/NullableAdapterBlockInputStream.h index 3b77135c3fd..47e064ecdf2 100644 --- a/dbms/src/DataStreams/NullableAdapterBlockInputStream.h +++ b/dbms/src/DataStreams/NullableAdapterBlockInputStream.h @@ -22,8 +22,6 @@ public: String getName() const override { return "NullableAdapterBlockInputStream"; } - String getID() const override; - Block getHeader() const override { return header; } protected: diff --git a/dbms/src/DataStreams/OwningBlockInputStream.h b/dbms/src/DataStreams/OwningBlockInputStream.h index 84f00d1c328..5bed4a9f9c3 100644 --- a/dbms/src/DataStreams/OwningBlockInputStream.h +++ b/dbms/src/DataStreams/OwningBlockInputStream.h @@ -27,8 +27,6 @@ private: String getName() const override { return "Owning"; } - String getID() const override { return "Owning(" + stream->getID() + ")"; } - protected: BlockInputStreamPtr stream; std::unique_ptr own; diff --git a/dbms/src/DataStreams/ParallelAggregatingBlockInputStream.cpp b/dbms/src/DataStreams/ParallelAggregatingBlockInputStream.cpp index fdb192d2e02..61da474839e 100644 --- a/dbms/src/DataStreams/ParallelAggregatingBlockInputStream.cpp +++ b/dbms/src/DataStreams/ParallelAggregatingBlockInputStream.cpp @@ -35,26 +35,6 @@ Block ParallelAggregatingBlockInputStream::getHeader() const } -String ParallelAggregatingBlockInputStream::getID() const -{ - std::stringstream res; - res << "ParallelAggregating("; - - Strings children_ids(children.size()); - for (size_t i = 0; i < children.size(); ++i) - children_ids[i] = children[i]->getID(); - - /// Order does not matter. - std::sort(children_ids.begin(), children_ids.end()); - - for (size_t i = 0; i < children_ids.size(); ++i) - res << (i == 0 ? "" : ", ") << children_ids[i]; - - res << ", " << aggregator.getID() << ")"; - return res.str(); -} - - void ParallelAggregatingBlockInputStream::cancel() { bool old_val = false; diff --git a/dbms/src/DataStreams/ParallelAggregatingBlockInputStream.h b/dbms/src/DataStreams/ParallelAggregatingBlockInputStream.h index 4f89ea9bf98..8a3cdc8ea6e 100644 --- a/dbms/src/DataStreams/ParallelAggregatingBlockInputStream.h +++ b/dbms/src/DataStreams/ParallelAggregatingBlockInputStream.h @@ -27,8 +27,6 @@ public: String getName() const override { return "ParallelAggregating"; } - String getID() const override; - void cancel() override; Block getHeader() const override; diff --git a/dbms/src/DataStreams/PartialSortingBlockInputStream.h b/dbms/src/DataStreams/PartialSortingBlockInputStream.h index 7c546f49199..5b5001ce313 100644 --- a/dbms/src/DataStreams/PartialSortingBlockInputStream.h +++ b/dbms/src/DataStreams/PartialSortingBlockInputStream.h @@ -23,18 +23,6 @@ public: String getName() const override { return "PartialSorting"; } - String getID() const override - { - std::stringstream res; - res << "PartialSorting(" << children.back()->getID(); - - for (size_t i = 0; i < description.size(); ++i) - res << ", " << description[i].getID(); - - res << ")"; - return res.str(); - } - bool isGroupedOutput() const override { return true; } bool isSortedOutput() const override { return true; } const SortDescription & getSortDescription() const override { return description; } diff --git a/dbms/src/DataStreams/RemoteBlockInputStream.h b/dbms/src/DataStreams/RemoteBlockInputStream.h index 803aadca2ee..8c3cff4f494 100644 --- a/dbms/src/DataStreams/RemoteBlockInputStream.h +++ b/dbms/src/DataStreams/RemoteBlockInputStream.h @@ -66,13 +66,6 @@ public: String getName() const override { return "Remote"; } - String getID() const override - { - std::stringstream res; - res << this; - return res.str(); - } - BlockExtraInfo getBlockExtraInfo() const override { return multiplexed_connections->getBlockExtraInfo(); diff --git a/dbms/src/DataStreams/RemoveColumnsBlockInputStream.h b/dbms/src/DataStreams/RemoveColumnsBlockInputStream.h index 2be12f9e06d..a8b54962209 100644 --- a/dbms/src/DataStreams/RemoveColumnsBlockInputStream.h +++ b/dbms/src/DataStreams/RemoveColumnsBlockInputStream.h @@ -22,18 +22,6 @@ public: String getName() const override { return "RemoveColumns"; } - String getID() const override - { - std::stringstream res; - res << "RemoveColumns(" << children.back()->getID(); - - for (const auto & it : columns_to_remove) - res << ", " << it; - - res << ")"; - return res.str(); - } - Block getHeader() const override { Block res = children.back()->getHeader(); diff --git a/dbms/src/DataStreams/ReplacingSortedBlockInputStream.h b/dbms/src/DataStreams/ReplacingSortedBlockInputStream.h index 0e7fdadc25a..0ab6b185833 100644 --- a/dbms/src/DataStreams/ReplacingSortedBlockInputStream.h +++ b/dbms/src/DataStreams/ReplacingSortedBlockInputStream.h @@ -24,23 +24,6 @@ public: String getName() const override { return "ReplacingSorted"; } - String getID() const override - { - std::stringstream res; - res << "ReplacingSorted(inputs"; - - for (size_t i = 0; i < children.size(); ++i) - res << ", " << children[i]->getID(); - - res << ", description"; - - for (size_t i = 0; i < description.size(); ++i) - res << ", " << description[i].getID(); - - res << ", version_column, " << version_column << ")"; - return res.str(); - } - protected: /// Can return 1 more records than max_block_size. Block readImpl() override; diff --git a/dbms/src/DataStreams/SquashingBlockInputStream.h b/dbms/src/DataStreams/SquashingBlockInputStream.h index 8a49abc2208..0f9a01d65e8 100644 --- a/dbms/src/DataStreams/SquashingBlockInputStream.h +++ b/dbms/src/DataStreams/SquashingBlockInputStream.h @@ -16,13 +16,6 @@ public: String getName() const override { return "Squashing"; } - String getID() const override - { - std::stringstream res; - res << "Squashing(" << children.at(0)->getID() << ")"; - return res.str(); - } - Block getHeader() const override { return children.at(0)->getHeader(); } protected: diff --git a/dbms/src/DataStreams/SummingSortedBlockInputStream.cpp b/dbms/src/DataStreams/SummingSortedBlockInputStream.cpp index 42dffd5babf..1102258d348 100644 --- a/dbms/src/DataStreams/SummingSortedBlockInputStream.cpp +++ b/dbms/src/DataStreams/SummingSortedBlockInputStream.cpp @@ -23,24 +23,6 @@ namespace ErrorCodes } -String SummingSortedBlockInputStream::getID() const -{ - std::stringstream res; - res << "SummingSorted(inputs"; - - for (size_t i = 0; i < children.size(); ++i) - res << ", " << children[i]->getID(); - - res << ", description"; - - for (size_t i = 0; i < description.size(); ++i) - res << ", " << description[i].getID(); - - res << ")"; - return res.str(); -} - - void SummingSortedBlockInputStream::insertCurrentRowIfNeeded(MutableColumns & merged_columns, bool force_insertion) { for (auto & desc : columns_to_aggregate) diff --git a/dbms/src/DataStreams/SummingSortedBlockInputStream.h b/dbms/src/DataStreams/SummingSortedBlockInputStream.h index 6a81db02ea4..62df3863fc6 100644 --- a/dbms/src/DataStreams/SummingSortedBlockInputStream.h +++ b/dbms/src/DataStreams/SummingSortedBlockInputStream.h @@ -35,8 +35,6 @@ public: String getName() const override { return "SummingSorted"; } - String getID() const override; - protected: /// Can return 1 more records than max_block_size. Block readImpl() override; diff --git a/dbms/src/DataStreams/TotalsHavingBlockInputStream.cpp b/dbms/src/DataStreams/TotalsHavingBlockInputStream.cpp index a9f0a20d8f9..b204afc2944 100644 --- a/dbms/src/DataStreams/TotalsHavingBlockInputStream.cpp +++ b/dbms/src/DataStreams/TotalsHavingBlockInputStream.cpp @@ -30,15 +30,6 @@ TotalsHavingBlockInputStream::TotalsHavingBlockInputStream( } -String TotalsHavingBlockInputStream::getID() const -{ - std::stringstream res; - res << "TotalsHavingBlockInputStream(" << children.back()->getID() - << "," << filter_column_name << ")"; - return res.str(); -} - - static void finalize(Block & block) { for (size_t i = 0; i < block.columns(); ++i) diff --git a/dbms/src/DataStreams/TotalsHavingBlockInputStream.h b/dbms/src/DataStreams/TotalsHavingBlockInputStream.h index 5bf0dabe1e8..375854c5761 100644 --- a/dbms/src/DataStreams/TotalsHavingBlockInputStream.h +++ b/dbms/src/DataStreams/TotalsHavingBlockInputStream.h @@ -27,8 +27,6 @@ public: String getName() const override { return "TotalsHaving"; } - String getID() const override; - const Block & getTotals() override; Block getHeader() const override; diff --git a/dbms/src/DataStreams/UnionBlockInputStream.h b/dbms/src/DataStreams/UnionBlockInputStream.h index edd65690657..176cb472a61 100644 --- a/dbms/src/DataStreams/UnionBlockInputStream.h +++ b/dbms/src/DataStreams/UnionBlockInputStream.h @@ -86,26 +86,6 @@ public: String getName() const override { return "Union"; } - String getID() const override - { - std::stringstream res; - res << "Union("; - - Strings children_ids(children.size()); - for (size_t i = 0; i < children.size(); ++i) - children_ids[i] = children[i]->getID(); - - /// Order does not matter. - std::sort(children_ids.begin(), children_ids.end()); - - for (size_t i = 0; i < children_ids.size(); ++i) - res << (i == 0 ? "" : ", ") << children_ids[i]; - - res << ")"; - return res.str(); - } - - ~UnionBlockInputStream() override { try diff --git a/dbms/src/DataStreams/VersionedCollapsingSortedBlockInputStream.h b/dbms/src/DataStreams/VersionedCollapsingSortedBlockInputStream.h index ec75e218533..1c299e78e81 100644 --- a/dbms/src/DataStreams/VersionedCollapsingSortedBlockInputStream.h +++ b/dbms/src/DataStreams/VersionedCollapsingSortedBlockInputStream.h @@ -185,24 +185,6 @@ public: String getName() const override { return "VersionedCollapsingSorted"; } - String getID() const override - { - std::stringstream res; - res << "VersionedCollapsingSortedBlockInputStream(inputs"; - - for (const auto & child : children) - res << ", " << child->getID(); - - res << ", description"; - - for (const auto & descr : description) - res << ", " << descr.getID(); - - res << ", sign_column, " << sign_column; - res << ", version_column, " << sign_column << ")"; - return res.str(); - } - protected: /// Can return 1 more records than max_block_size. Block readImpl() override; diff --git a/dbms/src/Dictionaries/DictionaryBlockInputStreamBase.cpp b/dbms/src/Dictionaries/DictionaryBlockInputStreamBase.cpp index 1520666284a..813504b084d 100644 --- a/dbms/src/Dictionaries/DictionaryBlockInputStreamBase.cpp +++ b/dbms/src/Dictionaries/DictionaryBlockInputStreamBase.cpp @@ -8,13 +8,6 @@ DictionaryBlockInputStreamBase::DictionaryBlockInputStreamBase(size_t rows_count { } -String DictionaryBlockInputStreamBase::getID() const -{ - std::stringstream ss; - ss << static_cast(this); - return ss.str(); -} - Block DictionaryBlockInputStreamBase::readImpl() { if (next_row == rows_count) diff --git a/dbms/src/Dictionaries/DictionaryBlockInputStreamBase.h b/dbms/src/Dictionaries/DictionaryBlockInputStreamBase.h index b08c13654ad..ea027026d3f 100644 --- a/dbms/src/Dictionaries/DictionaryBlockInputStreamBase.h +++ b/dbms/src/Dictionaries/DictionaryBlockInputStreamBase.h @@ -11,8 +11,6 @@ protected: DictionaryBlockInputStreamBase(size_t rows_count, size_t max_block_size); - String getID() const override; - virtual Block getBlock(size_t start, size_t length) const = 0; Block getHeader() const override; diff --git a/dbms/src/Dictionaries/ExecutableDictionarySource.cpp b/dbms/src/Dictionaries/ExecutableDictionarySource.cpp index b6f4ac4be30..35ac7b4cbf9 100644 --- a/dbms/src/Dictionaries/ExecutableDictionarySource.cpp +++ b/dbms/src/Dictionaries/ExecutableDictionarySource.cpp @@ -120,7 +120,6 @@ private: } String getName() const override { return "WithBackgroundThread"; } - String getID() const override { return "WithBackgroundThread(" + stream->getID() + ")"; } BlockInputStreamPtr stream; std::unique_ptr command; diff --git a/dbms/src/Dictionaries/MongoDBBlockInputStream.cpp b/dbms/src/Dictionaries/MongoDBBlockInputStream.cpp index 9f13b8c345b..b5f1d1f6f69 100644 --- a/dbms/src/Dictionaries/MongoDBBlockInputStream.cpp +++ b/dbms/src/Dictionaries/MongoDBBlockInputStream.cpp @@ -38,14 +38,6 @@ MongoDBBlockInputStream::MongoDBBlockInputStream( MongoDBBlockInputStream::~MongoDBBlockInputStream() = default; -String MongoDBBlockInputStream::getID() const -{ - std::ostringstream stream; - stream << cursor.get(); - return "MongoDB(@" + stream.str() + ")"; -} - - namespace { using ValueType = ExternalResultDescription::ValueType; diff --git a/dbms/src/Dictionaries/MongoDBBlockInputStream.h b/dbms/src/Dictionaries/MongoDBBlockInputStream.h index e7c6beb4256..046e3429b71 100644 --- a/dbms/src/Dictionaries/MongoDBBlockInputStream.h +++ b/dbms/src/Dictionaries/MongoDBBlockInputStream.h @@ -32,8 +32,6 @@ public: String getName() const override { return "MongoDB"; } - String getID() const override; - Block getHeader() const override { return description.sample_block; }; private: diff --git a/dbms/src/Dictionaries/MySQLBlockInputStream.cpp b/dbms/src/Dictionaries/MySQLBlockInputStream.cpp index f0c304343d2..6e2275cd105 100644 --- a/dbms/src/Dictionaries/MySQLBlockInputStream.cpp +++ b/dbms/src/Dictionaries/MySQLBlockInputStream.cpp @@ -33,12 +33,6 @@ MySQLBlockInputStream::MySQLBlockInputStream( } -String MySQLBlockInputStream::getID() const -{ - return "MySQL(" + query.str() + ")"; -} - - namespace { using ValueType = ExternalResultDescription::ValueType; diff --git a/dbms/src/Dictionaries/MySQLBlockInputStream.h b/dbms/src/Dictionaries/MySQLBlockInputStream.h index 564df311e2b..6e72f4eb3cf 100644 --- a/dbms/src/Dictionaries/MySQLBlockInputStream.h +++ b/dbms/src/Dictionaries/MySQLBlockInputStream.h @@ -21,8 +21,6 @@ public: String getName() const override { return "MySQL"; } - String getID() const override; - Block getHeader() const override { return description.sample_block; }; private: diff --git a/dbms/src/Dictionaries/ODBCBlockInputStream.cpp b/dbms/src/Dictionaries/ODBCBlockInputStream.cpp index 3f564d942b4..8b186f6791e 100644 --- a/dbms/src/Dictionaries/ODBCBlockInputStream.cpp +++ b/dbms/src/Dictionaries/ODBCBlockInputStream.cpp @@ -38,12 +38,6 @@ ODBCBlockInputStream::ODBCBlockInputStream( } -String ODBCBlockInputStream::getID() const -{ - return "ODBC(" + statement.toString() + ")"; -} - - namespace { using ValueType = ExternalResultDescription::ValueType; diff --git a/dbms/src/Dictionaries/ODBCBlockInputStream.h b/dbms/src/Dictionaries/ODBCBlockInputStream.h index cdbd75f53a6..b881beb9b1f 100644 --- a/dbms/src/Dictionaries/ODBCBlockInputStream.h +++ b/dbms/src/Dictionaries/ODBCBlockInputStream.h @@ -27,8 +27,6 @@ public: String getName() const override { return "ODBC"; } - String getID() const override; - Block getHeader() const override { return description.sample_block; }; private: diff --git a/dbms/src/Interpreters/Aggregator.cpp b/dbms/src/Interpreters/Aggregator.cpp index 72707486f4b..128554c69e3 100644 --- a/dbms/src/Interpreters/Aggregator.cpp +++ b/dbms/src/Interpreters/Aggregator.cpp @@ -1588,13 +1588,6 @@ public: String getName() const override { return "MergingAndConverting"; } - String getID() const override - { - std::stringstream res; - res << this; - return res.str(); - } - Block getHeader() const override { return aggregator.getHeader(final); } ~MergingAndConvertingBlockInputStream() @@ -2406,21 +2399,6 @@ void Aggregator::destroyAllAggregateStates(AggregatedDataVariants & result) } -String Aggregator::getID() const -{ - std::stringstream res; - - res << "keys"; - for (size_t i = 0; i < params.keys.size(); ++i) - res << ", " << params.keys[i]; - - res << ", aggregates"; - for (size_t i = 0; i < params.aggregates_size; ++i) - res << ", " << params.aggregates[i].column_name; - - return res.str(); -} - void Aggregator::setCancellationHook(const CancellationHook cancellation_hook) { isCancelled = cancellation_hook; diff --git a/dbms/src/Interpreters/Aggregator.h b/dbms/src/Interpreters/Aggregator.h index 8d99b0210b6..77f71da9986 100644 --- a/dbms/src/Interpreters/Aggregator.h +++ b/dbms/src/Interpreters/Aggregator.h @@ -1090,9 +1090,6 @@ public: */ void setCancellationHook(const CancellationHook cancellation_hook); - /// For IBlockInputStream. - String getID() const; - /// For external aggregation. void writeToTemporaryFile(AggregatedDataVariants & data_variants); diff --git a/dbms/src/Interpreters/DDLWorker.cpp b/dbms/src/Interpreters/DDLWorker.cpp index 1ea573374bc..c6bcb23989b 100644 --- a/dbms/src/Interpreters/DDLWorker.cpp +++ b/dbms/src/Interpreters/DDLWorker.cpp @@ -964,11 +964,6 @@ public: return "DDLQueryStatusInputSream"; } - String getID() const override - { - return "DDLQueryStatusInputSream(" + node_path + ")"; - } - Block getHeader() const override { return sample; }; Block readImpl() override diff --git a/dbms/src/Interpreters/ExpressionActions.cpp b/dbms/src/Interpreters/ExpressionActions.cpp index 934521bceb9..1f8a5bb8f0d 100644 --- a/dbms/src/Interpreters/ExpressionActions.cpp +++ b/dbms/src/Interpreters/ExpressionActions.cpp @@ -910,45 +910,6 @@ void ExpressionActions::finalize(const Names & output_columns) } -std::string ExpressionActions::getID() const -{ - std::stringstream ss; - - for (size_t i = 0; i < actions.size(); ++i) - { - if (i) - ss << ", "; - if (actions[i].type == ExpressionAction::APPLY_FUNCTION) - ss << actions[i].result_name; - if (actions[i].type == ExpressionAction::ARRAY_JOIN) - { - ss << (actions[i].array_join_is_left ? "LEFT ARRAY JOIN" : "ARRAY JOIN") << "{"; - for (NameSet::const_iterator it = actions[i].array_joined_columns.begin(); - it != actions[i].array_joined_columns.end(); ++it) - { - if (it != actions[i].array_joined_columns.begin()) - ss << ", "; - ss << *it; - } - ss << "}"; - } - - /// TODO JOIN - } - - ss << ": {"; - NamesAndTypesList output_columns = sample_block.getNamesAndTypesList(); - for (NamesAndTypesList::const_iterator it = output_columns.begin(); it != output_columns.end(); ++it) - { - if (it != output_columns.begin()) - ss << ", "; - ss << it->name; - } - ss << "}"; - - return ss.str(); -} - std::string ExpressionActions::dumpActions() const { std::stringstream ss; diff --git a/dbms/src/Interpreters/ExpressionActions.h b/dbms/src/Interpreters/ExpressionActions.h index 5e8cc4ac170..59434c741ac 100644 --- a/dbms/src/Interpreters/ExpressionActions.h +++ b/dbms/src/Interpreters/ExpressionActions.h @@ -194,8 +194,6 @@ public: /// Obtain a sample block that contains the names and types of result columns. const Block & getSampleBlock() const { return sample_block; } - std::string getID() const; - std::string dumpActions() const; static std::string getSmallestColumn(const NamesAndTypesList & columns); diff --git a/dbms/src/Interpreters/InterpreterKillQueryQuery.cpp b/dbms/src/Interpreters/InterpreterKillQueryQuery.cpp index 7774bfd512a..64805455368 100644 --- a/dbms/src/Interpreters/InterpreterKillQueryQuery.cpp +++ b/dbms/src/Interpreters/InterpreterKillQueryQuery.cpp @@ -118,11 +118,6 @@ public: return "SynchronousQueryKiller"; } - String getID() const override - { - return "SynchronousQueryKiller_" + toString(intptr_t(this)); - } - Block getHeader() const override { return res_sample_block; }; Block readImpl() override diff --git a/dbms/src/Interpreters/Join.cpp b/dbms/src/Interpreters/Join.cpp index 2d5244f6383..c469fc733a8 100644 --- a/dbms/src/Interpreters/Join.cpp +++ b/dbms/src/Interpreters/Join.cpp @@ -1038,13 +1038,6 @@ public: String getName() const override { return "NonJoined"; } - String getID() const override - { - std::stringstream res; - res << "NonJoined(" << &parent << ")"; - return res.str(); - } - Block getHeader() const override { return result_sample_block; }; diff --git a/dbms/src/Storages/MergeTree/MergeTreeBlockInputStream.cpp b/dbms/src/Storages/MergeTree/MergeTreeBlockInputStream.cpp index fbe02249260..fcfb00084cf 100644 --- a/dbms/src/Storages/MergeTree/MergeTreeBlockInputStream.cpp +++ b/dbms/src/Storages/MergeTree/MergeTreeBlockInputStream.cpp @@ -69,26 +69,6 @@ Block MergeTreeBlockInputStream::getHeader() const } -String MergeTreeBlockInputStream::getID() const -{ - std::stringstream res; - res << "MergeTree(" << path << ", columns"; - - for (const NameAndTypePair & column : columns) - res << ", " << column.name; - - if (prewhere_actions) - res << ", prewhere, " << prewhere_actions->getID(); - - res << ", marks"; - - for (size_t i = 0; i < all_mark_ranges.size(); ++i) - res << ", " << all_mark_ranges[i].begin << ", " << all_mark_ranges[i].end; - - res << ")"; - return res.str(); -} - bool MergeTreeBlockInputStream::getNewTask() try { diff --git a/dbms/src/Storages/MergeTree/MergeTreeBlockInputStream.h b/dbms/src/Storages/MergeTree/MergeTreeBlockInputStream.h index 2d81388d6d3..9739cfd49fc 100644 --- a/dbms/src/Storages/MergeTree/MergeTreeBlockInputStream.h +++ b/dbms/src/Storages/MergeTree/MergeTreeBlockInputStream.h @@ -38,8 +38,6 @@ public: String getName() const override { return "MergeTree"; } - String getID() const override; - Block getHeader() const override; /// Closes readers and unlock part locks diff --git a/dbms/src/Storages/MergeTree/MergeTreeThreadBlockInputStream.cpp b/dbms/src/Storages/MergeTree/MergeTreeThreadBlockInputStream.cpp index 7d87558f0c0..ec961f28a99 100644 --- a/dbms/src/Storages/MergeTree/MergeTreeThreadBlockInputStream.cpp +++ b/dbms/src/Storages/MergeTree/MergeTreeThreadBlockInputStream.cpp @@ -44,15 +44,6 @@ Block MergeTreeThreadBlockInputStream::getHeader() const }; -String MergeTreeThreadBlockInputStream::getID() const -{ - std::stringstream res; - /// @todo print some meaningful information - res << static_cast(this); - return res.str(); -} - - /// Requests read task from MergeTreeReadPool and signals whether it got one bool MergeTreeThreadBlockInputStream::getNewTask() { diff --git a/dbms/src/Storages/MergeTree/MergeTreeThreadBlockInputStream.h b/dbms/src/Storages/MergeTree/MergeTreeThreadBlockInputStream.h index 213b3985266..1a9c9a11bef 100644 --- a/dbms/src/Storages/MergeTree/MergeTreeThreadBlockInputStream.h +++ b/dbms/src/Storages/MergeTree/MergeTreeThreadBlockInputStream.h @@ -30,8 +30,6 @@ public: String getName() const override { return "MergeTreeThread"; } - String getID() const override; - ~MergeTreeThreadBlockInputStream() override; Block getHeader() const override; diff --git a/dbms/src/Storages/StorageBuffer.cpp b/dbms/src/Storages/StorageBuffer.cpp index 3a2fad35505..ec4f7b498da 100644 --- a/dbms/src/Storages/StorageBuffer.cpp +++ b/dbms/src/Storages/StorageBuffer.cpp @@ -76,18 +76,6 @@ public: String getName() const override { return "Buffer"; } - String getID() const override - { - std::stringstream res; - res << "Buffer(" << &buffer; - - for (const auto & name : column_names) - res << ", " << name; - - res << ")"; - return res.str(); - } - Block getHeader() const override { return storage.getSampleBlockForColumns(column_names); }; protected: diff --git a/dbms/src/Storages/StorageCatBoostPool.cpp b/dbms/src/Storages/StorageCatBoostPool.cpp index d336baa2ad9..d484158b018 100644 --- a/dbms/src/Storages/StorageCatBoostPool.cpp +++ b/dbms/src/Storages/StorageCatBoostPool.cpp @@ -39,11 +39,6 @@ public: return "CatBoostDatasetBlockInputStream"; } - String getID() const override - { - return "CatBoostDataset(" + format_name + ", " + file_name + ")"; - } - Block readImpl() override { return reader->read(); diff --git a/dbms/src/Storages/StorageFile.cpp b/dbms/src/Storages/StorageFile.cpp index 188c975cf0c..1bbe9d6d00c 100644 --- a/dbms/src/Storages/StorageFile.cpp +++ b/dbms/src/Storages/StorageFile.cpp @@ -144,18 +144,6 @@ public: return storage.getName(); } - String getID() const override - { - std::stringstream res_stream; - res_stream << "File(" << storage.format_name << ", "; - if (!storage.path.empty()) - res_stream << storage.path; - else - res_stream << storage.table_fd; - res_stream << ")"; - return res_stream.str(); - } - Block readImpl() override { return reader->read(); diff --git a/dbms/src/Storages/StorageKafka.cpp b/dbms/src/Storages/StorageKafka.cpp index be6b9141c69..c7ac83d1142 100644 --- a/dbms/src/Storages/StorageKafka.cpp +++ b/dbms/src/Storages/StorageKafka.cpp @@ -161,13 +161,6 @@ public: return storage.getName(); } - String getID() const override - { - std::stringstream res_stream; - res_stream << "Kafka(" << storage.topics.size() << ", " << storage.format_name << ")"; - return res_stream.str(); - } - Block readImpl() override { if (isCancelled()) diff --git a/dbms/src/Storages/StorageLog.cpp b/dbms/src/Storages/StorageLog.cpp index e0c32b7d259..443510fea42 100644 --- a/dbms/src/Storages/StorageLog.cpp +++ b/dbms/src/Storages/StorageLog.cpp @@ -62,18 +62,6 @@ public: String getName() const override { return "Log"; } - String getID() const override - { - std::stringstream res; - res << "Log(" << storage.getTableName() << ", " << &storage << ", " << mark_number << ", " << rows_limit; - - for (const auto & name_type : columns) - res << ", " << name_type.name; - - res << ")"; - return res.str(); - } - Block getHeader() const override { Block res; diff --git a/dbms/src/Storages/StorageMemory.cpp b/dbms/src/Storages/StorageMemory.cpp index 8f0685cf3f9..89ce474b065 100644 --- a/dbms/src/Storages/StorageMemory.cpp +++ b/dbms/src/Storages/StorageMemory.cpp @@ -25,18 +25,6 @@ public: String getName() const override { return "Memory"; } - String getID() const override - { - std::stringstream res; - res << "Memory(" << &*begin << ", " << &*end; - - for (const auto & name : column_names) - res << ", " << name; - - res << ")"; - return res.str(); - } - Block getHeader() const override { return storage.getSampleBlockForColumns(column_names); } protected: diff --git a/dbms/src/Storages/StorageStripeLog.cpp b/dbms/src/Storages/StorageStripeLog.cpp index eddcb3f69d9..1d2d31e27bb 100644 --- a/dbms/src/Storages/StorageStripeLog.cpp +++ b/dbms/src/Storages/StorageStripeLog.cpp @@ -59,13 +59,6 @@ public: String getName() const override { return "StripeLog"; } - String getID() const override - { - std::stringstream s; - s << this; - return s.str(); - } - Block getHeader() const override { if (index_begin == index_end) diff --git a/dbms/src/Storages/StorageTinyLog.cpp b/dbms/src/Storages/StorageTinyLog.cpp index 7d6cd9dcca9..957d1ca9aff 100644 --- a/dbms/src/Storages/StorageTinyLog.cpp +++ b/dbms/src/Storages/StorageTinyLog.cpp @@ -60,8 +60,6 @@ public: String getName() const override { return "TinyLog"; } - String getID() const override; - Block getHeader() const override { Block res; @@ -154,19 +152,6 @@ private: }; -String TinyLogBlockInputStream::getID() const -{ - std::stringstream res; - res << "TinyLog(" << storage.getTableName() << ", " << &storage; - - for (const auto & name_type : columns) - res << ", " << name_type.name; - - res << ")"; - return res.str(); -} - - Block TinyLogBlockInputStream::readImpl() { Block res; diff --git a/dbms/src/Storages/System/StorageSystemNumbers.cpp b/dbms/src/Storages/System/StorageSystemNumbers.cpp index 9ffa5e014c8..30586bbbba3 100644 --- a/dbms/src/Storages/System/StorageSystemNumbers.cpp +++ b/dbms/src/Storages/System/StorageSystemNumbers.cpp @@ -16,7 +16,6 @@ public: : block_size(block_size_), next(offset_), step(step_) {} String getName() const override { return "Numbers"; } - String getID() const override { return "Numbers"; } Block getHeader() const override {