From 013d839dcfe5159473af4df20aee0a5deb62082f Mon Sep 17 00:00:00 2001 From: Nikita Mikhaylov Date: Tue, 26 Nov 2019 19:18:50 +0300 Subject: [PATCH] cleanup --- dbms/src/DataStreams/MergingSortedBlockInputStream.cpp | 1 - dbms/src/DataStreams/SummingSortedBlockInputStream.cpp | 2 -- dbms/src/Processors/ISource.cpp | 1 + dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dbms/src/DataStreams/MergingSortedBlockInputStream.cpp b/dbms/src/DataStreams/MergingSortedBlockInputStream.cpp index 0c9055287a2..8c0707e09b0 100644 --- a/dbms/src/DataStreams/MergingSortedBlockInputStream.cpp +++ b/dbms/src/DataStreams/MergingSortedBlockInputStream.cpp @@ -24,7 +24,6 @@ MergingSortedBlockInputStream::MergingSortedBlockInputStream( , cursors(inputs_.size()), out_row_sources_buf(out_row_sources_buf_) { children.insert(children.end(), inputs_.begin(), inputs_.end()); - children.at(0)->dumpTree(std::cout, 0); header = children.at(0)->getHeader(); num_columns = header.columns(); } diff --git a/dbms/src/DataStreams/SummingSortedBlockInputStream.cpp b/dbms/src/DataStreams/SummingSortedBlockInputStream.cpp index acdaca508bd..810fc9576ce 100644 --- a/dbms/src/DataStreams/SummingSortedBlockInputStream.cpp +++ b/dbms/src/DataStreams/SummingSortedBlockInputStream.cpp @@ -272,7 +272,6 @@ Block SummingSortedBlockInputStream::readImpl() if (merged_columns.empty()) return {}; - /// Update aggregation result columns for current block for (auto & desc : columns_to_aggregate) { @@ -288,7 +287,6 @@ Block SummingSortedBlockInputStream::readImpl() } else desc.merged_column = header.safeGetByPosition(desc.column_numbers[0]).column->cloneEmpty(); - } merge(merged_columns, queue_without_collation); diff --git a/dbms/src/Processors/ISource.cpp b/dbms/src/Processors/ISource.cpp index dcda869e1d4..d40f0e32fb7 100644 --- a/dbms/src/Processors/ISource.cpp +++ b/dbms/src/Processors/ISource.cpp @@ -1,5 +1,6 @@ #include + namespace DB { diff --git a/dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp b/dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp index 94abb2fc95e..60ed25ed43c 100644 --- a/dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp +++ b/dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp @@ -1137,7 +1137,7 @@ Pipes MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreamsFinal( case MergeTreeData::MergingParams::Summing: merged = std::make_shared(streams_to_merge(), - sort_description, data.merging_params.columns_to_sum, max_block_size); + sort_description, data.merging_params.columns_to_sum, max_block_size); break; case MergeTreeData::MergingParams::Aggregating: