thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-10 09:32:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #63708 from ClickHouse/backport/24.3/63415

Browse Source 
Backport #63415 to 24.3: Revert "Revert "Do not remove server constants from GROUP BY key for secondary query.""
This commit is contained in:
robot-ch-test-poll3 2024-05-13 20:55:55 +02:00 committed by GitHub
commit db75a12c99
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/Planner/PlannerExpressionAnalysis.cpp
View File

@ -51,6 +51,41 @@ FilterAnalysisResult analyzeFilter(const QueryTreeNodePtr & filter_expression_no
return result;
}
bool isDeterministicConstant(const ConstantNode & root)
{
const auto & source_expression = root.getSourceExpression();
if (!source_expression)
return true;
std::stack<const IQueryTreeNode *> nodes;
nodes.push(source_expression.get());
while (!nodes.empty())
{
const auto * node = nodes.top();
nodes.pop();
const auto * constant_node = node->as<ConstantNode>();
const auto * function_node = node->as<FunctionNode>();
if (constant_node)
{
if (!isDeterministicConstant(*constant_node))
return false;
}
else if (function_node)
{
if (!function_node->getFunctionOrThrow()->isDeterministic())
return false;
for (const auto & child : function_node->getArguments())
nodes.push(child.get());
}
else
return false;
}
return true;
}
/** Construct aggregation analysis result if query tree has GROUP BY or aggregates.
* Actions before aggregation are added into actions chain, if result is not null optional.
*/
@ -85,6 +120,10 @@ 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;
bool is_distributed_query = planner_context->getQueryContext()->isDistributed();
bool check_deterministic_constants = is_secondary_query || is_distributed_query;
if (query_node.hasGroupBy())
{
if (query_node.isGroupByWithGroupingSets())
@ -97,10 +136,10 @@ std::optional<AggregationAnalysisResult> analyzeAggregation(const QueryTreeNodeP
for (auto & grouping_set_key_node : grouping_set_keys_list_node_typed.getNodes())
{
auto is_constant_key = grouping_set_key_node->as<ConstantNode>() != nullptr;
group_by_with_constant_keys |= is_constant_key;
const auto * constant_key = grouping_set_key_node->as<ConstantNode>();
group_by_with_constant_keys |= (constant_key != nullptr);
if (is_constant_key && !aggregates_descriptions.empty())
if (constant_key && !aggregates_descriptions.empty() && (!check_deterministic_constants || isDeterministicConstant(*constant_key)))
continue;
auto expression_dag_nodes = actions_visitor.visit(before_aggregation_actions, grouping_set_key_node);
@ -149,10 +188,10 @@ std::optional<AggregationAnalysisResult> analyzeAggregation(const QueryTreeNodeP
{
for (auto & group_by_key_node : query_node.getGroupBy().getNodes())
{
auto is_constant_key = group_by_key_node->as<ConstantNode>() != nullptr;
group_by_with_constant_keys |= is_constant_key;
const auto * constant_key = group_by_key_node->as<ConstantNode>();
group_by_with_constant_keys |= (constant_key != nullptr);
if (is_constant_key && !aggregates_descriptions.empty())
if (constant_key && !aggregates_descriptions.empty() && (!check_deterministic_constants || isDeterministicConstant(*constant_key)))
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 Normal file
View File

@ -0,0 +1 @@
r1 2

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

@ -0,0 +1,5 @@
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;