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

fix selecting max_threads for MergingAggregatedBlockInputStream [#CLICKHOUSE-3156]

Browse Source
This commit is contained in:
Alexey Zatelepin 2017-07-18 23:07:59 +03:00 committed by alexey-milovidov
parent 25288ac4d5
commit 4866a37a2b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/src/Interpreters/InterpreterSelectQuery.cpp
View File

@ -442,7 +442,7 @@ void InterpreterSelectQuery::executeSingleQuery()
if (to_stage > QueryProcessingStage::FetchColumns) if (to_stage > QueryProcessingStage::FetchColumns)
{ {
bool has_join = false; bool has_join = false;
bool has_where = false; bool has_where = false;
bool need_aggregate = false; bool need_aggregate = false;
bool has_having = false; bool has_having = false;
@ -1006,7 +1006,7 @@ void InterpreterSelectQuery::executeMergeAggregated(bool overflow_row, bool fina
executeUnion(); executeUnion();
/// Now merge the aggregated blocks /// Now merge the aggregated blocks
streams[0] = std::make_shared<MergingAggregatedBlockInputStream>(streams[0], params, final, max_streams); streams[0] = std::make_shared<MergingAggregatedBlockInputStream>(streams[0], params, final, settings.max_threads);
} }
else else
{ {