Skip to content

Commit 398bab9

Browse files
iddqdexiddqdex
authored
fix clickbench primary key columns order (#4039)
1 parent ce6328c commit 398bab9

File tree

88 files changed

+1570
-2512
lines changed

Some content is hidden

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

88 files changed

+1570
-2512
lines changed

‎ydb/public/lib/ydb_cli/commands/click_bench.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ int TClickBenchCommandInit::Run(TConfig& config) {
419419
TString notNull = "";
420420
if (StoreType == "column") {
421421
//partitionBy = "PARTITION BY HASH(CounterID)"; Not enough cardinality in CounterID column @sa KIKIMR-16478
422-
partitionBy = "PARTITION BY HASH(EventTime)";
422+
partitionBy = "PARTITION BY HASH(CounterID, EventDate, UserID, EventTime, WatchID)";
423423
storageType = "STORE = COLUMN,";
424424
notNull = "NOT NULL";
425425
} else if (StoreType != "row") {

‎ydb/public/lib/ydb_cli/commands/click_bench_schema.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ CREATE TABLE `{table}`
107107
URLHash Int64 {notnull},
108108
CLID Int32 {notnull},
109109

110-
PRIMARY KEY (EventTime, CounterID, EventDate, UserID, WatchID)
110+
PRIMARY KEY (CounterID, EventDate, UserID, EventTime, WatchID)
111111
)
112112
{partition}
113113
WITH (

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@
7070
"Name": "TableFullScan",
7171
"ReadColumns": null,
7272
"ReadRanges": [
73-
"EventTime (-\u221e, +\u221e)",
7473
"CounterID (-\u221e, +\u221e)",
7574
"EventDate (-\u221e, +\u221e)",
7675
"UserID (-\u221e, +\u221e)",
76+
"EventTime (-\u221e, +\u221e)",
7777
"WatchID (-\u221e, +\u221e)"
7878
],
7979
"SsaProgram": {
@@ -157,10 +157,10 @@
157157
"Name": "TableFullScan",
158158
"ReadColumns": null,
159159
"ReadRanges": [
160-
"EventTime (-\u221e, +\u221e)",
161160
"CounterID (-\u221e, +\u221e)",
162161
"EventDate (-\u221e, +\u221e)",
163162
"UserID (-\u221e, +\u221e)",
163+
"EventTime (-\u221e, +\u221e)",
164164
"WatchID (-\u221e, +\u221e)"
165165
],
166166
"SsaProgram": {
@@ -210,10 +210,10 @@
210210
"reads": [
211211
{
212212
"scan_by": [
213-
"EventTime (-\u221e, +\u221e)",
214213
"CounterID (-\u221e, +\u221e)",
215214
"EventDate (-\u221e, +\u221e)",
216215
"UserID (-\u221e, +\u221e)",
216+
"EventTime (-\u221e, +\u221e)",
217217
"WatchID (-\u221e, +\u221e)"
218218
],
219219
"type": "FullScan"

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@
7272
"AdvEngineID"
7373
],
7474
"ReadRanges": [
75-
"EventTime (-\u221e, +\u221e)",
7675
"CounterID (-\u221e, +\u221e)",
7776
"EventDate (-\u221e, +\u221e)",
7877
"UserID (-\u221e, +\u221e)",
78+
"EventTime (-\u221e, +\u221e)",
7979
"WatchID (-\u221e, +\u221e)"
8080
],
8181
"SsaProgram": {
@@ -198,10 +198,10 @@
198198
"AdvEngineID"
199199
],
200200
"ReadRanges": [
201-
"EventTime (-\u221e, +\u221e)",
202201
"CounterID (-\u221e, +\u221e)",
203202
"EventDate (-\u221e, +\u221e)",
204203
"UserID (-\u221e, +\u221e)",
204+
"EventTime (-\u221e, +\u221e)",
205205
"WatchID (-\u221e, +\u221e)"
206206
],
207207
"SsaProgram": {
@@ -291,10 +291,10 @@
291291
"AdvEngineID"
292292
],
293293
"scan_by": [
294-
"EventTime (-\u221e, +\u221e)",
295294
"CounterID (-\u221e, +\u221e)",
296295
"EventDate (-\u221e, +\u221e)",
297296
"UserID (-\u221e, +\u221e)",
297+
"EventTime (-\u221e, +\u221e)",
298298
"WatchID (-\u221e, +\u221e)"
299299
],
300300
"type": "FullScan"

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@
104104
"UserID"
105105
],
106106
"ReadRanges": [
107-
"EventTime (-\u221e, +\u221e)",
108107
"CounterID (-\u221e, +\u221e)",
109108
"EventDate (-\u221e, +\u221e)",
110109
"UserID (-\u221e, +\u221e)",
110+
"EventTime (-\u221e, +\u221e)",
111111
"WatchID (-\u221e, +\u221e)"
112112
],
113113
"SsaProgram": {
@@ -254,10 +254,10 @@
254254
"UserID"
255255
],
256256
"ReadRanges": [
257-
"EventTime (-\u221e, +\u221e)",
258257
"CounterID (-\u221e, +\u221e)",
259258
"EventDate (-\u221e, +\u221e)",
260259
"UserID (-\u221e, +\u221e)",
260+
"EventTime (-\u221e, +\u221e)",
261261
"WatchID (-\u221e, +\u221e)"
262262
],
263263
"SsaProgram": {
@@ -341,10 +341,10 @@
341341
"UserID"
342342
],
343343
"scan_by": [
344-
"EventTime (-\u221e, +\u221e)",
345344
"CounterID (-\u221e, +\u221e)",
346345
"EventDate (-\u221e, +\u221e)",
347346
"UserID (-\u221e, +\u221e)",
347+
"EventTime (-\u221e, +\u221e)",
348348
"WatchID (-\u221e, +\u221e)"
349349
],
350350
"type": "FullScan"

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@
107107
"UserID"
108108
],
109109
"ReadRanges": [
110-
"EventTime (-\u221e, +\u221e)",
111110
"CounterID (-\u221e, +\u221e)",
112111
"EventDate (-\u221e, +\u221e)",
113112
"UserID (-\u221e, +\u221e)",
113+
"EventTime (-\u221e, +\u221e)",
114114
"WatchID (-\u221e, +\u221e)"
115115
],
116116
"SsaProgram": {
@@ -261,10 +261,10 @@
261261
"UserID"
262262
],
263263
"ReadRanges": [
264-
"EventTime (-\u221e, +\u221e)",
265264
"CounterID (-\u221e, +\u221e)",
266265
"EventDate (-\u221e, +\u221e)",
267266
"UserID (-\u221e, +\u221e)",
267+
"EventTime (-\u221e, +\u221e)",
268268
"WatchID (-\u221e, +\u221e)"
269269
],
270270
"SsaProgram": {
@@ -352,10 +352,10 @@
352352
"UserID"
353353
],
354354
"scan_by": [
355-
"EventTime (-\u221e, +\u221e)",
356355
"CounterID (-\u221e, +\u221e)",
357356
"EventDate (-\u221e, +\u221e)",
358357
"UserID (-\u221e, +\u221e)",
358+
"EventTime (-\u221e, +\u221e)",
359359
"WatchID (-\u221e, +\u221e)"
360360
],
361361
"type": "FullScan"

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@
7878
"SearchPhrase"
7979
],
8080
"ReadRanges": [
81-
"EventTime (-\u221e, +\u221e)",
8281
"CounterID (-\u221e, +\u221e)",
8382
"EventDate (-\u221e, +\u221e)",
8483
"UserID (-\u221e, +\u221e)",
84+
"EventTime (-\u221e, +\u221e)",
8585
"WatchID (-\u221e, +\u221e)"
8686
],
8787
"SsaProgram": {
@@ -209,10 +209,10 @@
209209
"SearchPhrase"
210210
],
211211
"ReadRanges": [
212-
"EventTime (-\u221e, +\u221e)",
213212
"CounterID (-\u221e, +\u221e)",
214213
"EventDate (-\u221e, +\u221e)",
215214
"UserID (-\u221e, +\u221e)",
215+
"EventTime (-\u221e, +\u221e)",
216216
"WatchID (-\u221e, +\u221e)"
217217
],
218218
"SsaProgram": {
@@ -290,10 +290,10 @@
290290
"SearchPhrase"
291291
],
292292
"scan_by": [
293-
"EventTime (-\u221e, +\u221e)",
294293
"CounterID (-\u221e, +\u221e)",
295294
"EventDate (-\u221e, +\u221e)",
296295
"UserID (-\u221e, +\u221e)",
296+
"EventTime (-\u221e, +\u221e)",
297297
"WatchID (-\u221e, +\u221e)"
298298
],
299299
"type": "FullScan"

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@
104104
"UserID"
105105
],
106106
"ReadRanges": [
107-
"EventTime (-\u221e, +\u221e)",
108107
"CounterID (-\u221e, +\u221e)",
109108
"EventDate (-\u221e, +\u221e)",
110109
"UserID (-\u221e, +\u221e)",
110+
"EventTime (-\u221e, +\u221e)",
111111
"WatchID (-\u221e, +\u221e)"
112112
],
113113
"SsaProgram": {
@@ -254,10 +254,10 @@
254254
"UserID"
255255
],
256256
"ReadRanges": [
257-
"EventTime (-\u221e, +\u221e)",
258257
"CounterID (-\u221e, +\u221e)",
259258
"EventDate (-\u221e, +\u221e)",
260259
"UserID (-\u221e, +\u221e)",
260+
"EventTime (-\u221e, +\u221e)",
261261
"WatchID (-\u221e, +\u221e)"
262262
],
263263
"SsaProgram": {
@@ -341,10 +341,10 @@
341341
"UserID"
342342
],
343343
"scan_by": [
344-
"EventTime (-\u221e, +\u221e)",
345344
"CounterID (-\u221e, +\u221e)",
346345
"EventDate (-\u221e, +\u221e)",
347346
"UserID (-\u221e, +\u221e)",
347+
"EventTime (-\u221e, +\u221e)",
348348
"WatchID (-\u221e, +\u221e)"
349349
],
350350
"type": "FullScan"

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@
8080
"SearchPhrase"
8181
],
8282
"ReadRanges": [
83-
"EventTime (-\u221e, +\u221e)",
8483
"CounterID (-\u221e, +\u221e)",
8584
"EventDate (-\u221e, +\u221e)",
8685
"UserID (-\u221e, +\u221e)",
86+
"EventTime (-\u221e, +\u221e)",
8787
"WatchID (-\u221e, +\u221e)"
8888
],
8989
"SsaProgram": {
@@ -215,10 +215,10 @@
215215
"SearchPhrase"
216216
],
217217
"ReadRanges": [
218-
"EventTime (-\u221e, +\u221e)",
219218
"CounterID (-\u221e, +\u221e)",
220219
"EventDate (-\u221e, +\u221e)",
221220
"UserID (-\u221e, +\u221e)",
221+
"EventTime (-\u221e, +\u221e)",
222222
"WatchID (-\u221e, +\u221e)"
223223
],
224224
"SsaProgram": {
@@ -300,10 +300,10 @@
300300
"SearchPhrase"
301301
],
302302
"scan_by": [
303-
"EventTime (-\u221e, +\u221e)",
304303
"CounterID (-\u221e, +\u221e)",
305304
"EventDate (-\u221e, +\u221e)",
306305
"UserID (-\u221e, +\u221e)",
306+
"EventTime (-\u221e, +\u221e)",
307307
"WatchID (-\u221e, +\u221e)"
308308
],
309309
"type": "FullScan"

0 commit comments

Comments
 (0)