mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-24 08:32:02 +00:00
Merge pull request #58996 from nickitat/fix_02404_with_analyzer
Fix 02404_memory_bound_merging with analyzer (follow up #56419)
This commit is contained in:
commit
bbf25b9cb9
@ -257,8 +257,9 @@ public:
|
|||||||
&& !query_node.isGroupByWithTotals() && !query_node.isGroupByWithRollup() && !query_node.isGroupByWithCube();
|
&& !query_node.isGroupByWithTotals() && !query_node.isGroupByWithRollup() && !query_node.isGroupByWithCube();
|
||||||
aggregation_with_rollup_or_cube_or_grouping_sets = query_node.isGroupByWithRollup() || query_node.isGroupByWithCube() ||
|
aggregation_with_rollup_or_cube_or_grouping_sets = query_node.isGroupByWithRollup() || query_node.isGroupByWithCube() ||
|
||||||
query_node.isGroupByWithGroupingSets();
|
query_node.isGroupByWithGroupingSets();
|
||||||
aggregation_should_produce_results_in_order_of_bucket_number = query_processing_info.getToStage() == QueryProcessingStage::WithMergeableState &&
|
aggregation_should_produce_results_in_order_of_bucket_number
|
||||||
settings.distributed_aggregation_memory_efficient;
|
= query_processing_info.getToStage() == QueryProcessingStage::WithMergeableState
|
||||||
|
&& (settings.distributed_aggregation_memory_efficient || settings.enable_memory_bound_merging_of_aggregation_results);
|
||||||
|
|
||||||
query_has_array_join_in_join_tree = queryHasArrayJoinInJoinTree(query_tree);
|
query_has_array_join_in_join_tree = queryHasArrayJoinInJoinTree(query_tree);
|
||||||
query_has_with_totals_in_any_subquery_in_join_tree = queryHasWithTotalsInAnySubqueryInJoinTree(query_tree);
|
query_has_with_totals_in_any_subquery_in_join_tree = queryHasWithTotalsInAnySubqueryInJoinTree(query_tree);
|
||||||
|
Loading…
Reference in New Issue
Block a user