thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-04 21:42:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some tests

Browse Source
This commit is contained in:
Dmitry Novik 2022-07-04 15:56:42 +00:00
parent 81dd90893e
commit e179449381
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Interpreters/ExpressionAnalyzer.cpp
View File

@ -344,6 +344,7 @@ void ExpressionAnalyzer::analyzeAggregation(ActionsDAGPtr & temp_actions)
group_by_kind = GroupByKind::GROUPING_SETS; group_by_kind = GroupByKind::GROUPING_SETS;
else else
group_by_kind = GroupByKind::ORDINARY; group_by_kind = GroupByKind::ORDINARY;
bool use_nulls = group_by_kind != GroupByKind::ORDINARY && getContext()->getSettingsRef().group_by_use_nulls;
/// For GROUPING SETS with multiple groups we always add virtual __grouping_set column /// For GROUPING SETS with multiple groups we always add virtual __grouping_set column
/// With set number, which is used as an additional key at the stage of merging aggregating data. /// With set number, which is used as an additional key at the stage of merging aggregating data.
@ -398,7 +399,7 @@ void ExpressionAnalyzer::analyzeAggregation(ActionsDAGPtr & temp_actions)
} }
} }
NameAndTypePair key{column_name, makeNullable(node->result_type)}; NameAndTypePair key{column_name, use_nulls ? makeNullable(node->result_type) : node->result_type };
grouping_set_list.push_back(key); grouping_set_list.push_back(key);
@ -452,7 +453,7 @@ void ExpressionAnalyzer::analyzeAggregation(ActionsDAGPtr & temp_actions)
} }
} }
NameAndTypePair key = select_query->group_by_with_rollup || select_query->group_by_with_cube ? NameAndTypePair{ column_name, makeNullable(node->result_type) } : NameAndTypePair{column_name, node->result_type}; NameAndTypePair key = NameAndTypePair{ column_name, use_nulls ? makeNullable(node->result_type) : node->result_type };
/// Aggregation keys are uniqued. /// Aggregation keys are uniqued.
if (!unique_keys.contains(key.name)) if (!unique_keys.contains(key.name))
@ -1903,7 +1904,8 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
before_aggregation = chain.getLastActions(); before_aggregation = chain.getLastActions();
before_aggregation_with_nullable = chain.getLastActions(); before_aggregation_with_nullable = chain.getLastActions();
query_analyzer.appendGroupByModifiers(before_aggregation, chain, only_types); if (settings.group_by_use_nulls)
query_analyzer.appendGroupByModifiers(before_aggregation, chain, only_types);
finalize_chain(chain); finalize_chain(chain);