Skip to content

fix clickbench primary key columns order #4039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 24, 2024
Merged

fix clickbench primary key columns order #4039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2592bc4
fix clickbench primary key columns order
iddqdex Apr 23, 2024
a0740fa
change columns for partition. Use all PK
iddqdex Apr 23, 2024
08716a6
cannonize data
iddqdex Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ydb/public/lib/ydb_cli/commands/click_bench.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down
2 changes: 1 addition & 1 deletion ydb/public/lib/ydb_cli/commands/click_bench_schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions ...ts/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-0
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@
"Name": "TableFullScan",
"ReadColumns": null,
"ReadRanges": [
"EventTime (-\u221e, +\u221e)",
"CounterID (-\u221e, +\u221e)",
"EventDate (-\u221e, +\u221e)",
"UserID (-\u221e, +\u221e)",
"EventTime (-\u221e, +\u221e)",
"WatchID (-\u221e, +\u221e)"
],
"SsaProgram": {
Expand Down Expand Up @@ -157,10 +157,10 @@
"Name": "TableFullScan",
"ReadColumns": null,
"ReadRanges": [
"EventTime (-\u221e, +\u221e)",
"CounterID (-\u221e, +\u221e)",
"EventDate (-\u221e, +\u221e)",
"UserID (-\u221e, +\u221e)",
"EventTime (-\u221e, +\u221e)",
"WatchID (-\u221e, +\u221e)"
],
"SsaProgram": {
Expand Down Expand Up @@ -210,10 +210,10 @@
"reads": [
{
"scan_by": [
"EventTime (-\u221e, +\u221e)",
"CounterID (-\u221e, +\u221e)",
"EventDate (-\u221e, +\u221e)",
"UserID (-\u221e, +\u221e)",
"EventTime (-\u221e, +\u221e)",
"WatchID (-\u221e, +\u221e)"
],
"type": "FullScan"
Expand Down
6 changes: 3 additions & 3 deletions ...ts/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@
"AdvEngineID"
],
"ReadRanges": [
"EventTime (-\u221e, +\u221e)",
"CounterID (-\u221e, +\u221e)",
"EventDate (-\u221e, +\u221e)",
"UserID (-\u221e, +\u221e)",
"EventTime (-\u221e, +\u221e)",
"WatchID (-\u221e, +\u221e)"
],
"SsaProgram": {
Expand Down Expand Up @@ -198,10 +198,10 @@
"AdvEngineID"
],
"ReadRanges": [
"EventTime (-\u221e, +\u221e)",
"CounterID (-\u221e, +\u221e)",
"EventDate (-\u221e, +\u221e)",
"UserID (-\u221e, +\u221e)",
"EventTime (-\u221e, +\u221e)",
"WatchID (-\u221e, +\u221e)"
],
"SsaProgram": {
Expand Down Expand Up @@ -291,10 +291,10 @@
"AdvEngineID"
],
"scan_by": [
"EventTime (-\u221e, +\u221e)",
"CounterID (-\u221e, +\u221e)",
"EventDate (-\u221e, +\u221e)",
"UserID (-\u221e, +\u221e)",
"EventTime (-\u221e, +\u221e)",
"WatchID (-\u221e, +\u221e)"
],
"type": "FullScan"
Expand Down
6 changes: 3 additions & 3 deletions ...s/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-10
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@
"UserID"
],
"ReadRanges": [
"EventTime (-\u221e, +\u221e)",
"CounterID (-\u221e, +\u221e)",
"EventDate (-\u221e, +\u221e)",
"UserID (-\u221e, +\u221e)",
"EventTime (-\u221e, +\u221e)",
"WatchID (-\u221e, +\u221e)"
],
"SsaProgram": {
Expand Down Expand Up @@ -254,10 +254,10 @@
"UserID"
],
"ReadRanges": [
"EventTime (-\u221e, +\u221e)",
"CounterID (-\u221e, +\u221e)",
"EventDate (-\u221e, +\u221e)",
"UserID (-\u221e, +\u221e)",
"EventTime (-\u221e, +\u221e)",
"WatchID (-\u221e, +\u221e)"
],
"SsaProgram": {
Expand Down Expand Up @@ -341,10 +341,10 @@
"UserID"
],
"scan_by": [
"EventTime (-\u221e, +\u221e)",
"CounterID (-\u221e, +\u221e)",
"EventDate (-\u221e, +\u221e)",
"UserID (-\u221e, +\u221e)",
"EventTime (-\u221e, +\u221e)",
"WatchID (-\u221e, +\u221e)"
],
"type": "FullScan"
Expand Down
6 changes: 3 additions & 3 deletions ...s/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-11
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@
"UserID"
],
"ReadRanges": [
"EventTime (-\u221e, +\u221e)",
"CounterID (-\u221e, +\u221e)",
"EventDate (-\u221e, +\u221e)",
"UserID (-\u221e, +\u221e)",
"EventTime (-\u221e, +\u221e)",
"WatchID (-\u221e, +\u221e)"
],
"SsaProgram": {
Expand Down Expand Up @@ -261,10 +261,10 @@
"UserID"
],
"ReadRanges": [
"EventTime (-\u221e, +\u221e)",
"CounterID (-\u221e, +\u221e)",
"EventDate (-\u221e, +\u221e)",
"UserID (-\u221e, +\u221e)",
"EventTime (-\u221e, +\u221e)",
"WatchID (-\u221e, +\u221e)"
],
"SsaProgram": {
Expand Down Expand Up @@ -352,10 +352,10 @@
"UserID"
],
"scan_by": [
"EventTime (-\u221e, +\u221e)",
"CounterID (-\u221e, +\u221e)",
"EventDate (-\u221e, +\u221e)",
"UserID (-\u221e, +\u221e)",
"EventTime (-\u221e, +\u221e)",
"WatchID (-\u221e, +\u221e)"
],
"type": "FullScan"
Expand Down
6 changes: 3 additions & 3 deletions ...s/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-12
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@
"SearchPhrase"
],
"ReadRanges": [
"EventTime (-\u221e, +\u221e)",
"CounterID (-\u221e, +\u221e)",
"EventDate (-\u221e, +\u221e)",
"UserID (-\u221e, +\u221e)",
"EventTime (-\u221e, +\u221e)",
"WatchID (-\u221e, +\u221e)"
],
"SsaProgram": {
Expand Down Expand Up @@ -209,10 +209,10 @@
"SearchPhrase"
],
"ReadRanges": [
"EventTime (-\u221e, +\u221e)",
"CounterID (-\u221e, +\u221e)",
"EventDate (-\u221e, +\u221e)",
"UserID (-\u221e, +\u221e)",
"EventTime (-\u221e, +\u221e)",
"WatchID (-\u221e, +\u221e)"
],
"SsaProgram": {
Expand Down Expand Up @@ -290,10 +290,10 @@
"SearchPhrase"
],
"scan_by": [
"EventTime (-\u221e, +\u221e)",
"CounterID (-\u221e, +\u221e)",
"EventDate (-\u221e, +\u221e)",
"UserID (-\u221e, +\u221e)",
"EventTime (-\u221e, +\u221e)",
"WatchID (-\u221e, +\u221e)"
],
"type": "FullScan"
Expand Down
6 changes: 3 additions & 3 deletions ...s/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-13
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@
"UserID"
],
"ReadRanges": [
"EventTime (-\u221e, +\u221e)",
"CounterID (-\u221e, +\u221e)",
"EventDate (-\u221e, +\u221e)",
"UserID (-\u221e, +\u221e)",
"EventTime (-\u221e, +\u221e)",
"WatchID (-\u221e, +\u221e)"
],
"SsaProgram": {
Expand Down Expand Up @@ -254,10 +254,10 @@
"UserID"
],
"ReadRanges": [
"EventTime (-\u221e, +\u221e)",
"CounterID (-\u221e, +\u221e)",
"EventDate (-\u221e, +\u221e)",
"UserID (-\u221e, +\u221e)",
"EventTime (-\u221e, +\u221e)",
"WatchID (-\u221e, +\u221e)"
],
"SsaProgram": {
Expand Down Expand Up @@ -341,10 +341,10 @@
"UserID"
],
"scan_by": [
"EventTime (-\u221e, +\u221e)",
"CounterID (-\u221e, +\u221e)",
"EventDate (-\u221e, +\u221e)",
"UserID (-\u221e, +\u221e)",
"EventTime (-\u221e, +\u221e)",
"WatchID (-\u221e, +\u221e)"
],
"type": "FullScan"
Expand Down
6 changes: 3 additions & 3 deletions ...s/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-14
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@
"SearchPhrase"
],
"ReadRanges": [
"EventTime (-\u221e, +\u221e)",
"CounterID (-\u221e, +\u221e)",
"EventDate (-\u221e, +\u221e)",
"UserID (-\u221e, +\u221e)",
"EventTime (-\u221e, +\u221e)",
"WatchID (-\u221e, +\u221e)"
],
"SsaProgram": {
Expand Down Expand Up @@ -215,10 +215,10 @@
"SearchPhrase"
],
"ReadRanges": [
"EventTime (-\u221e, +\u221e)",
"CounterID (-\u221e, +\u221e)",
"EventDate (-\u221e, +\u221e)",
"UserID (-\u221e, +\u221e)",
"EventTime (-\u221e, +\u221e)",
"WatchID (-\u221e, +\u221e)"
],
"SsaProgram": {
Expand Down Expand Up @@ -300,10 +300,10 @@
"SearchPhrase"
],
"scan_by": [
"EventTime (-\u221e, +\u221e)",
"CounterID (-\u221e, +\u221e)",
"EventDate (-\u221e, +\u221e)",
"UserID (-\u221e, +\u221e)",
"EventTime (-\u221e, +\u221e)",
"WatchID (-\u221e, +\u221e)"
],
"type": "FullScan"
Expand Down
Loading
Loading