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

Merge pull request #65188 from Algunenano/i65052

Browse Source 
Fix crash with UniqInjectiveFunctionsEliminationPass and uniqCombined
This commit is contained in:
Raúl Marín 2024-06-14 11:30:18 +00:00 committed by GitHub
commit d0e1f02208
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Analyzer/Passes/UniqInjectiveFunctionsEliminationPass.cpp
View File

@ -41,9 +41,9 @@ public:
return;
bool replaced_argument = false;
auto & uniq_function_arguments_nodes = function_node->getArguments().getNodes();
auto replaced_uniq_function_arguments_nodes = function_node->getArguments().getNodes();
for (auto & uniq_function_argument_node : uniq_function_arguments_nodes)
for (auto & uniq_function_argument_node : replaced_uniq_function_arguments_nodes)
{
auto * uniq_function_argument_node_typed = uniq_function_argument_node->as<FunctionNode>();
if (!uniq_function_argument_node_typed || !uniq_function_argument_node_typed->isOrdinaryFunction())
@ -67,12 +67,10 @@ public:
if (!replaced_argument)
return;
const auto & function_node_argument_nodes = function_node->getArguments().getNodes();
DataTypes argument_types;
argument_types.reserve(function_node_argument_nodes.size());
argument_types.reserve(replaced_uniq_function_arguments_nodes.size());
for (const auto & function_node_argument : function_node_argument_nodes)
for (const auto & function_node_argument : replaced_uniq_function_arguments_nodes)
argument_types.emplace_back(function_node_argument->getResultType());
AggregateFunctionProperties properties;
@ -83,6 +81,11 @@ public:
function_node->getAggregateFunction()->getParameters(),
properties);
/// uniqCombined returns nullable with nullable arguments so the result type might change which breaks the pass
if (!aggregate_function->getResultType()->equals(*function_node->getAggregateFunction()->getResultType()))
return;
function_node->getArguments().getNodes() = replaced_uniq_function_arguments_nodes;
function_node->resolveAsAggregateFunction(std::move(aggregate_function));
}
};

2
tests/queries/0_stateless/03169_optimize_injective_functions_inside_uniq_crash.reference Normal file
View File

@ -0,0 +1,2 @@
100
100

21
tests/queries/0_stateless/03169_optimize_injective_functions_inside_uniq_crash.sql Normal file
View File

@ -0,0 +1,21 @@
SELECT sum(u)
FROM
(
SELECT
intDiv(number, 4096) AS k,
uniqCombined(tuple(materialize(toLowCardinality(toNullable(16))))) AS u
FROM numbers(4096 * 100)
GROUP BY k
)
SETTINGS allow_experimental_analyzer = 1, optimize_injective_functions_inside_uniq=0;
SELECT sum(u)
FROM
(
SELECT
intDiv(number, 4096) AS k,
uniqCombined(tuple(materialize(toLowCardinality(toNullable(16))))) AS u
FROM numbers(4096 * 100)
GROUP BY k
)
SETTINGS allow_experimental_analyzer = 1, optimize_injective_functions_inside_uniq=1;