mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-20 16:50:48 +00:00
correctly choose number of merge threads for external aggregation [#CLICKHOUSE-2]
This commit is contained in:
parent
2aaa847e10
commit
64fa3ebc58
@ -952,7 +952,7 @@ void InterpreterSelectQuery::executeAggregation(ExpressionActionsPtr expression,
|
|||||||
max_streams,
|
max_streams,
|
||||||
settings.aggregation_memory_efficient_merge_threads
|
settings.aggregation_memory_efficient_merge_threads
|
||||||
? static_cast<size_t>(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;
|
stream_with_non_joined_data = nullptr;
|
||||||
streams.resize(1);
|
streams.resize(1);
|
||||||
@ -1013,8 +1013,8 @@ void InterpreterSelectQuery::executeMergeAggregated(bool overflow_row, bool fina
|
|||||||
streams[0] = std::make_shared<MergingAggregatedMemoryEfficientBlockInputStream>(streams, params, final,
|
streams[0] = std::make_shared<MergingAggregatedMemoryEfficientBlockInputStream>(streams, params, final,
|
||||||
max_streams,
|
max_streams,
|
||||||
settings.aggregation_memory_efficient_merge_threads
|
settings.aggregation_memory_efficient_merge_threads
|
||||||
? size_t(settings.aggregation_memory_efficient_merge_threads)
|
? static_cast<size_t>(settings.aggregation_memory_efficient_merge_threads)
|
||||||
: size_t(settings.max_threads));
|
: static_cast<size_t>(settings.max_threads));
|
||||||
|
|
||||||
streams.resize(1);
|
streams.resize(1);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user