From a06832508e459056b62c5fe694143ea006ed83cf Mon Sep 17 00:00:00 2001 From: Maksim Kita Date: Wed, 7 Sep 2022 10:44:40 +0200 Subject: [PATCH] Fixed tests --- src/Planner/ActionsChain.h | 2 +- .../02366_explain_query_tree.reference | 49 +++++++++++-------- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/src/Planner/ActionsChain.h b/src/Planner/ActionsChain.h index d9c168c1d96..96386a8f309 100644 --- a/src/Planner/ActionsChain.h +++ b/src/Planner/ActionsChain.h @@ -53,7 +53,7 @@ public: /** Initialize actions step with actions dag. * Input column names initialized using actions dag nodes with INPUT type. * - * If available output columns strategy is ALL_NODES, then avaiable output columns initialized using actions dag nodes + * If available output columns strategy is ALL_NODES, then available output columns initialized using actions dag nodes * with INPUT, FUNCTION, ALIAS, ARRAY_JOIN types. * If available output columns strategy is OUTPUT_NODES, then available output columns initialized using actions dag output nodes * with INPUT, FUNCTION, ALIAS, ARRAY_JOIN types. diff --git a/tests/queries/0_stateless/02366_explain_query_tree.reference b/tests/queries/0_stateless/02366_explain_query_tree.reference index 42cc6777e42..d2a0e875621 100644 --- a/tests/queries/0_stateless/02366_explain_query_tree.reference +++ b/tests/queries/0_stateless/02366_explain_query_tree.reference @@ -1,11 +1,11 @@ -QUERY id: 0, is_subquery: 0, is_cte: 0 +QUERY id: 0, is_subquery: 0, is_cte: 0, is_distinct: 0, is_limit_with_ties: 0, is_group_by_with_totals: 0, is_group_by_with_rollup: 0, is_group_by_with_cube: 0, is_group_by_with_grouping_sets: 0 PROJECTION LIST id: 1, nodes: 1 - CONSTANT id: 2, value: UInt64_1, result_type: UInt8 + CONSTANT id: 2, constant_value: UInt64_1, constant_value_type: UInt8 JOIN TREE IDENTIFIER id: 3, identifier: system.one -- -QUERY id: 0, is_subquery: 0, is_cte: 0 +QUERY id: 0, is_subquery: 0, is_cte: 0, is_distinct: 0, is_limit_with_ties: 0, is_group_by_with_totals: 0, is_group_by_with_rollup: 0, is_group_by_with_cube: 0, is_group_by_with_grouping_sets: 0 PROJECTION LIST id: 1, nodes: 2 IDENTIFIER id: 2, identifier: id @@ -13,7 +13,10 @@ QUERY id: 0, is_subquery: 0, is_cte: 0 JOIN TREE IDENTIFIER id: 4, identifier: test_table -- -QUERY id: 0, is_subquery: 0, is_cte: 0 +QUERY id: 0, is_subquery: 0, is_cte: 0, is_distinct: 0, is_limit_with_ties: 0, is_group_by_with_totals: 0, is_group_by_with_rollup: 0, is_group_by_with_cube: 0, is_group_by_with_grouping_sets: 0 + PROJECTION COLUMNS + id UInt64 + value String PROJECTION LIST id: 1, nodes: 2 COLUMN id: 2, column_name: id, result_type: UInt64, source_id: 3 @@ -21,10 +24,10 @@ QUERY id: 0, is_subquery: 0, is_cte: 0 JOIN TREE TABLE id: 3, table_name: default.test_table -- -QUERY id: 0, is_subquery: 0, is_cte: 0 +QUERY id: 0, is_subquery: 0, is_cte: 0, is_distinct: 0, is_limit_with_ties: 0, is_group_by_with_totals: 0, is_group_by_with_rollup: 0, is_group_by_with_cube: 0, is_group_by_with_grouping_sets: 0 PROJECTION LIST id: 1, nodes: 1 - FUNCTION id: 2, function_name: arrayMap + FUNCTION id: 2, function_name: arrayMap, is_aggregate_function: 0 ARGUMENTS LIST id: 3, nodes: 2 LAMBDA id: 4 @@ -32,36 +35,38 @@ QUERY id: 0, is_subquery: 0, is_cte: 0 LIST id: 5, nodes: 1 IDENTIFIER id: 6, identifier: x EXPRESSION - FUNCTION id: 7, function_name: plus + FUNCTION id: 7, function_name: plus, is_aggregate_function: 0 ARGUMENTS LIST id: 8, nodes: 2 IDENTIFIER id: 9, identifier: x IDENTIFIER id: 10, identifier: id - CONSTANT id: 11, value: Array_[UInt64_1, UInt64_2, UInt64_3], result_type: Array(UInt8) + CONSTANT id: 11, constant_value: Array_[UInt64_1, UInt64_2, UInt64_3], constant_value_type: Array(UInt8) JOIN TREE IDENTIFIER id: 12, identifier: test_table -- -QUERY id: 0, is_subquery: 0, is_cte: 0 +QUERY id: 0, is_subquery: 0, is_cte: 0, is_distinct: 0, is_limit_with_ties: 0, is_group_by_with_totals: 0, is_group_by_with_rollup: 0, is_group_by_with_cube: 0, is_group_by_with_grouping_sets: 0 + PROJECTION COLUMNS + arrayMap(lambda(tuple(x), plus(x, 1)), [1, 2, 3]) Array(UInt16) PROJECTION LIST id: 1, nodes: 1 - FUNCTION id: 2, function_name: arrayMap, result_type: Array(UInt16) + FUNCTION id: 2, function_name: arrayMap, is_aggregate_function: 0, result_type: Array(UInt16) ARGUMENTS LIST id: 3, nodes: 2 - LAMBDA id: 4, result_type: UInt16 + LAMBDA id: 4 ARGUMENTS LIST id: 5, nodes: 1 COLUMN id: 6, column_name: x, result_type: UInt8, source_id: 4 EXPRESSION - FUNCTION id: 7, function_name: plus, result_type: UInt16 + FUNCTION id: 7, function_name: plus, is_aggregate_function: 0, result_type: UInt16 ARGUMENTS LIST id: 8, nodes: 2 COLUMN id: 6, column_name: x, result_type: UInt8, source_id: 4 - CONSTANT id: 9, value: UInt64_1, result_type: UInt8 - CONSTANT id: 10, value: Array_[UInt64_1, UInt64_2, UInt64_3], result_type: Array(UInt8) + CONSTANT id: 9, constant_value: UInt64_1, constant_value_type: UInt8 + CONSTANT id: 10, constant_value: Array_[UInt64_1, UInt64_2, UInt64_3], constant_value_type: Array(UInt8) JOIN TREE TABLE id: 11, table_name: default.test_table -- -QUERY id: 0, is_subquery: 0, is_cte: 0 +QUERY id: 0, is_subquery: 0, is_cte: 0, is_distinct: 0, is_limit_with_ties: 0, is_group_by_with_totals: 0, is_group_by_with_rollup: 0, is_group_by_with_cube: 0, is_group_by_with_grouping_sets: 0 WITH LIST id: 1, nodes: 1 LAMBDA id: 2, alias: lambda @@ -69,27 +74,29 @@ QUERY id: 0, is_subquery: 0, is_cte: 0 LIST id: 3, nodes: 1 IDENTIFIER id: 4, identifier: x EXPRESSION - FUNCTION id: 5, function_name: plus + FUNCTION id: 5, function_name: plus, is_aggregate_function: 0 ARGUMENTS LIST id: 6, nodes: 2 IDENTIFIER id: 7, identifier: x - CONSTANT id: 8, value: UInt64_1, result_type: UInt8 + CONSTANT id: 8, constant_value: UInt64_1, constant_value_type: UInt8 PROJECTION LIST id: 9, nodes: 1 - FUNCTION id: 10, function_name: lambda + FUNCTION id: 10, function_name: lambda, is_aggregate_function: 0 ARGUMENTS LIST id: 11, nodes: 1 IDENTIFIER id: 12, identifier: id JOIN TREE IDENTIFIER id: 13, identifier: test_table -- -QUERY id: 0, is_subquery: 0, is_cte: 0 +QUERY id: 0, is_subquery: 0, is_cte: 0, is_distinct: 0, is_limit_with_ties: 0, is_group_by_with_totals: 0, is_group_by_with_rollup: 0, is_group_by_with_cube: 0, is_group_by_with_grouping_sets: 0 + PROJECTION COLUMNS + lambda(id) UInt64 PROJECTION LIST id: 1, nodes: 1 - FUNCTION id: 2, function_name: plus, result_type: UInt64 + FUNCTION id: 2, function_name: plus, is_aggregate_function: 0, result_type: UInt64 ARGUMENTS LIST id: 3, nodes: 2 COLUMN id: 4, column_name: id, result_type: UInt64, source_id: 5 - CONSTANT id: 6, value: UInt64_1, result_type: UInt8 + CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8 JOIN TREE TABLE id: 5, table_name: default.test_table