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

Merge pull request #45059 from kitaisreal/analyzer-array-join-crash-fix

Browse Source 
Analyzer ARRAY JOIN crash fix
This commit is contained in:
Maksim Kita 2023-01-10 15:14:24 +03:00 committed by GitHub
commit a7d5a5d280
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 61 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Analyzer/Passes/QueryAnalysisPass.cpp
View File

@ -5500,9 +5500,15 @@ void QueryAnalyzer::resolveQueryJoinTreeNode(QueryTreeNodePtr & join_tree_node,
std::unordered_set<String> array_join_column_names;
/// Wrap array join expressions into column nodes, where array join expression is inner expression.
/// Wrap array join expressions into column nodes, where array join expression is inner expression
for (auto & array_join_expression : array_join_node.getJoinExpressions().getNodes())
auto & array_join_nodes = array_join_node.getJoinExpressions().getNodes();
size_t array_join_nodes_size = array_join_nodes.size();
std::vector<QueryTreeNodePtr> array_join_column_expressions;
array_join_column_expressions.reserve(array_join_nodes_size);
for (auto & array_join_expression : array_join_nodes)
{
auto array_join_expression_alias = array_join_expression->getAlias();
if (!array_join_expression_alias.empty() && scope.alias_name_to_expression_node.contains(array_join_expression_alias))
@ -5553,12 +5559,26 @@ void QueryAnalyzer::resolveQueryJoinTreeNode(QueryTreeNodePtr & join_tree_node,
array_join_column_names.emplace(array_join_column_name);
auto array_join_column = std::make_shared<ColumnNode>(NameAndTypePair{array_join_column_name, result_type}, array_join_expression, join_tree_node);
array_join_expression = std::move(array_join_column);
array_join_expression->setAlias(array_join_expression_alias);
array_join_column->setAlias(array_join_expression_alias);
array_join_column_expressions.push_back(std::move(array_join_column));
}
auto it = scope.alias_name_to_expression_node.find(array_join_expression_alias);
/** Allow to resolve ARRAY JOIN columns from aliases with types after ARRAY JOIN only after ARRAY JOIN expression list is resolved, because
* during resolution of ARRAY JOIN expression list we must use column type before ARRAY JOIN.
*
* Example: SELECT id, value_element FROM test_table ARRAY JOIN [[1,2,3]] AS value_element, value_element AS value
* It is expected that `value_element AS value` expression inside ARRAY JOIN expression list will be
* resolved as `value_element` expression with type before ARRAY JOIN.
* And it is expected that `value_element` inside projection expression list will be resolved as `value_element` expression
* with type after ARRAY JOIN.
*/
for (size_t i = 0; i < array_join_nodes_size; ++i)
{
auto & array_join_expression = array_join_nodes[i];
array_join_expression = std::move(array_join_column_expressions[i]);
auto it = scope.alias_name_to_expression_node.find(array_join_expression->getAlias());
if (it != scope.alias_name_to_expression_node.end())
it->second = array_join_expression;
it->second = array_join_nodes[i];
}
break;

11
tests/queries/0_stateless/02521_analyzer_array_join_crash.reference Normal file
View File

@ -0,0 +1,11 @@
-- { echoOn }
SELECT id, value_element, value FROM test_table ARRAY JOIN [[1,2,3]] AS value_element, value_element AS value;
0 [1,2,3] [1,2,3]
SELECT id, value_element, value FROM test_table ARRAY JOIN [[1,2,3]] AS value_element ARRAY JOIN value_element AS value;
0 [1,2,3] 1
0 [1,2,3] 2
0 [1,2,3] 3
SELECT value_element, value FROM test_table ARRAY JOIN [1048577] AS value_element, arrayMap(x -> value_element, ['']) AS value;
1048577 [1048577]
SELECT arrayFilter(x -> notEmpty(concat(x)), [NULL, NULL]) FROM system.one ARRAY JOIN [1048577] AS elem, arrayMap(x -> concat(x, elem, ''), ['']) AS unused; -- { serverError 44 }

24
tests/queries/0_stateless/02521_analyzer_array_join_crash.sql Normal file
View File

@ -0,0 +1,24 @@
SET allow_experimental_analyzer = 1;
DROP TABLE IF EXISTS test_table;
CREATE TABLE test_table
(
id UInt64,
value String
) ENGINE = MergeTree ORDER BY id;
INSERT INTO test_table VALUES (0, 'Value');
-- { echoOn }
SELECT id, value_element, value FROM test_table ARRAY JOIN [[1,2,3]] AS value_element, value_element AS value;
SELECT id, value_element, value FROM test_table ARRAY JOIN [[1,2,3]] AS value_element ARRAY JOIN value_element AS value;
SELECT value_element, value FROM test_table ARRAY JOIN [1048577] AS value_element, arrayMap(x -> value_element, ['']) AS value;
SELECT arrayFilter(x -> notEmpty(concat(x)), [NULL, NULL]) FROM system.one ARRAY JOIN [1048577] AS elem, arrayMap(x -> concat(x, elem, ''), ['']) AS unused; -- { serverError 44 }
-- { echoOff }
DROP TABLE test_table;