Merge a0740fa into 5382ebc

iddqdex · web-flow · commit c2fb006e7772 · 2024-04-23T13:18:21.000Z
diff --git a/ydb/public/lib/ydb_cli/commands/click_bench.cpp b/ydb/public/lib/ydb_cli/commands/click_bench.cpp
@@ -419,7 +419,7 @@ int TClickBenchCommandInit::Run(TConfig& config) {
     TString notNull = "";
     if (StoreType == "column") {
         //partitionBy = "PARTITION BY HASH(CounterID)"; Not enough cardinality in CounterID column @sa KIKIMR-16478
-        partitionBy = "PARTITION BY HASH(EventTime)";
+        partitionBy = "PARTITION BY HASH(CounterID, EventDate, UserID, EventTime, WatchID)";
         storageType = "STORE = COLUMN,";
         notNull = "NOT NULL";
     } else if (StoreType != "row") {
diff --git a/ydb/public/lib/ydb_cli/commands/click_bench_schema.sql b/ydb/public/lib/ydb_cli/commands/click_bench_schema.sql
@@ -107,7 +107,7 @@ CREATE TABLE `{table}`
     URLHash Int64 {notnull},
     CLID Int32 {notnull},
 
-    PRIMARY KEY (EventTime, CounterID, EventDate, UserID, WatchID)
+    PRIMARY KEY (CounterID, EventDate, UserID, EventTime, WatchID)
 )
 {partition}
 WITH (

Original file line number	Diff line number	Diff line change
@@ -107,7 +107,7 @@ CREATE TABLE `{table}`
`107`	`107`	`URLHash Int64 {notnull},`
`108`	`108`	`CLID Int32 {notnull},`
`109`	`109`
`110`		`- PRIMARY KEY (EventTime, CounterID, EventDate, UserID, WatchID)`
	`110`	`+ PRIMARY KEY (CounterID, EventDate, UserID, EventTime, WatchID)`
`111`	`111`	`)`
`112`	`112`	`{partition}`
`113`	`113`	`WITH (`