thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-23 16:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Review fixes.

Browse Source
This commit is contained in:
Nikolai Kochetov 2022-12-06 12:34:07 +00:00
parent 5edc9953b0
commit 9de53389ae
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Processors/QueryPlan/AggregatingStep.h
View File

@ -72,6 +72,10 @@ private:
bool storage_has_evenly_distributed_read;
bool group_by_use_nulls;
/// Both sort descriptions are needed for aggregate-in-order optimisation.
/// Both sort descriptions are subset of GROUP BY key columns (or monotonic functions over it).
/// Sort description for merging is a sort description for input and a prefix of group_by_sort_description.
/// group_by_sort_description contains all GROUP BY keys and is used for final merging of aggregated data.
SortDescription sort_description_for_merging;
SortDescription group_by_sort_description;

4
src/Processors/QueryPlan/Optimizations/optimizeReadInOrder.cpp
View File

@ -709,7 +709,7 @@ AggregationInputOrder buildInputOrderInfo(
MatchedTrees::Matches matches;
FixedColumns fixed_key_columns;
/// For every column in PK find any macth from GROUP BY key.
/// For every column in PK find any match from GROUP BY key.
using ReverseMatches = std::unordered_map<const ActionsDAG::Node *, MatchedTrees::Matches::const_iterator>;
ReverseMatches reverse_matches;
@ -719,8 +719,6 @@ AggregationInputOrder buildInputOrderInfo(
for (const auto & [node, match] : matches)
{
//std::cerr << "------- matching " << static_cast<const void *>(node) << " " << node->result_name
// << " to " << static_cast<const void *>(match.node) << " " << (match.node ? match.node->result_name : "") << std::endl;
if (!match.monotonicity || match.monotonicity->strict)
{
if (match.node && fixed_columns.contains(node))