From f385ccb7a6815fada23050b9601bed6ee65e2be0 Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Mon, 11 Dec 2023 11:56:34 +0100 Subject: [PATCH 1/2] Add KDevelop --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index e8dae2178d58..89113f2836d8 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,6 @@ __pycache__/ /build-* .idea/ + +# KDevelop IDE +*.kdev4 From ef0098e4565d5f54d59c85fc9c846857d68d5023 Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Mon, 18 Dec 2023 13:25:04 +0000 Subject: [PATCH 2/2] Fix plans and cannonize test with aggr functions. --- ydb/core/kqp/ut/query/kqp_explain_ut.cpp | 2 +- ydb/library/yql/utils/plan/plan_utils.cpp | 2 +- .../join_group_by_lookup.script.plan | 2 +- .../write_write_group_by.script.plan | 2 +- .../test.test_plans_column_/queries-original-plan-column-12 | 2 +- .../test.test_plans_column_/queries-original-plan-column-14 | 2 +- .../test.test_plans_column_/queries-original-plan-column-15 | 2 +- .../test.test_plans_column_/queries-original-plan-column-16 | 2 +- .../test.test_plans_column_/queries-original-plan-column-17 | 2 +- .../test.test_plans_column_/queries-original-plan-column-18 | 2 +- .../test.test_plans_column_/queries-original-plan-column-21 | 2 +- .../test.test_plans_column_/queries-original-plan-column-22 | 2 +- .../test.test_plans_column_/queries-original-plan-column-27 | 2 +- .../test.test_plans_column_/queries-original-plan-column-28 | 2 +- .../test.test_plans_column_/queries-original-plan-column-30 | 2 +- .../test.test_plans_column_/queries-original-plan-column-31 | 2 +- .../test.test_plans_column_/queries-original-plan-column-32 | 2 +- .../test.test_plans_column_/queries-original-plan-column-33 | 2 +- .../test.test_plans_column_/queries-original-plan-column-34 | 2 +- .../test.test_plans_column_/queries-original-plan-column-35 | 2 +- .../test.test_plans_column_/queries-original-plan-column-36 | 2 +- .../test.test_plans_column_/queries-original-plan-column-37 | 2 +- .../test.test_plans_column_/queries-original-plan-column-38 | 6 +++--- .../test.test_plans_column_/queries-original-plan-column-39 | 6 +++--- .../test.test_plans_column_/queries-original-plan-column-40 | 6 +++--- .../test.test_plans_column_/queries-original-plan-column-41 | 6 +++--- .../test.test_plans_column_/queries-original-plan-column-42 | 6 +++--- .../test.test_plans_column_/queries-original-plan-column-7 | 2 +- .../test.test_plans_column_/queries-original-plan-column-9 | 2 +- .../test.test_plans_row_/queries-original-plan-row-10 | 2 +- .../test.test_plans_row_/queries-original-plan-row-11 | 2 +- .../test.test_plans_row_/queries-original-plan-row-12 | 2 +- .../test.test_plans_row_/queries-original-plan-row-13 | 2 +- .../test.test_plans_row_/queries-original-plan-row-14 | 2 +- .../test.test_plans_row_/queries-original-plan-row-15 | 2 +- .../test.test_plans_row_/queries-original-plan-row-16 | 2 +- .../test.test_plans_row_/queries-original-plan-row-17 | 2 +- .../test.test_plans_row_/queries-original-plan-row-18 | 2 +- .../test.test_plans_row_/queries-original-plan-row-21 | 2 +- .../test.test_plans_row_/queries-original-plan-row-22 | 4 ++-- .../test.test_plans_row_/queries-original-plan-row-27 | 2 +- .../test.test_plans_row_/queries-original-plan-row-28 | 2 +- .../test.test_plans_row_/queries-original-plan-row-30 | 2 +- .../test.test_plans_row_/queries-original-plan-row-31 | 2 +- .../test.test_plans_row_/queries-original-plan-row-32 | 2 +- .../test.test_plans_row_/queries-original-plan-row-33 | 2 +- .../test.test_plans_row_/queries-original-plan-row-34 | 2 +- .../test.test_plans_row_/queries-original-plan-row-35 | 2 +- .../test.test_plans_row_/queries-original-plan-row-36 | 2 +- .../test.test_plans_row_/queries-original-plan-row-37 | 2 +- .../test.test_plans_row_/queries-original-plan-row-38 | 6 +++--- .../test.test_plans_row_/queries-original-plan-row-39 | 6 +++--- .../test.test_plans_row_/queries-original-plan-row-40 | 6 +++--- .../test.test_plans_row_/queries-original-plan-row-41 | 6 +++--- .../test.test_plans_row_/queries-original-plan-row-42 | 6 +++--- .../test.test_plans_row_/queries-original-plan-row-7 | 2 +- .../test.test_plans_row_/queries-original-plan-row-8 | 2 +- .../test.test_plans_row_/queries-original-plan-row-9 | 4 ++-- .../query_2.plan | 2 +- .../query_3.plan | 2 +- .../query_4.plan | 2 +- .../query_5.plan | 2 +- .../query_5.plan | 2 +- 63 files changed, 85 insertions(+), 85 deletions(-) diff --git a/ydb/core/kqp/ut/query/kqp_explain_ut.cpp b/ydb/core/kqp/ut/query/kqp_explain_ut.cpp index dfe2bad17c77..f359d21f7e35 100644 --- a/ydb/core/kqp/ut/query/kqp_explain_ut.cpp +++ b/ydb/core/kqp/ut/query/kqp_explain_ut.cpp @@ -173,7 +173,7 @@ Y_UNIT_TEST_SUITE(KqpExplain) { UNIT_ASSERT(aggregate.IsDefined()); UNIT_ASSERT(aggregate.GetMapSafe().at("GroupBy").GetStringSafe() == "item.App"); UNIT_ASSERT(aggregate.GetMapSafe().at("Aggregation").GetStringSafe() == - "{_yql_agg_0: MAX(item.Message),_yql_agg_1: MIN(item.Message)}"); + "{_yql_agg_0: MAX(item.Message,state._yql_agg_0),_yql_agg_1: MIN(item.Message,state._yql_agg_1)}"); } Y_UNIT_TEST(ComplexJoin) { diff --git a/ydb/library/yql/utils/plan/plan_utils.cpp b/ydb/library/yql/utils/plan/plan_utils.cpp index faa1524899f5..00454ff39577 100644 --- a/ydb/library/yql/utils/plan/plan_utils.cpp +++ b/ydb/library/yql/utils/plan/plan_utils.cpp @@ -159,7 +159,7 @@ TString PrettyExprStr(const TExprBase& expr) { return AggrOpToStr(expr); } else if (aggregations.contains(expr.Ref().Content())) { return TStringBuilder() << aggregations.at(expr.Ref().Content()) << "(" - << PrettyExprStr(TExprBase(expr.Ref().Child(0))) << ")"; + << PrettyExprStr(TExprBase(expr.Ref().Child(0))) << ',' << PrettyExprStr(TExprBase(expr.Ref().Child(1))) << ")"; } else if (expr.Maybe() || expr.Maybe()) { return BinaryOpToStr(expr); } else if (expr.Maybe() || expr.Maybe() || expr.Maybe()) { diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_group_by_lookup.script-script_/join_group_by_lookup.script.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_group_by_lookup.script-script_/join_group_by_lookup.script.plan index c24472f7b90d..7666f2d5ce74 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_group_by_lookup.script-script_/join_group_by_lookup.script.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_group_by_lookup.script-script_/join_group_by_lookup.script.plan @@ -199,7 +199,7 @@ "Operators": [ { "GroupBy": "item.Group", - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "Name": "Aggregate" }, { diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_write_group_by.script-script_/write_write_group_by.script.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_write_group_by.script-script_/write_write_group_by.script.plan index 7a9bec3b8407..b4c25b5db29a 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_write_group_by.script-script_/write_write_group_by.script.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_write_group_by.script-script_/write_write_group_by.script.plan @@ -166,7 +166,7 @@ "Operators": [ { "GroupBy": "item.Group", - "Aggregation": "{_yql_agg_0: MIN(item.Amount)}", + "Aggregation": "{_yql_agg_0: MIN(item.Amount,state._yql_agg_0)}", "Name": "Aggregate" }, { diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-12 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-12 index 43ecf8b34783..2d351249ea75 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-12 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-12 @@ -52,7 +52,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.SearchPhrase", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-14 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-14 index 3d8b8d643ebd..83be0059a72b 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-14 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-14 @@ -53,7 +53,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-15 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-15 index 1ece4c5f9162..07112d233729 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-15 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-15 @@ -52,7 +52,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.UserID", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-16 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-16 index 62ae06e8bd26..a1f9fbddb1c0 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-16 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-16 @@ -53,7 +53,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-17 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-17 index 0c8cc4c11167..3bf160b6e598 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-17 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-17 @@ -52,7 +52,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-18 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-18 index 72c048d8547b..43502ffa32ad 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-18 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-18 @@ -54,7 +54,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-21 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-21 index a82faeaf51ad..232e4660067e 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-21 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-21 @@ -52,7 +52,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0),_yql_agg_1: MIN(item.URL)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1),_yql_agg_1: MIN(item.URL,state._yql_agg_1)}", "GroupBy": "item.SearchPhrase", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-22 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-22 index 3e7b6dabf24b..91fef57e3962 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-22 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-22 @@ -66,7 +66,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0),_yql_agg_2: MIN(item.URL),_yql_agg_3: MIN(item.Title)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1),_yql_agg_2: MIN(item.URL,state._yql_agg_2),_yql_agg_3: MIN(item.Title,state._yql_agg_3)}", "GroupBy": "item.SearchPhrase", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-27 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-27 index 459197f6bc3a..7cb54b120b08 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-27 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-27 @@ -56,7 +56,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1)}", + "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1)}", "GroupBy": "item.CounterID", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-28 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-28 index c22f3630045f..92c88fe6a79e 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-28 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-28 @@ -56,7 +56,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1),_yql_agg_2: MIN(item.Referer)}", + "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_2: MIN(item.Referer,state._yql_agg_2)}", "GroupBy": "item.key", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-30 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-30 index 82562d3fde2c..747fd7947480 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-30 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-30 @@ -53,7 +53,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1),_yql_agg_2: SUM(item.IsRefresh)}", + "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_2: SUM(item.IsRefresh,state._yql_agg_2)}", "GroupBy": "", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-31 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-31 index 6c46fb62ae9e..b7ca2266b3bb 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-31 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-31 @@ -53,7 +53,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1),_yql_agg_2: SUM(item.IsRefresh)}", + "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_2: SUM(item.IsRefresh,state._yql_agg_2)}", "GroupBy": "", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-32 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-32 index 090e92598eac..e0543b43c658 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-32 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-32 @@ -53,7 +53,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1),_yql_agg_2: SUM(item.IsRefresh)}", + "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_2: SUM(item.IsRefresh,state._yql_agg_2)}", "GroupBy": "", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-33 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-33 index 5d299fa87060..676f85d7c8b1 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-33 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-33 @@ -52,7 +52,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.URL", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-34 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-34 index eeb6dac9f5d5..e59cd408fe39 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-34 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-34 @@ -53,7 +53,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-35 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-35 index dfc3adcb3c55..e8f2ea6d67a2 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-35 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-35 @@ -55,7 +55,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-36 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-36 index 6041c10e2133..40b199c6f90a 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-36 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-36 @@ -52,7 +52,7 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.URL", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-37 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-37 index 70c90875dabb..62c18b001ba8 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-37 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-37 @@ -52,7 +52,7 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.Title", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-38 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-38 index 4646b57fa002..3e711cd6e0fd 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-38 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-38 @@ -37,7 +37,7 @@ "Node Type": "Limit", "Operators": [ { - "Limit": "10 + 1000", + "Limit": "SUM(10,1000)", "Name": "Limit" } ], @@ -52,7 +52,7 @@ "Node Type": "TopSort", "Operators": [ { - "Limit": "10 + 1000", + "Limit": "SUM(10,1000)", "Name": "TopSort", "TopSortBy": "argument.Count0" } @@ -71,7 +71,7 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.URL", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-39 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-39 index 33f62ecb7969..9ceeac0cd832 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-39 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-39 @@ -37,7 +37,7 @@ "Node Type": "Limit", "Operators": [ { - "Limit": "10 + 1000", + "Limit": "SUM(10,1000)", "Name": "Limit" } ], @@ -52,7 +52,7 @@ "Node Type": "TopSort", "Operators": [ { - "Limit": "10 + 1000", + "Limit": "SUM(10,1000)", "Name": "TopSort", "TopSortBy": "argument.Count0" } @@ -75,7 +75,7 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-40 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-40 index 7e64534399ac..b0d6681e8b93 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-40 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-40 @@ -37,7 +37,7 @@ "Node Type": "Limit", "Operators": [ { - "Limit": "10 + 100", + "Limit": "SUM(10,100)", "Name": "Limit" } ], @@ -52,7 +52,7 @@ "Node Type": "TopSort", "Operators": [ { - "Limit": "10 + 100", + "Limit": "SUM(10,100)", "Name": "TopSort", "TopSortBy": "argument.Count0" } @@ -72,7 +72,7 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-41 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-41 index c5788da80221..ddf0f3c86058 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-41 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-41 @@ -37,7 +37,7 @@ "Node Type": "Limit", "Operators": [ { - "Limit": "10 + 10000", + "Limit": "SUM(10,10000)", "Name": "Limit" } ], @@ -52,7 +52,7 @@ "Node Type": "TopSort", "Operators": [ { - "Limit": "10 + 10000", + "Limit": "SUM(10,10000)", "Name": "TopSort", "TopSortBy": "argument.Count0" } @@ -72,7 +72,7 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-42 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-42 index 330935366f03..885aa0cc83c5 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-42 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-42 @@ -37,7 +37,7 @@ "Node Type": "Limit", "Operators": [ { - "Limit": "10 + 1000", + "Limit": "SUM(10,1000)", "Name": "Limit" } ], @@ -52,7 +52,7 @@ "Node Type": "TopSort", "Operators": [ { - "Limit": "10 + 1000", + "Limit": "SUM(10,1000)", "Name": "TopSort", "TopSortBy": "argument.Minute" } @@ -71,7 +71,7 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.Minute", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-7 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-7 index 40828295c126..6a2f1a60b6c1 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-7 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-7 @@ -52,7 +52,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.AdvEngineID", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-9 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-9 index b6752ea58596..ec0d99289d2f 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-9 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-9 @@ -66,7 +66,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1),_yql_agg_3: SUM(item.AdvEngineID)}", + "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_3: SUM(item.AdvEngineID,state._yql_agg_3)}", "GroupBy": "item.RegionID", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-10 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-10 index 1f15d925978e..e75e8bf61dc8 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-10 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-10 @@ -52,7 +52,7 @@ "Node Type": "Aggregate", "Operators": [ { - "Aggregation": "{_yql_agg_0: COUNT(item.UserID)}", + "Aggregation": "{_yql_agg_0: COUNT(item.UserID,state._yql_agg_0)}", "GroupBy": "item.MobilePhoneModel", "Name": "Aggregate" } diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-11 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-11 index 71c2eb90dc92..ec2c0e8bd2d1 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-11 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-11 @@ -53,7 +53,7 @@ "Node Type": "Aggregate", "Operators": [ { - "Aggregation": "{_yql_agg_0: COUNT(item.UserID)}", + "Aggregation": "{_yql_agg_0: COUNT(item.UserID,state._yql_agg_0)}", "GroupBy": "", "Name": "Aggregate" } diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-12 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-12 index d57154060782..bbca88b820b4 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-12 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-12 @@ -52,7 +52,7 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.SearchPhrase", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-13 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-13 index f0208cf9cb38..406747f9ec2d 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-13 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-13 @@ -52,7 +52,7 @@ "Node Type": "Aggregate", "Operators": [ { - "Aggregation": "{_yql_agg_0: COUNT(item.UserID)}", + "Aggregation": "{_yql_agg_0: COUNT(item.UserID,state._yql_agg_0)}", "GroupBy": "item.SearchPhrase", "Name": "Aggregate" } diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-14 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-14 index fed855e76376..a784cbf5a673 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-14 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-14 @@ -53,7 +53,7 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-15 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-15 index d726255c5738..c557ff5c6023 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-15 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-15 @@ -52,7 +52,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.UserID", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-16 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-16 index 4e5d2da1e718..878e3736e4f2 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-16 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-16 @@ -53,7 +53,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-17 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-17 index 65ff17b232b6..f6f1a5e7aaf3 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-17 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-17 @@ -52,7 +52,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-18 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-18 index b0645a100450..c659ad263396 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-18 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-18 @@ -54,7 +54,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-21 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-21 index 8945945f0fc6..343bdbb6b7e3 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-21 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-21 @@ -52,7 +52,7 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0),_yql_agg_1: MIN(item.URL)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1),_yql_agg_1: MIN(item.URL,state._yql_agg_1)}", "GroupBy": "item.SearchPhrase", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-22 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-22 index f4a0127debc7..8a751bf3406c 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-22 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-22 @@ -66,7 +66,7 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0),_yql_agg_2: MIN(item.URL),_yql_agg_3: MIN(item.Title)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1),_yql_agg_2: MIN(item.URL,state._yql_agg_2),_yql_agg_3: MIN(item.Title,state._yql_agg_3)}", "GroupBy": "item.SearchPhrase", "Name": "Aggregate" }, @@ -111,7 +111,7 @@ "Node Type": "Aggregate", "Operators": [ { - "Aggregation": "{_yql_agg_1: COUNT(item.UserID)}", + "Aggregation": "{_yql_agg_1: COUNT(item.UserID,state._yql_agg_1)}", "GroupBy": "item.SearchPhrase", "Name": "Aggregate" } diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-27 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-27 index 219499edeb1a..a69d524d50e6 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-27 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-27 @@ -56,7 +56,7 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1)}", + "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1)}", "GroupBy": "item.CounterID", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-28 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-28 index 6cb7b2daa8c5..61c002effd86 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-28 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-28 @@ -56,7 +56,7 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1),_yql_agg_2: MIN(item.Referer)}", + "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_2: MIN(item.Referer,state._yql_agg_2)}", "GroupBy": "item.key", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-30 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-30 index f77754c19d4a..b4ed740702ae 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-30 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-30 @@ -53,7 +53,7 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1),_yql_agg_2: SUM(item.IsRefresh)}", + "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_2: SUM(item.IsRefresh,state._yql_agg_2)}", "GroupBy": "", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-31 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-31 index 21bbff9b148e..d83016bc5273 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-31 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-31 @@ -53,7 +53,7 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1),_yql_agg_2: SUM(item.IsRefresh)}", + "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_2: SUM(item.IsRefresh,state._yql_agg_2)}", "GroupBy": "", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-32 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-32 index 13bf7b306c17..96f52901b9e0 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-32 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-32 @@ -53,7 +53,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1),_yql_agg_2: SUM(item.IsRefresh)}", + "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_2: SUM(item.IsRefresh,state._yql_agg_2)}", "GroupBy": "", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-33 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-33 index 4ac14c76126d..725da2f005a4 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-33 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-33 @@ -52,7 +52,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.URL", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-34 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-34 index 4159e4dbe27f..0be306d18eab 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-34 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-34 @@ -53,7 +53,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-35 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-35 index 62f97b07db9c..58e1973b3185 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-35 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-35 @@ -55,7 +55,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-36 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-36 index a8522f1bc5a4..d2c53640ebd2 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-36 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-36 @@ -52,7 +52,7 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.URL", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-37 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-37 index 3cf9925797aa..ea5692abd2cd 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-37 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-37 @@ -52,7 +52,7 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.Title", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-38 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-38 index 1e5fad9efa93..016d14af8b68 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-38 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-38 @@ -37,7 +37,7 @@ "Node Type": "Limit", "Operators": [ { - "Limit": "10 + 1000", + "Limit": "SUM(10,1000)", "Name": "Limit" } ], @@ -52,7 +52,7 @@ "Node Type": "TopSort", "Operators": [ { - "Limit": "10 + 1000", + "Limit": "SUM(10,1000)", "Name": "TopSort", "TopSortBy": "argument.Count0" } @@ -71,7 +71,7 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.URL", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-39 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-39 index b35bf631e3e7..0ffa7a340e05 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-39 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-39 @@ -37,7 +37,7 @@ "Node Type": "Limit", "Operators": [ { - "Limit": "10 + 1000", + "Limit": "SUM(10,1000)", "Name": "Limit" } ], @@ -52,7 +52,7 @@ "Node Type": "TopSort", "Operators": [ { - "Limit": "10 + 1000", + "Limit": "SUM(10,1000)", "Name": "TopSort", "TopSortBy": "argument.Count0" } @@ -75,7 +75,7 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-40 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-40 index 08e5a56f8fa5..193e1f8c8c65 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-40 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-40 @@ -37,7 +37,7 @@ "Node Type": "Limit", "Operators": [ { - "Limit": "10 + 100", + "Limit": "SUM(10,100)", "Name": "Limit" } ], @@ -52,7 +52,7 @@ "Node Type": "TopSort", "Operators": [ { - "Limit": "10 + 100", + "Limit": "SUM(10,100)", "Name": "TopSort", "TopSortBy": "argument.Count0" } @@ -72,7 +72,7 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-41 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-41 index 90d3101fb97b..dc4e0287e036 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-41 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-41 @@ -37,7 +37,7 @@ "Node Type": "Limit", "Operators": [ { - "Limit": "10 + 10000", + "Limit": "SUM(10,10000)", "Name": "Limit" } ], @@ -52,7 +52,7 @@ "Node Type": "TopSort", "Operators": [ { - "Limit": "10 + 10000", + "Limit": "SUM(10,10000)", "Name": "TopSort", "TopSortBy": "argument.Count0" } @@ -72,7 +72,7 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-42 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-42 index b2fa71447612..7c9e6dee2e7c 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-42 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-42 @@ -37,7 +37,7 @@ "Node Type": "Limit", "Operators": [ { - "Limit": "10 + 1000", + "Limit": "SUM(10,1000)", "Name": "Limit" } ], @@ -52,7 +52,7 @@ "Node Type": "TopSort", "Operators": [ { - "Limit": "10 + 1000", + "Limit": "SUM(10,1000)", "Name": "TopSort", "TopSortBy": "argument.Minute" } @@ -71,7 +71,7 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.Minute", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-7 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-7 index b26a03d7ca13..b21d9b0b48f8 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-7 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-7 @@ -52,7 +52,7 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}", + "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "item.AdvEngineID", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-8 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-8 index 16e37a79a39c..905bf28419b8 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-8 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-8 @@ -52,7 +52,7 @@ "Node Type": "Aggregate", "Operators": [ { - "Aggregation": "{_yql_agg_0: COUNT(item.UserID)}", + "Aggregation": "{_yql_agg_0: COUNT(item.UserID,state._yql_agg_0)}", "GroupBy": "item.RegionID", "Name": "Aggregate" } diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-9 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-9 index 15497b6c7303..8160f9461c1b 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-9 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-9 @@ -66,7 +66,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1),_yql_agg_3: SUM(item.AdvEngineID)}", + "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_3: SUM(item.AdvEngineID,state._yql_agg_3)}", "GroupBy": "item.RegionID", "Name": "Aggregate" }, @@ -107,7 +107,7 @@ "Node Type": "Aggregate", "Operators": [ { - "Aggregation": "{_yql_agg_2: COUNT(item.UserID)}", + "Aggregation": "{_yql_agg_2: COUNT(item.UserID,state._yql_agg_2)}", "GroupBy": "item.RegionID", "Name": "Aggregate" } diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_2.plan index c383aac9de05..5016e66e00df 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_2.plan @@ -46,7 +46,7 @@ "Node Type": "Aggregate-LeftJoin (MapJoin)", "Operators": [ { - "Aggregation": "{_yql_agg_0: COUNT(item.t1.q1)}", + "Aggregation": "{_yql_agg_0: COUNT(item.t1.q1,state._yql_agg_0)}", "GroupBy": "item.t1.q2", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_3.plan index f978a705ce4a..cc2a203859b0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_3.plan @@ -46,7 +46,7 @@ "Node Type": "Aggregate-LeftJoin (MapJoin)", "Operators": [ { - "Aggregation": "{_yql_agg_0: COUNT(item.t2.q1)}", + "Aggregation": "{_yql_agg_0: COUNT(item.t2.q1,state._yql_agg_0)}", "GroupBy": "item.t1.q2", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_4.plan index d5c04b1c55f2..70d6941f43e2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_4.plan @@ -46,7 +46,7 @@ "Node Type": "Aggregate-LeftJoin (MapJoin)", "Operators": [ { - "Aggregation": "{_yql_agg_0: COUNT(item.t2.q1)}", + "Aggregation": "{_yql_agg_0: COUNT(item.t2.q1,state._yql_agg_0)}", "GroupBy": "item.t1.q2", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_5.plan index ea3a287fa470..5aa0e05af4d3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_5.plan @@ -46,7 +46,7 @@ "Node Type": "Aggregate-LeftJoin (MapJoin)", "Operators": [ { - "Aggregation": "{_yql_agg_0: COUNT(item.t2.q1)}", + "Aggregation": "{_yql_agg_0: COUNT(item.t2.q1,state._yql_agg_0)}", "GroupBy": "item.t1.q2", "Name": "Aggregate" }, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_5.plan index b4012b7cc600..769a42f909b6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_5.plan @@ -74,7 +74,7 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(item.salary)}", + "Aggregation": "{_yql_agg_0: SUM(item.salary,state._yql_agg_0)}", "GroupBy": "item.depname", "Name": "Aggregate" },