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

add NOT_AN_AGGREGATE exception for interpolate expression columns

Browse Source
This commit is contained in:
Yakov Olkhovskiy 2024-05-19 07:14:37 +00:00
parent 79b3f52dc5
commit a67418bcc8
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Planner/PlannerExpressionAnalysis.cpp
View File

@ -28,6 +28,7 @@ namespace DB
namespace ErrorCodes
{
extern const int LOGICAL_ERROR;
extern const int NOT_AN_AGGREGATE;
}
namespace
@ -397,7 +398,8 @@ ProjectionAnalysisResult analyzeProjection(const QueryNode & query_node,
SortAnalysisResult analyzeSort(const QueryNode & query_node,
const ColumnsWithTypeAndName & input_columns,
const PlannerContextPtr & planner_context,
ActionsChain & actions_chain)
ActionsChain & actions_chain,
std::optional<AggregationAnalysisResult> aggregation_analysis_result_optional)
{
ActionsDAGPtr before_sort_actions = std::make_shared<ActionsDAG>(input_columns);
auto & before_sort_actions_outputs = before_sort_actions->getOutputs();
@ -451,6 +453,10 @@ SortAnalysisResult analyzeSort(const QueryNode & query_node,
for (const auto & node : before_sort_actions->getInputs())
before_sort_actions_inputs_name_to_node.emplace(node->result_name, node);
std::unordered_set<std::string_view> aggregation_keys;
if (aggregation_analysis_result_optional)
aggregation_keys.insert(aggregation_analysis_result_optional->aggregation_keys.begin(), aggregation_analysis_result_optional->aggregation_keys.end());
for (const auto & node : interpolate_expression_dag->getNodes())
{
if (before_sort_actions_dag_output_node_names.contains(node.result_name) ||
@ -466,6 +472,12 @@ SortAnalysisResult analyzeSort(const QueryNode & query_node,
input_node_it = it;
}
if (aggregation_analysis_result_optional)
if (!aggregation_keys.contains(node.result_name))
throw Exception(ErrorCodes::NOT_AN_AGGREGATE,
"Column {} is not under aggregate function and not in GROUP BY keys. In query {}",
node.result_name, query_node.formatASTForErrorMessage());
before_sort_actions_outputs.push_back(input_node_it->second);
before_sort_actions_dag_output_node_names.insert(node.result_name);
}
@ -567,7 +579,7 @@ PlannerExpressionsAnalysisResult buildExpressionAnalysisResult(const QueryTreeNo
std::optional<SortAnalysisResult> sort_analysis_result_optional;
if (query_node.hasOrderBy())
{
sort_analysis_result_optional = analyzeSort(query_node, current_output_columns, planner_context, actions_chain);
sort_analysis_result_optional = analyzeSort(query_node, current_output_columns, planner_context, actions_chain, aggregation_analysis_result_optional);
current_output_columns = actions_chain.getLastStepAvailableOutputColumns();
}

9
tests/queries/0_stateless/03155_analyzer_interpolate.sql
View File

@ -1,7 +1,12 @@
-- https://github.com/ClickHouse/ClickHouse/issues/62464
SET allow_experimental_analyzer = 1;
SELECT n, [number] as inter FROM (
SELECT n, [number] AS inter FROM (
SELECT toFloat32(number % 10) AS n, number
FROM numbers(10) WHERE number % 3 = 1
) group by n, inter ORDER BY n WITH FILL FROM 0 TO 5.51 STEP 0.5 INTERPOLATE (inter AS [5]);
) GROUP BY n, inter ORDER BY n WITH FILL FROM 0 TO 5.51 STEP 0.5 INTERPOLATE (inter AS [5]);
SELECT n, number+5 AS inter FROM ( -- { serverError NOT_AN_AGGREGATE }
SELECT toFloat32(number % 10) AS n, number, number*2 AS mn
FROM numbers(10) WHERE number % 3 = 1
) GROUP BY n, inter ORDER BY n WITH FILL FROM 0 TO 5.51 STEP 0.5 INTERPOLATE (inter AS mn * 2);