thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 00:22:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Nikita Mikhaylov 2019-11-26 19:18:50 +03:00
parent a4189b85e2
commit 013d839dcf
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dbms/src/DataStreams/MergingSortedBlockInputStream.cpp
View File

@ -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();
}

2
dbms/src/DataStreams/SummingSortedBlockInputStream.cpp
View File

@ -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);

1
dbms/src/Processors/ISource.cpp
View File

@ -1,5 +1,6 @@
#include <Processors/ISource.h>
namespace DB
{

2
dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
View File

@ -1137,7 +1137,7 @@ Pipes MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreamsFinal(
case MergeTreeData::MergingParams::Summing:
merged = std::make_shared<SummingSortedBlockInputStream>(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: