Skip to content

Commit f85c76d

Browse files
Tony-RomanovTony-Romanov
authored
Fix plans and cannonize tests with aggr functions. (#550)
* Fix plans and cannonize test with aggr functions.
1 parent 6064f61 commit f85c76d

File tree

63 files changed

+85
-85
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+85
-85
lines changed

‎ydb/core/kqp/ut/query/kqp_explain_ut.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
173173
UNIT_ASSERT(aggregate.IsDefined());
174174
UNIT_ASSERT(aggregate.GetMapSafe().at("GroupBy").GetStringSafe() == "item.App");
175175
UNIT_ASSERT(aggregate.GetMapSafe().at("Aggregation").GetStringSafe() ==
176-
"{_yql_agg_0: MAX(item.Message),_yql_agg_1: MIN(item.Message)}");
176+
"{_yql_agg_0: MAX(item.Message,state._yql_agg_0),_yql_agg_1: MIN(item.Message,state._yql_agg_1)}");
177177
}
178178

179179
Y_UNIT_TEST(ComplexJoin) {

‎ydb/library/yql/utils/plan/plan_utils.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ TString PrettyExprStr(const TExprBase& expr) {
159159
return AggrOpToStr(expr);
160160
} else if (aggregations.contains(expr.Ref().Content())) {
161161
return TStringBuilder() << aggregations.at(expr.Ref().Content()) << "("
162-
<< PrettyExprStr(TExprBase(expr.Ref().Child(0))) << ")";
162+
<< PrettyExprStr(TExprBase(expr.Ref().Child(0))) << ',' << PrettyExprStr(TExprBase(expr.Ref().Child(1))) << ")";
163163
} else if (expr.Maybe<TCoBinaryArithmetic>() || expr.Maybe<TCoCompare>()) {
164164
return BinaryOpToStr(expr);
165165
} else if (expr.Maybe<TCoAnd>() || expr.Maybe<TCoOr>() || expr.Maybe<TCoXor>()) {

‎ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_group_by_lookup.script-script_/join_group_by_lookup.script.plan

+1-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@
199199
"Operators": [
200200
{
201201
"GroupBy": "item.Group",
202-
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}",
202+
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}",
203203
"Name": "Aggregate"
204204
},
205205
{

‎ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_write_group_by.script-script_/write_write_group_by.script.plan

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
"Operators": [
167167
{
168168
"GroupBy": "item.Group",
169-
"Aggregation": "{_yql_agg_0: MIN(item.Amount)}",
169+
"Aggregation": "{_yql_agg_0: MIN(item.Amount,state._yql_agg_0)}",
170170
"Name": "Aggregate"
171171
},
172172
{

‎ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-12

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"Node Type": "Aggregate-TableFullScan",
5353
"Operators": [
5454
{
55-
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}",
55+
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}",
5656
"GroupBy": "item.SearchPhrase",
5757
"Name": "Aggregate"
5858
},

‎ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-14

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"Node Type": "Aggregate-TableFullScan",
5454
"Operators": [
5555
{
56-
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}",
56+
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}",
5757
"GroupBy": "",
5858
"Name": "Aggregate"
5959
},

‎ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-15

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"Node Type": "Aggregate-TableFullScan",
5353
"Operators": [
5454
{
55-
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}",
55+
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}",
5656
"GroupBy": "item.UserID",
5757
"Name": "Aggregate"
5858
},

‎ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-16

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"Node Type": "Aggregate-TableFullScan",
5454
"Operators": [
5555
{
56-
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}",
56+
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}",
5757
"GroupBy": "",
5858
"Name": "Aggregate"
5959
},

‎ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-17

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"Node Type": "Aggregate-TableFullScan",
5353
"Operators": [
5454
{
55-
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}",
55+
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}",
5656
"GroupBy": "",
5757
"Name": "Aggregate"
5858
},

‎ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-18

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"Node Type": "Aggregate-TableFullScan",
5555
"Operators": [
5656
{
57-
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}",
57+
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}",
5858
"GroupBy": "",
5959
"Name": "Aggregate"
6060
},

‎ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-21

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"Node Type": "Aggregate-TableFullScan",
5353
"Operators": [
5454
{
55-
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0),_yql_agg_1: MIN(item.URL)}",
55+
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1),_yql_agg_1: MIN(item.URL,state._yql_agg_1)}",
5656
"GroupBy": "item.SearchPhrase",
5757
"Name": "Aggregate"
5858
},

‎ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-22

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"Node Type": "Aggregate-TableFullScan",
6767
"Operators": [
6868
{
69-
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0),_yql_agg_2: MIN(item.URL),_yql_agg_3: MIN(item.Title)}",
69+
"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)}",
7070
"GroupBy": "item.SearchPhrase",
7171
"Name": "Aggregate"
7272
},

‎ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-27

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"Node Type": "Aggregate-TableFullScan",
5757
"Operators": [
5858
{
59-
"Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1)}",
59+
"Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1)}",
6060
"GroupBy": "item.CounterID",
6161
"Name": "Aggregate"
6262
},

‎ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-28

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"Node Type": "Aggregate-TableFullScan",
5757
"Operators": [
5858
{
59-
"Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1),_yql_agg_2: MIN(item.Referer)}",
59+
"Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_2: MIN(item.Referer,state._yql_agg_2)}",
6060
"GroupBy": "item.key",
6161
"Name": "Aggregate"
6262
},

‎ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-30

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"Node Type": "Aggregate-TableFullScan",
5454
"Operators": [
5555
{
56-
"Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1),_yql_agg_2: SUM(item.IsRefresh)}",
56+
"Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_2: SUM(item.IsRefresh,state._yql_agg_2)}",
5757
"GroupBy": "",
5858
"Name": "Aggregate"
5959
},

‎ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-31

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"Node Type": "Aggregate-TableFullScan",
5454
"Operators": [
5555
{
56-
"Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1),_yql_agg_2: SUM(item.IsRefresh)}",
56+
"Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_2: SUM(item.IsRefresh,state._yql_agg_2)}",
5757
"GroupBy": "",
5858
"Name": "Aggregate"
5959
},

‎ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-32

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"Node Type": "Aggregate-TableFullScan",
5454
"Operators": [
5555
{
56-
"Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1),_yql_agg_2: SUM(item.IsRefresh)}",
56+
"Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_2: SUM(item.IsRefresh,state._yql_agg_2)}",
5757
"GroupBy": "",
5858
"Name": "Aggregate"
5959
},

‎ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-33

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"Node Type": "Aggregate-TableFullScan",
5353
"Operators": [
5454
{
55-
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}",
55+
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}",
5656
"GroupBy": "item.URL",
5757
"Name": "Aggregate"
5858
},

‎ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-34

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"Node Type": "Aggregate-TableFullScan",
5454
"Operators": [
5555
{
56-
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}",
56+
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}",
5757
"GroupBy": "",
5858
"Name": "Aggregate"
5959
},

‎ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-35

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"Node Type": "Aggregate-TableFullScan",
5656
"Operators": [
5757
{
58-
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}",
58+
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}",
5959
"GroupBy": "",
6060
"Name": "Aggregate"
6161
},

‎ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-36

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"Node Type": "Aggregate-Filter-TableFullScan",
5353
"Operators": [
5454
{
55-
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}",
55+
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}",
5656
"GroupBy": "item.URL",
5757
"Name": "Aggregate"
5858
},

‎ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-37

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"Node Type": "Aggregate-Filter-TableFullScan",
5353
"Operators": [
5454
{
55-
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}",
55+
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}",
5656
"GroupBy": "item.Title",
5757
"Name": "Aggregate"
5858
},

‎ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-38

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"Node Type": "Limit",
3838
"Operators": [
3939
{
40-
"Limit": "10 + 1000",
40+
"Limit": "SUM(10,1000)",
4141
"Name": "Limit"
4242
}
4343
],
@@ -52,7 +52,7 @@
5252
"Node Type": "TopSort",
5353
"Operators": [
5454
{
55-
"Limit": "10 + 1000",
55+
"Limit": "SUM(10,1000)",
5656
"Name": "TopSort",
5757
"TopSortBy": "argument.Count0"
5858
}
@@ -71,7 +71,7 @@
7171
"Node Type": "Aggregate-Filter-TableFullScan",
7272
"Operators": [
7373
{
74-
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0)}",
74+
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}",
7575
"GroupBy": "item.URL",
7676
"Name": "Aggregate"
7777
},

0 commit comments

Comments
 (0)