Skip to content

Commit 993139c

Browse files
maximyurchuknepal
maximyurchuk
and
nepal
authored
canonize (#17636)
Co-authored-by: Andrey Neporada <aneporada@ydb.tech>
1 parent 7a03365 commit 993139c

File tree

11 files changed

+73
-209
lines changed
  • ydb/tests
    • fq/streaming_optimize/canondata
      • test_sql_streaming.test_suites-GroupByHopPercentile-default.txt_
      • test_sql_streaming.test_suites-GroupByHopTimeExtractorUnusedColumns-default.txt_
      • test_sql_streaming.test_suites-GroupByHoppingWindowPercentile-default.txt_
      • test_sql_streaming.test_suites-GroupByHoppingWindowTimeExtractorUnusedColumns-default.txt_
    • functional/suite_tests/canondata

11 files changed

+73
-209
lines changed

‎ydb/tests/fq/streaming_optimize/canondata/test_sql_streaming.test_suites-GroupByHopPercentile-default.txt_/ast.txt

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -106,22 +106,18 @@
106106
)))))
107107
(return (AsStruct '($63 $100)))
108108
))) (lambda '($105 $106 $107) (block '(
109-
(let $108 (FlatMap (Member $106 $63) (lambda '($109) (block '(
110-
(let $110 (CallableType '() $66 $64 $66))
111-
(let $111 (Udf '"Stat.TDigest_GetPercentile" (Void) (VoidType) '"" $110 (VoidType) '"" $18))
112-
(let $112 (Apply $111 $109 (Double '"0.75")))
113-
(let $113 (Apply $111 $109 (Double '"0.9")))
114-
(return (Just '($112 $113)))
115-
)))))
116-
(return (AsStruct '('Percentile0 (Nth $108 '0)) '('Percentile1 (Nth $108 '1)) '('"_yql_time" $107)))
109+
(let $108 (Member $106 $63))
110+
(let $109 (CallableType '() $66 $64 $66))
111+
(let $110 (Udf '"Stat.TDigest_GetPercentile" (Void) (VoidType) '"" $109 (VoidType) '"" $18))
112+
(return (AsStruct '('Percentile0 (FlatMap $108 (lambda '($111) (Just (Apply $110 $111 (Double '"0.75")))))) '('Percentile1 (FlatMap $108 (lambda '($112) (Just (Apply $110 $112 (Double '"0.9")))))) '('"_yql_time" $107)))
117113
))) '0))
118-
(return (FlatMap (ExtractMembers $70 '('Percentile0 'Percentile1)) (lambda '($114) (block '(
119-
(let $115 (Udf '"Yson2.SerializeText" (Void) (VoidType) '"" $21 (VoidType) '"" $18))
120-
(let $116 (StructType '('"p75" $67) '('"p90" $67)))
121-
(let $117 (TupleType (TupleType $116) (StructType) (TupleType)))
122-
(let $118 (CallableType '() $25 '($116)))
123-
(let $119 (Udf '"Yson2.From" (Void) $117 '"" $118 (VoidType) '"" $18))
124-
(return (Just (AsStruct '('"column0" (Apply $115 (Apply $119 (AsStruct '('"p75" (Member $114 'Percentile0)) '('"p90" (Member $114 'Percentile1)))))))))
114+
(return (FlatMap (ExtractMembers $70 '('Percentile0 'Percentile1)) (lambda '($113) (block '(
115+
(let $114 (Udf '"Yson2.SerializeText" (Void) (VoidType) '"" $21 (VoidType) '"" $18))
116+
(let $115 (StructType '('"p75" $67) '('"p90" $67)))
117+
(let $116 (TupleType (TupleType $115) (StructType) (TupleType)))
118+
(let $117 (CallableType '() $25 '($115)))
119+
(let $118 (Udf '"Yson2.From" (Void) $116 '"" $117 (VoidType) '"" $18))
120+
(return (Just (AsStruct '('"column0" (Apply $114 (Apply $118 (AsStruct '('"p75" (Member $113 'Percentile0)) '('"p90" (Member $113 'Percentile1)))))))))
125121
)))))
126122
))) '('('"_logical_id" '0)) '((DqSink '0 $27 $29))))) $27))
127123
)

‎ydb/tests/fq/streaming_optimize/canondata/test_sql_streaming.test_suites-GroupByHopTimeExtractorUnusedColumns-default.txt_/ast.txt

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -106,22 +106,18 @@
106106
)))))
107107
(return (AsStruct '($63 $100)))
108108
))) (lambda '($105 $106 $107) (block '(
109-
(let $108 (FlatMap (Member $106 $63) (lambda '($109) (block '(
110-
(let $110 (CallableType '() $66 $64 $66))
111-
(let $111 (Udf '"Stat.TDigest_GetPercentile" (Void) (VoidType) '"" $110 (VoidType) '"" $18))
112-
(let $112 (Apply $111 $109 (Double '"0.75")))
113-
(let $113 (Apply $111 $109 (Double '"0.9")))
114-
(return (Just '($112 $113)))
115-
)))))
116-
(return (AsStruct '('Percentile0 (Nth $108 '0)) '('Percentile1 (Nth $108 '1)) '('"_yql_time" $107)))
109+
(let $108 (Member $106 $63))
110+
(let $109 (CallableType '() $66 $64 $66))
111+
(let $110 (Udf '"Stat.TDigest_GetPercentile" (Void) (VoidType) '"" $109 (VoidType) '"" $18))
112+
(return (AsStruct '('Percentile0 (FlatMap $108 (lambda '($111) (Just (Apply $110 $111 (Double '"0.75")))))) '('Percentile1 (FlatMap $108 (lambda '($112) (Just (Apply $110 $112 (Double '"0.9")))))) '('"_yql_time" $107)))
117113
))) '0))
118-
(return (FlatMap (ExtractMembers $70 '('Percentile0 'Percentile1)) (lambda '($114) (block '(
119-
(let $115 (Udf '"Yson2.SerializeText" (Void) (VoidType) '"" $21 (VoidType) '"" $18))
120-
(let $116 (StructType '('"p75" $67) '('"p90" $67)))
121-
(let $117 (TupleType (TupleType $116) (StructType) (TupleType)))
122-
(let $118 (CallableType '() $25 '($116)))
123-
(let $119 (Udf '"Yson2.From" (Void) $117 '"" $118 (VoidType) '"" $18))
124-
(return (Just (AsStruct '('"column0" (Apply $115 (Apply $119 (AsStruct '('"p75" (Member $114 'Percentile0)) '('"p90" (Member $114 'Percentile1)))))))))
114+
(return (FlatMap (ExtractMembers $70 '('Percentile0 'Percentile1)) (lambda '($113) (block '(
115+
(let $114 (Udf '"Yson2.SerializeText" (Void) (VoidType) '"" $21 (VoidType) '"" $18))
116+
(let $115 (StructType '('"p75" $67) '('"p90" $67)))
117+
(let $116 (TupleType (TupleType $115) (StructType) (TupleType)))
118+
(let $117 (CallableType '() $25 '($115)))
119+
(let $118 (Udf '"Yson2.From" (Void) $116 '"" $117 (VoidType) '"" $18))
120+
(return (Just (AsStruct '('"column0" (Apply $114 (Apply $118 (AsStruct '('"p75" (Member $113 'Percentile0)) '('"p90" (Member $113 'Percentile1)))))))))
125121
)))))
126122
))) '('('"_logical_id" '0)) '((DqSink '0 $27 $29))))) $27))
127123
)

‎ydb/tests/fq/streaming_optimize/canondata/test_sql_streaming.test_suites-GroupByHoppingWindowPercentile-default.txt_/ast.txt

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -66,25 +66,21 @@
6666
)))))
6767
(return (AsStruct '($31 $66)))
6868
))) (lambda '($71 $72 $73) (block '(
69-
(let $74 (FlatMap (Member $72 $31) (lambda '($75) (block '(
70-
(let $76 (CallableType '() $34 $32 $34))
71-
(let $77 (Udf '"Stat.TDigest_GetPercentile" (Void) (VoidType) '"" $76 (VoidType) '"" $38))
72-
(let $78 (Apply $77 $75 (Double '"0.75")))
73-
(let $79 (Apply $77 $75 (Double '"0.9")))
74-
(return (Just '($78 $79)))
75-
)))))
76-
(return (AsStruct '('Percentile0 (Nth $74 '0)) '('Percentile1 (Nth $74 '1)) '('"group0" $73)))
69+
(let $74 (Member $72 $31))
70+
(let $75 (CallableType '() $34 $32 $34))
71+
(let $76 (Udf '"Stat.TDigest_GetPercentile" (Void) (VoidType) '"" $75 (VoidType) '"" $38))
72+
(return (AsStruct '('Percentile0 (FlatMap $74 (lambda '($77) (Just (Apply $76 $77 (Double '"0.75")))))) '('Percentile1 (FlatMap $74 (lambda '($78) (Just (Apply $76 $78 (Double '"0.9")))))) '('"group0" $73)))
7773
))) '1))
78-
(return (FlatMap (ExtractMembers $40 '('Percentile0 'Percentile1)) (lambda '($80) (block '(
79-
(let $81 (ResourceType '"Yson2.Node"))
80-
(let $82 '($81 '"" '1))
81-
(let $83 (CallableType '() '((DataType 'Yson)) $82))
82-
(let $84 (Udf '"Yson2.SerializeText" (Void) (VoidType) '"" $83 (VoidType) '"" $38))
83-
(let $85 (StructType '('"p75" $35) '('"p90" $35)))
84-
(let $86 (TupleType (TupleType $85) (StructType) (TupleType)))
85-
(let $87 (CallableType '() '($81) '($85)))
86-
(let $88 (Udf '"Yson2.From" (Void) $86 '"" $87 (VoidType) '"" $38))
87-
(return (Just (AsStruct '('"column0" (Apply $84 (Apply $88 (AsStruct '('"p75" (Member $80 'Percentile0)) '('"p90" (Member $80 'Percentile1)))))))))
74+
(return (FlatMap (ExtractMembers $40 '('Percentile0 'Percentile1)) (lambda '($79) (block '(
75+
(let $80 (ResourceType '"Yson2.Node"))
76+
(let $81 '($80 '"" '1))
77+
(let $82 (CallableType '() '((DataType 'Yson)) $81))
78+
(let $83 (Udf '"Yson2.SerializeText" (Void) (VoidType) '"" $82 (VoidType) '"" $38))
79+
(let $84 (StructType '('"p75" $35) '('"p90" $35)))
80+
(let $85 (TupleType (TupleType $84) (StructType) (TupleType)))
81+
(let $86 (CallableType '() '($80) '($84)))
82+
(let $87 (Udf '"Yson2.From" (Void) $85 '"" $86 (VoidType) '"" $38))
83+
(return (Just (AsStruct '('"column0" (Apply $83 (Apply $87 (AsStruct '('"p75" (Member $79 'Percentile0)) '('"p90" (Member $79 'Percentile1)))))))))
8884
)))))
8985
))) '('('"_logical_id" '0)) '((DqSink '0 $21 $23))))) $21))
9086
)

‎ydb/tests/fq/streaming_optimize/canondata/test_sql_streaming.test_suites-GroupByHoppingWindowTimeExtractorUnusedColumns-default.txt_/ast.txt

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -66,25 +66,21 @@
6666
)))))
6767
(return (AsStruct '($31 $66)))
6868
))) (lambda '($71 $72 $73) (block '(
69-
(let $74 (FlatMap (Member $72 $31) (lambda '($75) (block '(
70-
(let $76 (CallableType '() $34 $32 $34))
71-
(let $77 (Udf '"Stat.TDigest_GetPercentile" (Void) (VoidType) '"" $76 (VoidType) '"" $38))
72-
(let $78 (Apply $77 $75 (Double '"0.75")))
73-
(let $79 (Apply $77 $75 (Double '"0.9")))
74-
(return (Just '($78 $79)))
75-
)))))
76-
(return (AsStruct '('Percentile0 (Nth $74 '0)) '('Percentile1 (Nth $74 '1)) '('"group0" $73)))
69+
(let $74 (Member $72 $31))
70+
(let $75 (CallableType '() $34 $32 $34))
71+
(let $76 (Udf '"Stat.TDigest_GetPercentile" (Void) (VoidType) '"" $75 (VoidType) '"" $38))
72+
(return (AsStruct '('Percentile0 (FlatMap $74 (lambda '($77) (Just (Apply $76 $77 (Double '"0.75")))))) '('Percentile1 (FlatMap $74 (lambda '($78) (Just (Apply $76 $78 (Double '"0.9")))))) '('"group0" $73)))
7773
))) '1))
78-
(return (FlatMap (ExtractMembers $40 '('Percentile0 'Percentile1)) (lambda '($80) (block '(
79-
(let $81 (ResourceType '"Yson2.Node"))
80-
(let $82 '($81 '"" '1))
81-
(let $83 (CallableType '() '((DataType 'Yson)) $82))
82-
(let $84 (Udf '"Yson2.SerializeText" (Void) (VoidType) '"" $83 (VoidType) '"" $38))
83-
(let $85 (StructType '('"p75" $35) '('"p90" $35)))
84-
(let $86 (TupleType (TupleType $85) (StructType) (TupleType)))
85-
(let $87 (CallableType '() '($81) '($85)))
86-
(let $88 (Udf '"Yson2.From" (Void) $86 '"" $87 (VoidType) '"" $38))
87-
(return (Just (AsStruct '('"column0" (Apply $84 (Apply $88 (AsStruct '('"p75" (Member $80 'Percentile0)) '('"p90" (Member $80 'Percentile1)))))))))
74+
(return (FlatMap (ExtractMembers $40 '('Percentile0 'Percentile1)) (lambda '($79) (block '(
75+
(let $80 (ResourceType '"Yson2.Node"))
76+
(let $81 '($80 '"" '1))
77+
(let $82 (CallableType '() '((DataType 'Yson)) $81))
78+
(let $83 (Udf '"Yson2.SerializeText" (Void) (VoidType) '"" $82 (VoidType) '"" $38))
79+
(let $84 (StructType '('"p75" $35) '('"p90" $35)))
80+
(let $85 (TupleType (TupleType $84) (StructType) (TupleType)))
81+
(let $86 (CallableType '() '($80) '($84)))
82+
(let $87 (Udf '"Yson2.From" (Void) $85 '"" $86 (VoidType) '"" $38))
83+
(return (Just (AsStruct '('"column0" (Apply $83 (Apply $87 (AsStruct '('"p75" (Member $79 'Percentile0)) '('"p90" (Member $79 'Percentile1)))))))))
8884
)))))
8985
))) '('('"_logical_id" '0)) '((DqSink '0 $21 $23))))) $21))
9086
)

‎ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_5.plan

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,6 @@
7474
{
7575
"InternalOperatorId": 1
7676
},
77-
{
78-
"InternalOperatorId": 1
79-
},
8077
{
8178
"InternalOperatorId": 1
8279
}

‎ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_13.plan

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,25 +33,13 @@
3333
"Operators": [
3434
{
3535
"Inputs": [
36-
{
37-
"InternalOperatorId": 1
38-
},
39-
{
40-
"InternalOperatorId": 1
41-
},
42-
{
43-
"InternalOperatorId": 1
44-
},
45-
{
46-
"InternalOperatorId": 1
47-
},
4836
{
4937
"InternalOperatorId": 1
5038
}
5139
],
5240
"Limit": "1001",
5341
"Name": "TopSort",
54-
"TopSortBy": "row.foo1_id"
42+
"TopSortBy": "argument.foo1.join_key"
5543
},
5644
{
5745
"Condition": "foo1.join_key = foo3.foo2.f1",
@@ -182,7 +170,7 @@
182170
}
183171
],
184172
"SortColumns": [
185-
"foo1_id (Asc)"
173+
"foo1.join_key (Asc)"
186174
]
187175
}
188176
]

‎ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_10.plan

Lines changed: 8 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -33,40 +33,13 @@
3333
"Operators": [
3434
{
3535
"Inputs": [
36-
{
37-
"InternalOperatorId": 1
38-
},
39-
{
40-
"InternalOperatorId": 1
41-
},
42-
{
43-
"InternalOperatorId": 1
44-
},
45-
{
46-
"InternalOperatorId": 1
47-
},
48-
{
49-
"InternalOperatorId": 1
50-
},
51-
{
52-
"InternalOperatorId": 1
53-
},
54-
{
55-
"InternalOperatorId": 1
56-
},
57-
{
58-
"InternalOperatorId": 1
59-
},
60-
{
61-
"InternalOperatorId": 1
62-
},
6336
{
6437
"InternalOperatorId": 1
6538
}
6639
],
6740
"Limit": "1001",
6841
"Name": "TopSort",
69-
"TopSortBy": "row.x1"
42+
"TopSortBy": "argument.x_1.x1"
7043
},
7144
{
7245
"Condition": "x_1.x1 = xx.x1",
@@ -89,7 +62,7 @@
8962
"PlanNodeType": "Connection",
9063
"Plans": [
9164
{
92-
"CTE Name": "precompute_0_0",
65+
"CTE Name": "precompute_0_1",
9366
"Node Type": "LeftJoin (MapJoin)-ConstantExpr",
9467
"Operators": [
9568
{
@@ -107,7 +80,7 @@
10780
{
10881
"Inputs": [],
10982
"Name": "ToFlow",
110-
"ToFlow": "precompute_0_0"
83+
"ToFlow": "precompute_0_1"
11184
}
11285
],
11386
"PlanNodeId": 18,
@@ -158,7 +131,7 @@
158131
"PlanNodeType": "Connection",
159132
"Plans": [
160133
{
161-
"CTE Name": "precompute_0_0",
134+
"CTE Name": "precompute_0_1",
162135
"Node Type": "ConstantExpr-Aggregate",
163136
"Operators": [
164137
{
@@ -171,7 +144,7 @@
171144
"Name": "Iterator"
172145
},
173146
{
174-
"Input": "precompute_0_0",
147+
"Input": "precompute_0_1",
175148
"Inputs": [],
176149
"Name": "PartitionByKey"
177150
}
@@ -199,13 +172,13 @@
199172
"PlanNodeType": "Connection",
200173
"Plans": [
201174
{
202-
"CTE Name": "precompute_0_1",
175+
"CTE Name": "precompute_0_0",
203176
"Node Type": "ConstantExpr",
204177
"Operators": [
205178
{
206179
"Inputs": [],
207180
"Name": "ToFlow",
208-
"ToFlow": "precompute_0_1"
181+
"ToFlow": "precompute_0_0"
209182
}
210183
],
211184
"PlanNodeId": 10
@@ -216,7 +189,7 @@
216189
}
217190
],
218191
"SortColumns": [
219-
"x1 (Asc)"
192+
"x_1.x1 (Asc)"
220193
]
221194
}
222195
]

0 commit comments

Comments
 (0)