thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 00:22:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Do not remove server constants from GROUP BY key for secondary query."

Browse Source
This commit is contained in:
Alexey Milovidov 2024-05-02 21:09:53 +02:00 committed by GitHub
parent 3fc4c2a12a
commit 2ca0251de4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Planner/PlannerExpressionAnalysis.cpp
View File

@ -85,8 +85,6 @@ std::optional<AggregationAnalysisResult> analyzeAggregation(const QueryTreeNodeP
bool group_by_use_nulls = planner_context->getQueryContext()->getSettingsRef().group_by_use_nulls &&
(query_node.isGroupByWithGroupingSets() || query_node.isGroupByWithRollup() || query_node.isGroupByWithCube());
bool is_secondary_query = planner_context->getQueryContext()->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY;
if (query_node.hasGroupBy())
{
if (query_node.isGroupByWithGroupingSets())
@ -102,7 +100,7 @@ std::optional<AggregationAnalysisResult> analyzeAggregation(const QueryTreeNodeP
auto is_constant_key = grouping_set_key_node->as<ConstantNode>() != nullptr;
group_by_with_constant_keys |= is_constant_key;
if (!is_secondary_query && is_constant_key && !aggregates_descriptions.empty())
if (is_constant_key && !aggregates_descriptions.empty())
continue;
auto expression_dag_nodes = actions_visitor.visit(before_aggregation_actions, grouping_set_key_node);
@ -154,7 +152,7 @@ std::optional<AggregationAnalysisResult> analyzeAggregation(const QueryTreeNodeP
auto is_constant_key = group_by_key_node->as<ConstantNode>() != nullptr;
group_by_with_constant_keys |= is_constant_key;
if (!is_secondary_query && is_constant_key && !aggregates_descriptions.empty())
if (is_constant_key && !aggregates_descriptions.empty())
continue;
auto expression_dag_nodes = actions_visitor.visit(before_aggregation_actions, group_by_key_node);

1
tests/queries/0_stateless/03095_group_by_server_constants_bug.reference
View File

@ -1 +0,0 @@
r1 2

5
tests/queries/0_stateless/03095_group_by_server_constants_bug.sql
View File

@ -1,5 +0,0 @@
SELECT serverUUID() AS s, count() FROM remote('127.0.0.{1,2}', system.one) GROUP BY s format Null;
select getMacro('replica') as s, count() from remote('127.0.0.{1,2}', system.one) group by s;
select uptime() as s, count() FROM remote('127.0.0.{1,2}', system.one) group by s format Null;