thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 16:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

correctly choose number of merge threads for external aggregation [#CLICKHOUSE-2]

Browse Source
This commit is contained in:
Alexey Zatelepin 2017-07-25 22:43:23 +03:00
parent 2aaa847e10
commit 64fa3ebc58
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -952,7 +952,7 @@ void InterpreterSelectQuery::executeAggregation(ExpressionActionsPtr expression,
max_streams,
settings.aggregation_memory_efficient_merge_threads
? static_cast<size_t>(settings.aggregation_memory_efficient_merge_threads)
: max_streams);
: static_cast<size_t>(settings.max_threads));
stream_with_non_joined_data = nullptr;
streams.resize(1);
@ -1013,8 +1013,8 @@ void InterpreterSelectQuery::executeMergeAggregated(bool overflow_row, bool fina
streams[0] = std::make_shared<MergingAggregatedMemoryEfficientBlockInputStream>(streams, params, final,
max_streams,
settings.aggregation_memory_efficient_merge_threads
? size_t(settings.aggregation_memory_efficient_merge_threads)
: size_t(settings.max_threads));
? static_cast<size_t>(settings.aggregation_memory_efficient_merge_threads)
: static_cast<size_t>(settings.max_threads));
streams.resize(1);
}