Skip to content

Commit 62e2da6

Browse files
zverevgenyzverevgeny
authored
Merge d7b9100 into 9e92eb1 
2 parents 9e92eb1 + d7b9100 commit 62e2da6

Some content is hidden

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

44 files changed

+216
-519
lines changed

‎.github/config/muted_ya.txt

-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ ydb/tests/fq/yds *
108108
ydb/tests/fq/control_plane_storage *
109109
ydb/tests/functional/audit *
110110
ydb/tests/functional/blobstorage test_replication.py.TestReplicationAfterNodesRestart.test_replication*
111-
ydb/tests/functional/clickbench test.py.test_plans[column]
112111
ydb/tests/functional/kqp/kqp_indexes ConsistentIndexRead.InteractiveTx
113112
ydb/tests/functional/kqp/kqp_query_session KqpQuerySession.NoLocalAttach
114113
ydb/tests/functional/restarts test_restarts.py.*

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
}
104104
}
105105
],
106-
"Version": 5
106+
"Version": 4
107107
},
108108
"Table": "clickbench/plans/column/hits"
109109
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
}
152152
}
153153
],
154-
"Version": 5
154+
"Version": 4
155155
},
156156
"Table": "clickbench/plans/column/hits"
157157
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
}
173173
}
174174
],
175-
"Version": 5
175+
"Version": 4
176176
},
177177
"Table": "clickbench/plans/column/hits"
178178
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
}
179179
}
180180
],
181-
"Version": 5
181+
"Version": 4
182182
},
183183
"Table": "clickbench/plans/column/hits"
184184
}

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

+12-2
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,24 @@
5959
"PlanNodeType": "Connection",
6060
"Plans": [
6161
{
62-
"Node Type": "Filter-TableFullScan",
62+
"Node Type": "Aggregate-Filter-TableFullScan",
6363
"Operators": [
6464
{
65+
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}",
66+
"GroupBy": "item.SearchPhrase",
6567
"Inputs": [
6668
{
6769
"InternalOperatorId": 1
6870
}
6971
],
72+
"Name": "Aggregate"
73+
},
74+
{
75+
"Inputs": [
76+
{
77+
"InternalOperatorId": 2
78+
}
79+
],
7080
"Name": "Filter",
7181
"Predicate": "SearchPhrase != "
7282
},
@@ -133,7 +143,7 @@
133143
}
134144
}
135145
],
136-
"Version": 5
146+
"Version": 4
137147
},
138148
"Table": "clickbench/plans/column/hits"
139149
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
}
173173
}
174174
],
175-
"Version": 5
175+
"Version": 4
176176
},
177177
"Table": "clickbench/plans/column/hits"
178178
}

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

+12-2
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,24 @@
6060
"PlanNodeType": "Connection",
6161
"Plans": [
6262
{
63-
"Node Type": "Filter-TableFullScan",
63+
"Node Type": "Aggregate-Filter-TableFullScan",
6464
"Operators": [
6565
{
66+
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}",
67+
"GroupBy": "",
6668
"Inputs": [
6769
{
6870
"InternalOperatorId": 1
6971
}
7072
],
73+
"Name": "Aggregate"
74+
},
75+
{
76+
"Inputs": [
77+
{
78+
"InternalOperatorId": 2
79+
}
80+
],
7181
"Name": "Filter",
7282
"Predicate": "SearchPhrase != "
7383
},
@@ -138,7 +148,7 @@
138148
}
139149
}
140150
],
141-
"Version": 5
151+
"Version": 4
142152
},
143153
"Table": "clickbench/plans/column/hits"
144154
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
}
9898
}
9999
],
100-
"Version": 5
100+
"Version": 4
101101
},
102102
"Table": "clickbench/plans/column/hits"
103103
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
}
103103
}
104104
],
105-
"Version": 5
105+
"Version": 4
106106
},
107107
"Table": "clickbench/plans/column/hits"
108108
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
}
102102
}
103103
],
104-
"Version": 5
104+
"Version": 4
105105
},
106106
"Table": "clickbench/plans/column/hits"
107107
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
}
108108
}
109109
],
110-
"Version": 5
110+
"Version": 4
111111
},
112112
"Table": "clickbench/plans/column/hits"
113113
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
}
120120
}
121121
],
122-
"Version": 5
122+
"Version": 4
123123
},
124124
"Table": "clickbench/plans/column/hits"
125125
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
}
164164
}
165165
],
166-
"Version": 5
166+
"Version": 4
167167
},
168168
"Table": "clickbench/plans/column/hits"
169169
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
}
152152
}
153153
],
154-
"Version": 5
154+
"Version": 4
155155
},
156156
"Table": "clickbench/plans/column/hits"
157157
}

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

+12-2
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,24 @@
5959
"PlanNodeType": "Connection",
6060
"Plans": [
6161
{
62-
"Node Type": "Filter-TableFullScan",
62+
"Node Type": "Aggregate-Filter-TableFullScan",
6363
"Operators": [
6464
{
65+
"Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1),_yql_agg_1: MIN(item.URL,state._yql_agg_1)}",
66+
"GroupBy": "item.SearchPhrase",
6567
"Inputs": [
6668
{
6769
"InternalOperatorId": 1
6870
}
6971
],
72+
"Name": "Aggregate"
73+
},
74+
{
75+
"Inputs": [
76+
{
77+
"InternalOperatorId": 2
78+
}
79+
],
7080
"Name": "Filter",
7181
"Predicate": ""
7282
},
@@ -177,7 +187,7 @@
177187
}
178188
}
179189
],
180-
"Version": 5
190+
"Version": 4
181191
},
182192
"Table": "clickbench/plans/column/hits"
183193
}

0 commit comments

Comments
 (0)