diff --git a/ydb/public/lib/ydb_cli/commands/click_bench.cpp b/ydb/public/lib/ydb_cli/commands/click_bench.cpp index 96479326b6f1..ac5499aba46a 100644 --- 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 index 5becd12b4081..3235a60349b0 100644 --- 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 ( diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-0 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-0 index 6af34aecff4c..6dad752f5c78 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-0 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-0 @@ -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": { @@ -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": { @@ -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" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-1 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-1 index 452283546d6f..e4f0d27fa26b 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-1 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-1 @@ -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": { @@ -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": { @@ -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" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-10 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-10 index 611383b58995..2b4f1c44b25c 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-10 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-10 @@ -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": { @@ -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": { @@ -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" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-11 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-11 index 294293452e28..73dcaf178ab3 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-11 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-11 @@ -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": { @@ -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": { @@ -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" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-12 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-12 index 9544bf972308..d93f407794eb 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-12 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-12 @@ -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": { @@ -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": { @@ -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" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-13 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-13 index 080703d96338..a7aadd72f992 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-13 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-13 @@ -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": { @@ -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": { @@ -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" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-14 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-14 index 2d805d5ed80a..977286cbb037 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-14 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-14 @@ -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": { @@ -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": { @@ -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" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-15 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-15 index 1d667c4e5126..ec1c393bd539 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-15 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-15 @@ -78,10 +78,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -172,10 +172,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -216,10 +216,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-16 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-16 index 1bb3e2510e4c..937447dff03a 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-16 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-16 @@ -80,10 +80,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -178,10 +178,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -226,10 +226,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-17 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-17 index 173201b4c834..b517c09b1f65 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-17 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-17 @@ -79,10 +79,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -173,10 +173,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -221,10 +221,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-18 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-18 index a4029b34ba66..ebf9d8c6de99 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-18 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-18 @@ -82,10 +82,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -184,10 +184,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -236,10 +236,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-19 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-19 index cacc03e7d207..0d1a3e3eaafb 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-19 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-19 @@ -54,10 +54,10 @@ ], "ReadLimit": "1001", "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -167,10 +167,10 @@ ], "ReadLimit": "1001", "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -247,10 +247,10 @@ ], "limit": "1001", "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-2 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-2 index cf951475e4f1..9b76dfcb5ffc 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-2 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-2 @@ -82,10 +82,10 @@ "ResolutionWidth" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -220,10 +220,10 @@ "ResolutionWidth" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -340,10 +340,10 @@ "ResolutionWidth" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -445,10 +445,10 @@ "ResolutionWidth" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-20 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-20 index 1b8aa7c78ede..1ca479afd1d2 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-20 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-20 @@ -72,10 +72,10 @@ "URL" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -198,10 +198,10 @@ "URL" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -291,10 +291,10 @@ "URL" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-21 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-21 index 5e174307af09..e1b085b77abc 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-21 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-21 @@ -79,10 +79,10 @@ "URL" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -254,10 +254,10 @@ "URL" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -379,10 +379,10 @@ "URL" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-22 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-22 index 5d3c66ddf661..a6b7f4cad593 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-22 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-22 @@ -103,10 +103,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -341,10 +341,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -607,10 +607,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -820,10 +820,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -1023,10 +1023,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" @@ -1039,10 +1039,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-23 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-23 index f2165dca8d87..26f1a9bfce97 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-23 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-23 @@ -157,12 +157,11 @@ "WindowName", "WithHash" ], - "ReadLimit": "10", "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -690,12 +689,11 @@ "WindowName", "WithHash" ], - "ReadLimit": "10", "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -1186,12 +1184,11 @@ "WindowName", "WithHash" ], - "limit": "10", "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-24 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-24 index 70768ed36d8c..ad83b47f0cd9 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-24 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-24 @@ -54,12 +54,11 @@ "EventTime", "SearchPhrase" ], - "ReadLimit": "10", "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -175,12 +174,11 @@ "EventTime", "SearchPhrase" ], - "ReadLimit": "10", "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -259,12 +257,11 @@ "EventTime", "SearchPhrase" ], - "limit": "10", "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-25 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-25 index bf2e8f68c3f7..62a50e6c2c7f 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-25 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-25 @@ -54,10 +54,10 @@ "SearchPhrase" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -170,10 +170,10 @@ "SearchPhrase" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -249,10 +249,10 @@ "SearchPhrase" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-26 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-26 index 4c25ed340091..47370a07a776 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-26 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-26 @@ -55,10 +55,10 @@ "SearchPhrase" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -176,10 +176,10 @@ "SearchPhrase" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -259,10 +259,10 @@ "SearchPhrase" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-27 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-27 index 75efce8877ba..a29091b18bcc 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-27 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-27 @@ -88,10 +88,10 @@ "URL" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -233,10 +233,10 @@ "URL" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -320,10 +320,10 @@ "URL" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-28 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-28 index 0b0da70046e8..1fad86c4e33e 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-28 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-28 @@ -87,10 +87,10 @@ "Referer" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -228,10 +228,10 @@ "Referer" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -311,10 +311,10 @@ "Referer" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-29 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-29 index 17ce5c176c6e..eb12d6831ffe 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-29 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-29 @@ -89,10 +89,10 @@ "ResolutionWidth" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -173,10 +173,10 @@ "ResolutionWidth" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -241,10 +241,10 @@ "ResolutionWidth" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -285,10 +285,10 @@ "ResolutionWidth" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-3 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-3 index f7e42d84ec75..18b0c29ecca3 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-3 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-3 @@ -72,10 +72,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -182,10 +182,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -259,10 +259,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-30 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-30 index 9ec1b4fd24ed..2c6f80cd9e96 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-30 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-30 @@ -83,10 +83,10 @@ "SearchPhrase" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -227,10 +227,10 @@ "SearchPhrase" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -321,10 +321,10 @@ "SearchPhrase" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-31 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-31 index b2955f41d070..08a885b94e30 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-31 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-31 @@ -83,10 +83,10 @@ "WatchID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -227,10 +227,10 @@ "WatchID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -321,10 +321,10 @@ "WatchID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-32 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-32 index 43a67b927222..79faf9680746 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-32 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-32 @@ -82,10 +82,10 @@ "WatchID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -188,10 +188,10 @@ "WatchID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -244,10 +244,10 @@ "WatchID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-33 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-33 index c9e7437689dd..026c72699f78 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-33 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-33 @@ -78,10 +78,10 @@ "URL" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -172,10 +172,10 @@ "URL" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -216,10 +216,10 @@ "URL" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-34 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-34 index 7f9d4617b41a..b269b59727ac 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-34 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-34 @@ -80,10 +80,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -178,10 +178,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -226,10 +226,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-35 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-35 index 7ab2e2f73b9a..98b729e9a92d 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-35 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-35 @@ -81,10 +81,10 @@ "ClientIP" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -175,10 +175,10 @@ "ClientIP" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -219,10 +219,10 @@ "ClientIP" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-36 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-36 index aa6c4006bf7c..a181d62b3e0d 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-36 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-36 @@ -10,7 +10,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet", + "Node Type": "ResultSet_1", "PlanNodeId": 6, "PlanNodeType": "ResultSet", "Plans": [ @@ -59,7 +59,7 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate-Filter-TableFullScan", + "Node Type": "Aggregate-TableRangeScan", "Operators": [ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", @@ -71,31 +71,22 @@ ], "Name": "Aggregate" }, - { - "Inputs": [ - { - "InternalOperatorId": 2 - } - ], - "Name": "Filter", - "Predicate": "item.EventDate >= \"15887\" And item.EventDate <= \"15917\"" - }, { "Inputs": [], - "Name": "TableFullScan", + "Name": "TableRangeScan", "ReadColumns": [ - "CounterID", "DontCountHits", - "EventDate", "IsRefresh", "URL" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", - "UserID (-\u221e, +\u221e)", - "WatchID (-\u221e, +\u221e)" + "CounterID [62, 62]", + "EventDate [15887, 15917]" + ], + "ReadRangesExpectedSize": 1, + "ReadRangesKeys": [ + "CounterID", + "EventDate" ], "SsaProgram": { "Command": [ @@ -105,7 +96,7 @@ "Id": 106 }, "Constant": { - "Int32": 62 + "Int32": 0 } } }, @@ -117,7 +108,7 @@ "Function": { "Arguments": [ { - "Id": 7 + "Id": 62 }, { "Id": 106 @@ -147,7 +138,7 @@ "Function": { "Arguments": [ { - "Id": 62 + "Id": 16 }, { "Id": 108 @@ -164,56 +155,6 @@ "Column": { "Id": 110 }, - "Function": { - "Arguments": [ - { - "Id": 107 - }, - { - "Id": 109 - } - ], - "FunctionType": 2, - "KernelIdx": 2, - "YqlOperationId": 0 - } - } - }, - { - "Assign": { - "Column": { - "Id": 111 - }, - "Constant": { - "Int32": 0 - } - } - }, - { - "Assign": { - "Column": { - "Id": 112 - }, - "Function": { - "Arguments": [ - { - "Id": 16 - }, - { - "Id": 111 - } - ], - "FunctionType": 2, - "KernelIdx": 3, - "YqlOperationId": 11 - } - } - }, - { - "Assign": { - "Column": { - "Id": 113 - }, "Constant": { "Bytes": "" } @@ -222,7 +163,7 @@ { "Assign": { "Column": { - "Id": 114 + "Id": 111 }, "Function": { "Arguments": [ @@ -230,11 +171,11 @@ "Id": 14 }, { - "Id": 113 + "Id": 110 } ], "FunctionType": 2, - "KernelIdx": 4, + "KernelIdx": 2, "YqlOperationId": 12 } } @@ -242,19 +183,19 @@ { "Assign": { "Column": { - "Id": 115 + "Id": 112 }, "Function": { "Arguments": [ { - "Id": 112 + "Id": 109 }, { - "Id": 114 + "Id": 111 } ], "FunctionType": 2, - "KernelIdx": 5, + "KernelIdx": 3, "YqlOperationId": 0 } } @@ -262,19 +203,19 @@ { "Assign": { "Column": { - "Id": 116 + "Id": 113 }, "Function": { "Arguments": [ { - "Id": 110 + "Id": 107 }, { - "Id": 115 + "Id": 112 } ], "FunctionType": 2, - "KernelIdx": 6, + "KernelIdx": 4, "YqlOperationId": 0 } } @@ -282,16 +223,13 @@ { "Filter": { "Predicate": { - "Id": 116 + "Id": 113 } } }, { "Projection": { "Columns": [ - { - "Id": 6 - }, { "Id": 14 } @@ -330,7 +268,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet", + "Node Type": "ResultSet_1", "PlanNodeId": 1, "PlanNodeType": "ResultSet", "Plans": [ @@ -367,244 +305,179 @@ "PlanNodeId": 6, "Plans": [ { - "Node Type": "Filter", + "Node Type": "TableRangeScan", "Operators": [ { - "Name": "Filter", - "Predicate": "item.EventDate >= \"15887\" And item.EventDate <= \"15917\"" - } - ], - "PlanNodeId": 7, - "Plans": [ - { - "Node Type": "TableFullScan", - "Operators": [ - { - "Name": "TableFullScan", - "ReadColumns": [ - "CounterID", - "DontCountHits", - "EventDate", - "IsRefresh", - "URL" - ], - "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", - "UserID (-\u221e, +\u221e)", - "WatchID (-\u221e, +\u221e)" - ], - "SsaProgram": { - "Command": [ - { - "Assign": { - "Column": { - "Id": 106 - }, - "Constant": { - "Int32": 62 - } - } - }, - { - "Assign": { - "Column": { - "Id": 107 - }, - "Function": { - "Arguments": [ - { - "Id": 7 - }, - { - "Id": 106 - } - ], - "FunctionType": 2, - "KernelIdx": 0, - "YqlOperationId": 11 - } - } - }, - { - "Assign": { - "Column": { - "Id": 108 - }, - "Constant": { - "Int32": 0 - } - } + "Name": "TableRangeScan", + "ReadColumns": [ + "DontCountHits", + "IsRefresh", + "URL" + ], + "ReadRanges": [ + "CounterID [62, 62]", + "EventDate [15887, 15917]" + ], + "ReadRangesExpectedSize": 1, + "ReadRangesKeys": [ + "CounterID", + "EventDate" + ], + "SsaProgram": { + "Command": [ + { + "Assign": { + "Column": { + "Id": 106 }, - { - "Assign": { - "Column": { - "Id": 109 - }, - "Function": { - "Arguments": [ - { - "Id": 62 - }, - { - "Id": 108 - } - ], - "FunctionType": 2, - "KernelIdx": 1, - "YqlOperationId": 11 - } - } + "Constant": { + "Int32": 0 + } + } + }, + { + "Assign": { + "Column": { + "Id": 107 }, - { - "Assign": { - "Column": { - "Id": 110 + "Function": { + "Arguments": [ + { + "Id": 62 }, - "Function": { - "Arguments": [ - { - "Id": 107 - }, - { - "Id": 109 - } - ], - "FunctionType": 2, - "KernelIdx": 2, - "YqlOperationId": 0 + { + "Id": 106 } - } + ], + "FunctionType": 2, + "KernelIdx": 0, + "YqlOperationId": 11 + } + } + }, + { + "Assign": { + "Column": { + "Id": 108 }, - { - "Assign": { - "Column": { - "Id": 111 - }, - "Constant": { - "Int32": 0 - } - } + "Constant": { + "Int32": 0 + } + } + }, + { + "Assign": { + "Column": { + "Id": 109 }, - { - "Assign": { - "Column": { - "Id": 112 + "Function": { + "Arguments": [ + { + "Id": 16 }, - "Function": { - "Arguments": [ - { - "Id": 16 - }, - { - "Id": 111 - } - ], - "FunctionType": 2, - "KernelIdx": 3, - "YqlOperationId": 11 + { + "Id": 108 } - } + ], + "FunctionType": 2, + "KernelIdx": 1, + "YqlOperationId": 11 + } + } + }, + { + "Assign": { + "Column": { + "Id": 110 }, - { - "Assign": { - "Column": { - "Id": 113 - }, - "Constant": { - "Bytes": "" - } - } + "Constant": { + "Bytes": "" + } + } + }, + { + "Assign": { + "Column": { + "Id": 111 }, - { - "Assign": { - "Column": { - "Id": 114 + "Function": { + "Arguments": [ + { + "Id": 14 }, - "Function": { - "Arguments": [ - { - "Id": 14 - }, - { - "Id": 113 - } - ], - "FunctionType": 2, - "KernelIdx": 4, - "YqlOperationId": 12 + { + "Id": 110 } - } + ], + "FunctionType": 2, + "KernelIdx": 2, + "YqlOperationId": 12 + } + } + }, + { + "Assign": { + "Column": { + "Id": 112 }, - { - "Assign": { - "Column": { - "Id": 115 + "Function": { + "Arguments": [ + { + "Id": 109 }, - "Function": { - "Arguments": [ - { - "Id": 112 - }, - { - "Id": 114 - } - ], - "FunctionType": 2, - "KernelIdx": 5, - "YqlOperationId": 0 + { + "Id": 111 } - } + ], + "FunctionType": 2, + "KernelIdx": 3, + "YqlOperationId": 0 + } + } + }, + { + "Assign": { + "Column": { + "Id": 113 }, - { - "Assign": { - "Column": { - "Id": 116 + "Function": { + "Arguments": [ + { + "Id": 107 }, - "Function": { - "Arguments": [ - { - "Id": 110 - }, - { - "Id": 115 - } - ], - "FunctionType": 2, - "KernelIdx": 6, - "YqlOperationId": 0 - } - } - }, - { - "Filter": { - "Predicate": { - "Id": 116 + { + "Id": 112 } - } - }, - { - "Projection": { - "Columns": [ - { - "Id": 6 - }, - { - "Id": 14 - } - ] - } + ], + "FunctionType": 2, + "KernelIdx": 4, + "YqlOperationId": 0 } - ], - "Version": 5 + } }, - "Table": "clickbench/plans/column/hits" - } - ], - "PlanNodeId": 8 + { + "Filter": { + "Predicate": { + "Id": 113 + } + } + }, + { + "Projection": { + "Columns": [ + { + "Id": 14 + } + ] + } + } + ], + "Version": 5 + }, + "Table": "clickbench/plans/column/hits" } - ] + ], + "PlanNodeId": 7 } ] } @@ -622,20 +495,15 @@ "reads": [ { "columns": [ - "CounterID", "DontCountHits", - "EventDate", "IsRefresh", "URL" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", - "UserID (-\u221e, +\u221e)", - "WatchID (-\u221e, +\u221e)" + "CounterID [62, 62]", + "EventDate [15887, 15917]" ], - "type": "FullScan" + "type": "Scan" } ] } diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-37 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-37 index 9dc98c85ce0b..a11cea541209 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-37 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-37 @@ -10,7 +10,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet", + "Node Type": "ResultSet_1", "PlanNodeId": 6, "PlanNodeType": "ResultSet", "Plans": [ @@ -59,7 +59,7 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate-Filter-TableFullScan", + "Node Type": "Aggregate-TableRangeScan", "Operators": [ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", @@ -71,31 +71,22 @@ ], "Name": "Aggregate" }, - { - "Inputs": [ - { - "InternalOperatorId": 2 - } - ], - "Name": "Filter", - "Predicate": "item.EventDate >= \"15887\" And item.EventDate <= \"15917\"" - }, { "Inputs": [], - "Name": "TableFullScan", + "Name": "TableRangeScan", "ReadColumns": [ - "CounterID", "DontCountHits", - "EventDate", "IsRefresh", "Title" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", - "UserID (-\u221e, +\u221e)", - "WatchID (-\u221e, +\u221e)" + "CounterID [62, 62]", + "EventDate [15887, 15917]" + ], + "ReadRangesExpectedSize": 1, + "ReadRangesKeys": [ + "CounterID", + "EventDate" ], "SsaProgram": { "Command": [ @@ -105,7 +96,7 @@ "Id": 106 }, "Constant": { - "Int32": 62 + "Int32": 0 } } }, @@ -117,7 +108,7 @@ "Function": { "Arguments": [ { - "Id": 7 + "Id": 62 }, { "Id": 106 @@ -147,7 +138,7 @@ "Function": { "Arguments": [ { - "Id": 62 + "Id": 16 }, { "Id": 108 @@ -164,56 +155,6 @@ "Column": { "Id": 110 }, - "Function": { - "Arguments": [ - { - "Id": 107 - }, - { - "Id": 109 - } - ], - "FunctionType": 2, - "KernelIdx": 2, - "YqlOperationId": 0 - } - } - }, - { - "Assign": { - "Column": { - "Id": 111 - }, - "Constant": { - "Int32": 0 - } - } - }, - { - "Assign": { - "Column": { - "Id": 112 - }, - "Function": { - "Arguments": [ - { - "Id": 16 - }, - { - "Id": 111 - } - ], - "FunctionType": 2, - "KernelIdx": 3, - "YqlOperationId": 11 - } - } - }, - { - "Assign": { - "Column": { - "Id": 113 - }, "Constant": { "Bytes": "" } @@ -222,7 +163,7 @@ { "Assign": { "Column": { - "Id": 114 + "Id": 111 }, "Function": { "Arguments": [ @@ -230,11 +171,11 @@ "Id": 3 }, { - "Id": 113 + "Id": 110 } ], "FunctionType": 2, - "KernelIdx": 4, + "KernelIdx": 2, "YqlOperationId": 12 } } @@ -242,19 +183,19 @@ { "Assign": { "Column": { - "Id": 115 + "Id": 112 }, "Function": { "Arguments": [ { - "Id": 112 + "Id": 109 }, { - "Id": 114 + "Id": 111 } ], "FunctionType": 2, - "KernelIdx": 5, + "KernelIdx": 3, "YqlOperationId": 0 } } @@ -262,19 +203,19 @@ { "Assign": { "Column": { - "Id": 116 + "Id": 113 }, "Function": { "Arguments": [ { - "Id": 110 + "Id": 107 }, { - "Id": 115 + "Id": 112 } ], "FunctionType": 2, - "KernelIdx": 6, + "KernelIdx": 4, "YqlOperationId": 0 } } @@ -282,16 +223,13 @@ { "Filter": { "Predicate": { - "Id": 116 + "Id": 113 } } }, { "Projection": { "Columns": [ - { - "Id": 6 - }, { "Id": 3 } @@ -330,7 +268,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet", + "Node Type": "ResultSet_1", "PlanNodeId": 1, "PlanNodeType": "ResultSet", "Plans": [ @@ -367,244 +305,179 @@ "PlanNodeId": 6, "Plans": [ { - "Node Type": "Filter", + "Node Type": "TableRangeScan", "Operators": [ { - "Name": "Filter", - "Predicate": "item.EventDate >= \"15887\" And item.EventDate <= \"15917\"" - } - ], - "PlanNodeId": 7, - "Plans": [ - { - "Node Type": "TableFullScan", - "Operators": [ - { - "Name": "TableFullScan", - "ReadColumns": [ - "CounterID", - "DontCountHits", - "EventDate", - "IsRefresh", - "Title" - ], - "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", - "UserID (-\u221e, +\u221e)", - "WatchID (-\u221e, +\u221e)" - ], - "SsaProgram": { - "Command": [ - { - "Assign": { - "Column": { - "Id": 106 - }, - "Constant": { - "Int32": 62 - } - } - }, - { - "Assign": { - "Column": { - "Id": 107 - }, - "Function": { - "Arguments": [ - { - "Id": 7 - }, - { - "Id": 106 - } - ], - "FunctionType": 2, - "KernelIdx": 0, - "YqlOperationId": 11 - } - } - }, - { - "Assign": { - "Column": { - "Id": 108 - }, - "Constant": { - "Int32": 0 - } - } + "Name": "TableRangeScan", + "ReadColumns": [ + "DontCountHits", + "IsRefresh", + "Title" + ], + "ReadRanges": [ + "CounterID [62, 62]", + "EventDate [15887, 15917]" + ], + "ReadRangesExpectedSize": 1, + "ReadRangesKeys": [ + "CounterID", + "EventDate" + ], + "SsaProgram": { + "Command": [ + { + "Assign": { + "Column": { + "Id": 106 }, - { - "Assign": { - "Column": { - "Id": 109 - }, - "Function": { - "Arguments": [ - { - "Id": 62 - }, - { - "Id": 108 - } - ], - "FunctionType": 2, - "KernelIdx": 1, - "YqlOperationId": 11 - } - } + "Constant": { + "Int32": 0 + } + } + }, + { + "Assign": { + "Column": { + "Id": 107 }, - { - "Assign": { - "Column": { - "Id": 110 + "Function": { + "Arguments": [ + { + "Id": 62 }, - "Function": { - "Arguments": [ - { - "Id": 107 - }, - { - "Id": 109 - } - ], - "FunctionType": 2, - "KernelIdx": 2, - "YqlOperationId": 0 + { + "Id": 106 } - } + ], + "FunctionType": 2, + "KernelIdx": 0, + "YqlOperationId": 11 + } + } + }, + { + "Assign": { + "Column": { + "Id": 108 }, - { - "Assign": { - "Column": { - "Id": 111 - }, - "Constant": { - "Int32": 0 - } - } + "Constant": { + "Int32": 0 + } + } + }, + { + "Assign": { + "Column": { + "Id": 109 }, - { - "Assign": { - "Column": { - "Id": 112 + "Function": { + "Arguments": [ + { + "Id": 16 }, - "Function": { - "Arguments": [ - { - "Id": 16 - }, - { - "Id": 111 - } - ], - "FunctionType": 2, - "KernelIdx": 3, - "YqlOperationId": 11 + { + "Id": 108 } - } + ], + "FunctionType": 2, + "KernelIdx": 1, + "YqlOperationId": 11 + } + } + }, + { + "Assign": { + "Column": { + "Id": 110 }, - { - "Assign": { - "Column": { - "Id": 113 - }, - "Constant": { - "Bytes": "" - } - } + "Constant": { + "Bytes": "" + } + } + }, + { + "Assign": { + "Column": { + "Id": 111 }, - { - "Assign": { - "Column": { - "Id": 114 + "Function": { + "Arguments": [ + { + "Id": 3 }, - "Function": { - "Arguments": [ - { - "Id": 3 - }, - { - "Id": 113 - } - ], - "FunctionType": 2, - "KernelIdx": 4, - "YqlOperationId": 12 + { + "Id": 110 } - } + ], + "FunctionType": 2, + "KernelIdx": 2, + "YqlOperationId": 12 + } + } + }, + { + "Assign": { + "Column": { + "Id": 112 }, - { - "Assign": { - "Column": { - "Id": 115 + "Function": { + "Arguments": [ + { + "Id": 109 }, - "Function": { - "Arguments": [ - { - "Id": 112 - }, - { - "Id": 114 - } - ], - "FunctionType": 2, - "KernelIdx": 5, - "YqlOperationId": 0 + { + "Id": 111 } - } + ], + "FunctionType": 2, + "KernelIdx": 3, + "YqlOperationId": 0 + } + } + }, + { + "Assign": { + "Column": { + "Id": 113 }, - { - "Assign": { - "Column": { - "Id": 116 + "Function": { + "Arguments": [ + { + "Id": 107 }, - "Function": { - "Arguments": [ - { - "Id": 110 - }, - { - "Id": 115 - } - ], - "FunctionType": 2, - "KernelIdx": 6, - "YqlOperationId": 0 - } - } - }, - { - "Filter": { - "Predicate": { - "Id": 116 + { + "Id": 112 } - } - }, - { - "Projection": { - "Columns": [ - { - "Id": 6 - }, - { - "Id": 3 - } - ] - } + ], + "FunctionType": 2, + "KernelIdx": 4, + "YqlOperationId": 0 } - ], - "Version": 5 + } }, - "Table": "clickbench/plans/column/hits" - } - ], - "PlanNodeId": 8 + { + "Filter": { + "Predicate": { + "Id": 113 + } + } + }, + { + "Projection": { + "Columns": [ + { + "Id": 3 + } + ] + } + } + ], + "Version": 5 + }, + "Table": "clickbench/plans/column/hits" } - ] + ], + "PlanNodeId": 7 } ] } @@ -622,20 +495,15 @@ "reads": [ { "columns": [ - "CounterID", "DontCountHits", - "EventDate", "IsRefresh", "Title" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", - "UserID (-\u221e, +\u221e)", - "WatchID (-\u221e, +\u221e)" + "CounterID [62, 62]", + "EventDate [15887, 15917]" ], - "type": "FullScan" + "type": "Scan" } ] } diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-38 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-38 index cf0c39be67da..444d45fe7a64 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-38 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-38 @@ -10,7 +10,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet", + "Node Type": "ResultSet_1", "PlanNodeId": 8, "PlanNodeType": "ResultSet", "Plans": [ @@ -88,7 +88,7 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate-Filter-TableFullScan", + "Node Type": "Aggregate-TableRangeScan", "Operators": [ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", @@ -100,32 +100,23 @@ ], "Name": "Aggregate" }, - { - "Inputs": [ - { - "InternalOperatorId": 2 - } - ], - "Name": "Filter", - "Predicate": "item.EventDate >= \"15887\" And item.EventDate <= \"15917\"" - }, { "Inputs": [], - "Name": "TableFullScan", + "Name": "TableRangeScan", "ReadColumns": [ - "CounterID", - "EventDate", "IsDownload", "IsLink", "IsRefresh", "URL" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", - "UserID (-\u221e, +\u221e)", - "WatchID (-\u221e, +\u221e)" + "CounterID [62, 62]", + "EventDate [15887, 15917]" + ], + "ReadRangesExpectedSize": 1, + "ReadRangesKeys": [ + "CounterID", + "EventDate" ], "SsaProgram": { "Command": [ @@ -135,7 +126,7 @@ "Id": 106 }, "Constant": { - "Int32": 62 + "Int32": 0 } } }, @@ -147,7 +138,7 @@ "Function": { "Arguments": [ { - "Id": 7 + "Id": 16 }, { "Id": 106 @@ -177,7 +168,7 @@ "Function": { "Arguments": [ { - "Id": 16 + "Id": 53 }, { "Id": 108 @@ -185,56 +176,6 @@ ], "FunctionType": 2, "KernelIdx": 1, - "YqlOperationId": 11 - } - } - }, - { - "Assign": { - "Column": { - "Id": 110 - }, - "Function": { - "Arguments": [ - { - "Id": 107 - }, - { - "Id": 109 - } - ], - "FunctionType": 2, - "KernelIdx": 2, - "YqlOperationId": 0 - } - } - }, - { - "Assign": { - "Column": { - "Id": 111 - }, - "Constant": { - "Int32": 0 - } - } - }, - { - "Assign": { - "Column": { - "Id": 112 - }, - "Function": { - "Arguments": [ - { - "Id": 53 - }, - { - "Id": 111 - } - ], - "FunctionType": 2, - "KernelIdx": 3, "YqlOperationId": 12 } } @@ -242,7 +183,7 @@ { "Assign": { "Column": { - "Id": 113 + "Id": 110 }, "Constant": { "Int32": 0 @@ -252,7 +193,7 @@ { "Assign": { "Column": { - "Id": 114 + "Id": 111 }, "Function": { "Arguments": [ @@ -260,11 +201,11 @@ "Id": 54 }, { - "Id": 113 + "Id": 110 } ], "FunctionType": 2, - "KernelIdx": 4, + "KernelIdx": 2, "YqlOperationId": 11 } } @@ -272,19 +213,19 @@ { "Assign": { "Column": { - "Id": 115 + "Id": 112 }, "Function": { "Arguments": [ { - "Id": 112 + "Id": 109 }, { - "Id": 114 + "Id": 111 } ], "FunctionType": 2, - "KernelIdx": 5, + "KernelIdx": 3, "YqlOperationId": 0 } } @@ -292,19 +233,19 @@ { "Assign": { "Column": { - "Id": 116 + "Id": 113 }, "Function": { "Arguments": [ { - "Id": 110 + "Id": 107 }, { - "Id": 115 + "Id": 112 } ], "FunctionType": 2, - "KernelIdx": 6, + "KernelIdx": 4, "YqlOperationId": 0 } } @@ -312,16 +253,13 @@ { "Filter": { "Predicate": { - "Id": 116 + "Id": 113 } } }, { "Projection": { "Columns": [ - { - "Id": 6 - }, { "Id": 14 } @@ -364,7 +302,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet", + "Node Type": "ResultSet_1", "PlanNodeId": 1, "PlanNodeType": "ResultSet", "Plans": [ @@ -421,245 +359,180 @@ "PlanNodeId": 9, "Plans": [ { - "Node Type": "Filter", + "Node Type": "TableRangeScan", "Operators": [ { - "Name": "Filter", - "Predicate": "item.EventDate >= \"15887\" And item.EventDate <= \"15917\"" - } - ], - "PlanNodeId": 10, - "Plans": [ - { - "Node Type": "TableFullScan", - "Operators": [ - { - "Name": "TableFullScan", - "ReadColumns": [ - "CounterID", - "EventDate", - "IsDownload", - "IsLink", - "IsRefresh", - "URL" - ], - "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", - "UserID (-\u221e, +\u221e)", - "WatchID (-\u221e, +\u221e)" - ], - "SsaProgram": { - "Command": [ - { - "Assign": { - "Column": { - "Id": 106 - }, - "Constant": { - "Int32": 62 - } - } - }, - { - "Assign": { - "Column": { - "Id": 107 - }, - "Function": { - "Arguments": [ - { - "Id": 7 - }, - { - "Id": 106 - } - ], - "FunctionType": 2, - "KernelIdx": 0, - "YqlOperationId": 11 - } - } - }, - { - "Assign": { - "Column": { - "Id": 108 - }, - "Constant": { - "Int32": 0 - } - } + "Name": "TableRangeScan", + "ReadColumns": [ + "IsDownload", + "IsLink", + "IsRefresh", + "URL" + ], + "ReadRanges": [ + "CounterID [62, 62]", + "EventDate [15887, 15917]" + ], + "ReadRangesExpectedSize": 1, + "ReadRangesKeys": [ + "CounterID", + "EventDate" + ], + "SsaProgram": { + "Command": [ + { + "Assign": { + "Column": { + "Id": 106 }, - { - "Assign": { - "Column": { - "Id": 109 - }, - "Function": { - "Arguments": [ - { - "Id": 16 - }, - { - "Id": 108 - } - ], - "FunctionType": 2, - "KernelIdx": 1, - "YqlOperationId": 11 - } - } + "Constant": { + "Int32": 0 + } + } + }, + { + "Assign": { + "Column": { + "Id": 107 }, - { - "Assign": { - "Column": { - "Id": 110 + "Function": { + "Arguments": [ + { + "Id": 16 }, - "Function": { - "Arguments": [ - { - "Id": 107 - }, - { - "Id": 109 - } - ], - "FunctionType": 2, - "KernelIdx": 2, - "YqlOperationId": 0 + { + "Id": 106 } - } + ], + "FunctionType": 2, + "KernelIdx": 0, + "YqlOperationId": 11 + } + } + }, + { + "Assign": { + "Column": { + "Id": 108 }, - { - "Assign": { - "Column": { - "Id": 111 - }, - "Constant": { - "Int32": 0 - } - } + "Constant": { + "Int32": 0 + } + } + }, + { + "Assign": { + "Column": { + "Id": 109 }, - { - "Assign": { - "Column": { - "Id": 112 + "Function": { + "Arguments": [ + { + "Id": 53 }, - "Function": { - "Arguments": [ - { - "Id": 53 - }, - { - "Id": 111 - } - ], - "FunctionType": 2, - "KernelIdx": 3, - "YqlOperationId": 12 + { + "Id": 108 } - } + ], + "FunctionType": 2, + "KernelIdx": 1, + "YqlOperationId": 12 + } + } + }, + { + "Assign": { + "Column": { + "Id": 110 }, - { - "Assign": { - "Column": { - "Id": 113 - }, - "Constant": { - "Int32": 0 - } - } + "Constant": { + "Int32": 0 + } + } + }, + { + "Assign": { + "Column": { + "Id": 111 }, - { - "Assign": { - "Column": { - "Id": 114 + "Function": { + "Arguments": [ + { + "Id": 54 }, - "Function": { - "Arguments": [ - { - "Id": 54 - }, - { - "Id": 113 - } - ], - "FunctionType": 2, - "KernelIdx": 4, - "YqlOperationId": 11 + { + "Id": 110 } - } + ], + "FunctionType": 2, + "KernelIdx": 2, + "YqlOperationId": 11 + } + } + }, + { + "Assign": { + "Column": { + "Id": 112 }, - { - "Assign": { - "Column": { - "Id": 115 + "Function": { + "Arguments": [ + { + "Id": 109 }, - "Function": { - "Arguments": [ - { - "Id": 112 - }, - { - "Id": 114 - } - ], - "FunctionType": 2, - "KernelIdx": 5, - "YqlOperationId": 0 + { + "Id": 111 } - } + ], + "FunctionType": 2, + "KernelIdx": 3, + "YqlOperationId": 0 + } + } + }, + { + "Assign": { + "Column": { + "Id": 113 }, - { - "Assign": { - "Column": { - "Id": 116 + "Function": { + "Arguments": [ + { + "Id": 107 }, - "Function": { - "Arguments": [ - { - "Id": 110 - }, - { - "Id": 115 - } - ], - "FunctionType": 2, - "KernelIdx": 6, - "YqlOperationId": 0 - } - } - }, - { - "Filter": { - "Predicate": { - "Id": 116 + { + "Id": 112 } - } - }, - { - "Projection": { - "Columns": [ - { - "Id": 6 - }, - { - "Id": 14 - } - ] - } + ], + "FunctionType": 2, + "KernelIdx": 4, + "YqlOperationId": 0 } - ], - "Version": 5 + } }, - "Table": "clickbench/plans/column/hits" - } - ], - "PlanNodeId": 11 + { + "Filter": { + "Predicate": { + "Id": 113 + } + } + }, + { + "Projection": { + "Columns": [ + { + "Id": 14 + } + ] + } + } + ], + "Version": 5 + }, + "Table": "clickbench/plans/column/hits" } - ] + ], + "PlanNodeId": 10 } ] } @@ -681,21 +554,16 @@ "reads": [ { "columns": [ - "CounterID", - "EventDate", "IsDownload", "IsLink", "IsRefresh", "URL" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", - "UserID (-\u221e, +\u221e)", - "WatchID (-\u221e, +\u221e)" + "CounterID [62, 62]", + "EventDate [15887, 15917]" ], - "type": "FullScan" + "type": "Scan" } ] } diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-39 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-39 index 259ed095ff37..e3b2510408c4 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-39 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-39 @@ -10,7 +10,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet", + "Node Type": "ResultSet_1", "PlanNodeId": 8, "PlanNodeType": "ResultSet", "Plans": [ @@ -92,7 +92,7 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate-Filter-TableFullScan", + "Node Type": "Aggregate-TableRangeScan", "Operators": [ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", @@ -104,22 +104,11 @@ ], "Name": "Aggregate" }, - { - "Inputs": [ - { - "InternalOperatorId": 2 - } - ], - "Name": "Filter", - "Predicate": "item.EventDate >= \"15887\" And item.EventDate <= \"15917\"" - }, { "Inputs": [], - "Name": "TableFullScan", + "Name": "TableRangeScan", "ReadColumns": [ "AdvEngineID", - "CounterID", - "EventDate", "IsRefresh", "Referer", "SearchEngineID", @@ -127,11 +116,13 @@ "URL" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", - "UserID (-\u221e, +\u221e)", - "WatchID (-\u221e, +\u221e)" + "CounterID [62, 62]", + "EventDate [15887, 15917]" + ], + "ReadRangesExpectedSize": 1, + "ReadRangesKeys": [ + "CounterID", + "EventDate" ], "SsaProgram": { "Command": [ @@ -141,7 +132,7 @@ "Id": 106 }, "Constant": { - "Int32": 62 + "Int32": 0 } } }, @@ -153,7 +144,7 @@ "Function": { "Arguments": [ { - "Id": 7 + "Id": 16 }, { "Id": 106 @@ -165,60 +156,10 @@ } } }, - { - "Assign": { - "Column": { - "Id": 108 - }, - "Constant": { - "Int32": 0 - } - } - }, - { - "Assign": { - "Column": { - "Id": 109 - }, - "Function": { - "Arguments": [ - { - "Id": 16 - }, - { - "Id": 108 - } - ], - "FunctionType": 2, - "KernelIdx": 1, - "YqlOperationId": 11 - } - } - }, - { - "Assign": { - "Column": { - "Id": 110 - }, - "Function": { - "Arguments": [ - { - "Id": 107 - }, - { - "Id": 109 - } - ], - "FunctionType": 2, - "KernelIdx": 2, - "YqlOperationId": 0 - } - } - }, { "Filter": { "Predicate": { - "Id": 110 + "Id": 107 } } }, @@ -228,9 +169,6 @@ { "Id": 41 }, - { - "Id": 6 - }, { "Id": 15 }, @@ -282,7 +220,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet", + "Node Type": "ResultSet_1", "PlanNodeId": 1, "PlanNodeType": "ResultSet", "Plans": [ @@ -339,159 +277,94 @@ "PlanNodeId": 9, "Plans": [ { - "Node Type": "Filter", + "Node Type": "TableRangeScan", "Operators": [ { - "Name": "Filter", - "Predicate": "item.EventDate >= \"15887\" And item.EventDate <= \"15917\"" - } - ], - "PlanNodeId": 10, - "Plans": [ - { - "Node Type": "TableFullScan", - "Operators": [ - { - "Name": "TableFullScan", - "ReadColumns": [ - "AdvEngineID", - "CounterID", - "EventDate", - "IsRefresh", - "Referer", - "SearchEngineID", - "TraficSourceID", - "URL" - ], - "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", - "UserID (-\u221e, +\u221e)", - "WatchID (-\u221e, +\u221e)" - ], - "SsaProgram": { - "Command": [ - { - "Assign": { - "Column": { - "Id": 106 - }, - "Constant": { - "Int32": 62 - } - } - }, - { - "Assign": { - "Column": { - "Id": 107 - }, - "Function": { - "Arguments": [ - { - "Id": 7 - }, - { - "Id": 106 - } - ], - "FunctionType": 2, - "KernelIdx": 0, - "YqlOperationId": 11 - } - } - }, - { - "Assign": { - "Column": { - "Id": 108 - }, - "Constant": { - "Int32": 0 - } - } + "Name": "TableRangeScan", + "ReadColumns": [ + "AdvEngineID", + "IsRefresh", + "Referer", + "SearchEngineID", + "TraficSourceID", + "URL" + ], + "ReadRanges": [ + "CounterID [62, 62]", + "EventDate [15887, 15917]" + ], + "ReadRangesExpectedSize": 1, + "ReadRangesKeys": [ + "CounterID", + "EventDate" + ], + "SsaProgram": { + "Command": [ + { + "Assign": { + "Column": { + "Id": 106 }, - { - "Assign": { - "Column": { - "Id": 109 - }, - "Function": { - "Arguments": [ - { - "Id": 16 - }, - { - "Id": 108 - } - ], - "FunctionType": 2, - "KernelIdx": 1, - "YqlOperationId": 11 - } - } + "Constant": { + "Int32": 0 + } + } + }, + { + "Assign": { + "Column": { + "Id": 107 }, - { - "Assign": { - "Column": { - "Id": 110 + "Function": { + "Arguments": [ + { + "Id": 16 }, - "Function": { - "Arguments": [ - { - "Id": 107 - }, - { - "Id": 109 - } - ], - "FunctionType": 2, - "KernelIdx": 2, - "YqlOperationId": 0 - } - } - }, - { - "Filter": { - "Predicate": { - "Id": 110 + { + "Id": 106 } - } - }, - { - "Projection": { - "Columns": [ - { - "Id": 41 - }, - { - "Id": 6 - }, - { - "Id": 15 - }, - { - "Id": 39 - }, - { - "Id": 38 - }, - { - "Id": 14 - } - ] - } + ], + "FunctionType": 2, + "KernelIdx": 0, + "YqlOperationId": 11 } - ], - "Version": 5 + } }, - "Table": "clickbench/plans/column/hits" - } - ], - "PlanNodeId": 11 + { + "Filter": { + "Predicate": { + "Id": 107 + } + } + }, + { + "Projection": { + "Columns": [ + { + "Id": 41 + }, + { + "Id": 15 + }, + { + "Id": 39 + }, + { + "Id": 38 + }, + { + "Id": 14 + } + ] + } + } + ], + "Version": 5 + }, + "Table": "clickbench/plans/column/hits" } - ] + ], + "PlanNodeId": 10 } ] } @@ -514,8 +387,6 @@ { "columns": [ "AdvEngineID", - "CounterID", - "EventDate", "IsRefresh", "Referer", "SearchEngineID", @@ -523,13 +394,10 @@ "URL" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", - "UserID (-\u221e, +\u221e)", - "WatchID (-\u221e, +\u221e)" + "CounterID [62, 62]", + "EventDate [15887, 15917]" ], - "type": "FullScan" + "type": "Scan" } ] } diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-4 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-4 index e73a82866b62..be9896c5f9bb 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-4 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-4 @@ -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": { @@ -203,10 +203,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -249,10 +249,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-40 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-40 index 77ca32c7d335..fec3d3227028 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-40 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-40 @@ -10,7 +10,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet", + "Node Type": "ResultSet_1", "PlanNodeId": 8, "PlanNodeType": "ResultSet", "Plans": [ @@ -89,7 +89,7 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate-Filter-TableFullScan", + "Node Type": "Aggregate-TableRangeScan", "Operators": [ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", @@ -101,20 +101,10 @@ ], "Name": "Aggregate" }, - { - "Inputs": [ - { - "InternalOperatorId": 2 - } - ], - "Name": "Filter", - "Predicate": "item.EventDate >= \"15887\" And item.EventDate <= \"15917\"" - }, { "Inputs": [], - "Name": "TableFullScan", + "Name": "TableRangeScan", "ReadColumns": [ - "CounterID", "EventDate", "IsRefresh", "RefererHash", @@ -122,11 +112,13 @@ "URLHash" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", - "UserID (-\u221e, +\u221e)", - "WatchID (-\u221e, +\u221e)" + "CounterID [62, 62]", + "EventDate [15887, 15917]" + ], + "ReadRangesExpectedSize": 1, + "ReadRangesKeys": [ + "CounterID", + "EventDate" ], "SsaProgram": { "Command": [ @@ -136,7 +128,7 @@ "Id": 106 }, "Constant": { - "Int32": 62 + "Int32": 0 } } }, @@ -148,7 +140,7 @@ "Function": { "Arguments": [ { - "Id": 7 + "Id": 16 }, { "Id": 106 @@ -166,7 +158,7 @@ "Id": 108 }, "Constant": { - "Int32": 0 + "Int32": -1 } } }, @@ -178,7 +170,7 @@ "Function": { "Arguments": [ { - "Id": 16 + "Id": 38 }, { "Id": 108 @@ -195,56 +187,6 @@ "Column": { "Id": 110 }, - "Function": { - "Arguments": [ - { - "Id": 107 - }, - { - "Id": 109 - } - ], - "FunctionType": 2, - "KernelIdx": 2, - "YqlOperationId": 0 - } - } - }, - { - "Assign": { - "Column": { - "Id": 111 - }, - "Constant": { - "Int32": -1 - } - } - }, - { - "Assign": { - "Column": { - "Id": 112 - }, - "Function": { - "Arguments": [ - { - "Id": 38 - }, - { - "Id": 111 - } - ], - "FunctionType": 2, - "KernelIdx": 3, - "YqlOperationId": 11 - } - } - }, - { - "Assign": { - "Column": { - "Id": 113 - }, "Constant": { "Int32": 6 } @@ -253,7 +195,7 @@ { "Assign": { "Column": { - "Id": 114 + "Id": 111 }, "Function": { "Arguments": [ @@ -261,11 +203,11 @@ "Id": 38 }, { - "Id": 113 + "Id": 110 } ], "FunctionType": 2, - "KernelIdx": 4, + "KernelIdx": 2, "YqlOperationId": 11 } } @@ -273,19 +215,19 @@ { "Assign": { "Column": { - "Id": 115 + "Id": 112 }, "Function": { "Arguments": [ { - "Id": 112 + "Id": 109 }, { - "Id": 114 + "Id": 111 } ], "FunctionType": 2, - "KernelIdx": 5, + "KernelIdx": 3, "YqlOperationId": 1 } } @@ -293,7 +235,7 @@ { "Assign": { "Column": { - "Id": 116 + "Id": 113 }, "Constant": { "Int64": 3594120000172545465 @@ -303,7 +245,7 @@ { "Assign": { "Column": { - "Id": 117 + "Id": 114 }, "Function": { "Arguments": [ @@ -311,11 +253,11 @@ "Id": 103 }, { - "Id": 116 + "Id": 113 } ], "FunctionType": 2, - "KernelIdx": 6, + "KernelIdx": 4, "YqlOperationId": 11 } } @@ -323,19 +265,19 @@ { "Assign": { "Column": { - "Id": 118 + "Id": 115 }, "Function": { "Arguments": [ { - "Id": 115 + "Id": 112 }, { - "Id": 117 + "Id": 114 } ], "FunctionType": 2, - "KernelIdx": 7, + "KernelIdx": 5, "YqlOperationId": 0 } } @@ -343,19 +285,19 @@ { "Assign": { "Column": { - "Id": 119 + "Id": 116 }, "Function": { "Arguments": [ { - "Id": 110 + "Id": 107 }, { - "Id": 118 + "Id": 115 } ], "FunctionType": 2, - "KernelIdx": 8, + "KernelIdx": 6, "YqlOperationId": 0 } } @@ -363,7 +305,7 @@ { "Filter": { "Predicate": { - "Id": 119 + "Id": 116 } } }, @@ -415,7 +357,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet", + "Node Type": "ResultSet_1", "PlanNodeId": 1, "PlanNodeType": "ResultSet", "Plans": [ @@ -472,295 +414,234 @@ "PlanNodeId": 9, "Plans": [ { - "Node Type": "Filter", + "Node Type": "TableRangeScan", "Operators": [ { - "Name": "Filter", - "Predicate": "item.EventDate >= \"15887\" And item.EventDate <= \"15917\"" - } - ], - "PlanNodeId": 10, - "Plans": [ - { - "Node Type": "TableFullScan", - "Operators": [ - { - "Name": "TableFullScan", - "ReadColumns": [ - "CounterID", - "EventDate", - "IsRefresh", - "RefererHash", - "TraficSourceID", - "URLHash" - ], - "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", - "UserID (-\u221e, +\u221e)", - "WatchID (-\u221e, +\u221e)" - ], - "SsaProgram": { - "Command": [ - { - "Assign": { - "Column": { - "Id": 106 - }, - "Constant": { - "Int32": 62 - } - } - }, - { - "Assign": { - "Column": { - "Id": 107 - }, - "Function": { - "Arguments": [ - { - "Id": 7 - }, - { - "Id": 106 - } - ], - "FunctionType": 2, - "KernelIdx": 0, - "YqlOperationId": 11 - } - } - }, - { - "Assign": { - "Column": { - "Id": 108 - }, - "Constant": { - "Int32": 0 - } - } + "Name": "TableRangeScan", + "ReadColumns": [ + "EventDate", + "IsRefresh", + "RefererHash", + "TraficSourceID", + "URLHash" + ], + "ReadRanges": [ + "CounterID [62, 62]", + "EventDate [15887, 15917]" + ], + "ReadRangesExpectedSize": 1, + "ReadRangesKeys": [ + "CounterID", + "EventDate" + ], + "SsaProgram": { + "Command": [ + { + "Assign": { + "Column": { + "Id": 106 }, - { - "Assign": { - "Column": { - "Id": 109 - }, - "Function": { - "Arguments": [ - { - "Id": 16 - }, - { - "Id": 108 - } - ], - "FunctionType": 2, - "KernelIdx": 1, - "YqlOperationId": 11 - } - } + "Constant": { + "Int32": 0 + } + } + }, + { + "Assign": { + "Column": { + "Id": 107 }, - { - "Assign": { - "Column": { - "Id": 110 + "Function": { + "Arguments": [ + { + "Id": 16 }, - "Function": { - "Arguments": [ - { - "Id": 107 - }, - { - "Id": 109 - } - ], - "FunctionType": 2, - "KernelIdx": 2, - "YqlOperationId": 0 + { + "Id": 106 } - } + ], + "FunctionType": 2, + "KernelIdx": 0, + "YqlOperationId": 11 + } + } + }, + { + "Assign": { + "Column": { + "Id": 108 }, - { - "Assign": { - "Column": { - "Id": 111 - }, - "Constant": { - "Int32": -1 - } - } + "Constant": { + "Int32": -1 + } + } + }, + { + "Assign": { + "Column": { + "Id": 109 }, - { - "Assign": { - "Column": { - "Id": 112 + "Function": { + "Arguments": [ + { + "Id": 38 }, - "Function": { - "Arguments": [ - { - "Id": 38 - }, - { - "Id": 111 - } - ], - "FunctionType": 2, - "KernelIdx": 3, - "YqlOperationId": 11 + { + "Id": 108 } - } + ], + "FunctionType": 2, + "KernelIdx": 1, + "YqlOperationId": 11 + } + } + }, + { + "Assign": { + "Column": { + "Id": 110 }, - { - "Assign": { - "Column": { - "Id": 113 - }, - "Constant": { - "Int32": 6 - } - } + "Constant": { + "Int32": 6 + } + } + }, + { + "Assign": { + "Column": { + "Id": 111 }, - { - "Assign": { - "Column": { - "Id": 114 + "Function": { + "Arguments": [ + { + "Id": 38 }, - "Function": { - "Arguments": [ - { - "Id": 38 - }, - { - "Id": 113 - } - ], - "FunctionType": 2, - "KernelIdx": 4, - "YqlOperationId": 11 + { + "Id": 110 } - } + ], + "FunctionType": 2, + "KernelIdx": 2, + "YqlOperationId": 11 + } + } + }, + { + "Assign": { + "Column": { + "Id": 112 }, - { - "Assign": { - "Column": { - "Id": 115 + "Function": { + "Arguments": [ + { + "Id": 109 }, - "Function": { - "Arguments": [ - { - "Id": 112 - }, - { - "Id": 114 - } - ], - "FunctionType": 2, - "KernelIdx": 5, - "YqlOperationId": 1 + { + "Id": 111 } - } + ], + "FunctionType": 2, + "KernelIdx": 3, + "YqlOperationId": 1 + } + } + }, + { + "Assign": { + "Column": { + "Id": 113 }, - { - "Assign": { - "Column": { - "Id": 116 - }, - "Constant": { - "Int64": 3594120000172545465 - } - } + "Constant": { + "Int64": 3594120000172545465 + } + } + }, + { + "Assign": { + "Column": { + "Id": 114 }, - { - "Assign": { - "Column": { - "Id": 117 + "Function": { + "Arguments": [ + { + "Id": 103 }, - "Function": { - "Arguments": [ - { - "Id": 103 - }, - { - "Id": 116 - } - ], - "FunctionType": 2, - "KernelIdx": 6, - "YqlOperationId": 11 + { + "Id": 113 } - } + ], + "FunctionType": 2, + "KernelIdx": 4, + "YqlOperationId": 11 + } + } + }, + { + "Assign": { + "Column": { + "Id": 115 }, - { - "Assign": { - "Column": { - "Id": 118 + "Function": { + "Arguments": [ + { + "Id": 112 }, - "Function": { - "Arguments": [ - { - "Id": 115 - }, - { - "Id": 117 - } - ], - "FunctionType": 2, - "KernelIdx": 7, - "YqlOperationId": 0 + { + "Id": 114 } - } + ], + "FunctionType": 2, + "KernelIdx": 5, + "YqlOperationId": 0 + } + } + }, + { + "Assign": { + "Column": { + "Id": 116 }, - { - "Assign": { - "Column": { - "Id": 119 + "Function": { + "Arguments": [ + { + "Id": 107 }, - "Function": { - "Arguments": [ - { - "Id": 110 - }, - { - "Id": 118 - } - ], - "FunctionType": 2, - "KernelIdx": 8, - "YqlOperationId": 0 - } - } - }, - { - "Filter": { - "Predicate": { - "Id": 119 + { + "Id": 115 } - } - }, - { - "Projection": { - "Columns": [ - { - "Id": 6 - }, - { - "Id": 104 - } - ] - } + ], + "FunctionType": 2, + "KernelIdx": 6, + "YqlOperationId": 0 } - ], - "Version": 5 + } }, - "Table": "clickbench/plans/column/hits" - } - ], - "PlanNodeId": 11 + { + "Filter": { + "Predicate": { + "Id": 116 + } + } + }, + { + "Projection": { + "Columns": [ + { + "Id": 6 + }, + { + "Id": 104 + } + ] + } + } + ], + "Version": 5 + }, + "Table": "clickbench/plans/column/hits" } - ] + ], + "PlanNodeId": 10 } ] } @@ -782,7 +663,6 @@ "reads": [ { "columns": [ - "CounterID", "EventDate", "IsRefresh", "RefererHash", @@ -790,13 +670,10 @@ "URLHash" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", - "UserID (-\u221e, +\u221e)", - "WatchID (-\u221e, +\u221e)" + "CounterID [62, 62]", + "EventDate [15887, 15917]" ], - "type": "FullScan" + "type": "Scan" } ] } diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-41 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-41 index 9e7738e0e152..565c77684b28 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-41 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-41 @@ -10,7 +10,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet", + "Node Type": "ResultSet_1", "PlanNodeId": 8, "PlanNodeType": "ResultSet", "Plans": [ @@ -89,7 +89,7 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate-Filter-TableFullScan", + "Node Type": "Aggregate-TableRangeScan", "Operators": [ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", @@ -101,33 +101,24 @@ ], "Name": "Aggregate" }, - { - "Inputs": [ - { - "InternalOperatorId": 2 - } - ], - "Name": "Filter", - "Predicate": "item.EventDate >= \"15887\" And item.EventDate <= \"15917\"" - }, { "Inputs": [], - "Name": "TableFullScan", + "Name": "TableRangeScan", "ReadColumns": [ - "CounterID", "DontCountHits", - "EventDate", "IsRefresh", "URLHash", "WindowClientHeight", "WindowClientWidth" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", - "UserID (-\u221e, +\u221e)", - "WatchID (-\u221e, +\u221e)" + "CounterID [62, 62]", + "EventDate [15887, 15917]" + ], + "ReadRangesExpectedSize": 1, + "ReadRangesKeys": [ + "CounterID", + "EventDate" ], "SsaProgram": { "Command": [ @@ -137,7 +128,7 @@ "Id": 106 }, "Constant": { - "Int32": 62 + "Int32": 0 } } }, @@ -149,7 +140,7 @@ "Function": { "Arguments": [ { - "Id": 7 + "Id": 16 }, { "Id": 106 @@ -179,7 +170,7 @@ "Function": { "Arguments": [ { - "Id": 16 + "Id": 62 }, { "Id": 108 @@ -196,56 +187,6 @@ "Column": { "Id": 110 }, - "Function": { - "Arguments": [ - { - "Id": 107 - }, - { - "Id": 109 - } - ], - "FunctionType": 2, - "KernelIdx": 2, - "YqlOperationId": 0 - } - } - }, - { - "Assign": { - "Column": { - "Id": 111 - }, - "Constant": { - "Int32": 0 - } - } - }, - { - "Assign": { - "Column": { - "Id": 112 - }, - "Function": { - "Arguments": [ - { - "Id": 62 - }, - { - "Id": 111 - } - ], - "FunctionType": 2, - "KernelIdx": 3, - "YqlOperationId": 11 - } - } - }, - { - "Assign": { - "Column": { - "Id": 113 - }, "Constant": { "Int64": 2868770270353813622 } @@ -254,7 +195,7 @@ { "Assign": { "Column": { - "Id": 114 + "Id": 111 }, "Function": { "Arguments": [ @@ -262,11 +203,11 @@ "Id": 104 }, { - "Id": 113 + "Id": 110 } ], "FunctionType": 2, - "KernelIdx": 4, + "KernelIdx": 2, "YqlOperationId": 11 } } @@ -274,19 +215,19 @@ { "Assign": { "Column": { - "Id": 115 + "Id": 112 }, "Function": { "Arguments": [ { - "Id": 112 + "Id": 109 }, { - "Id": 114 + "Id": 111 } ], "FunctionType": 2, - "KernelIdx": 5, + "KernelIdx": 3, "YqlOperationId": 0 } } @@ -294,19 +235,19 @@ { "Assign": { "Column": { - "Id": 116 + "Id": 113 }, "Function": { "Arguments": [ { - "Id": 110 + "Id": 107 }, { - "Id": 115 + "Id": 112 } ], "FunctionType": 2, - "KernelIdx": 6, + "KernelIdx": 4, "YqlOperationId": 0 } } @@ -314,16 +255,13 @@ { "Filter": { "Predicate": { - "Id": 116 + "Id": 113 } } }, { "Projection": { "Columns": [ - { - "Id": 6 - }, { "Id": 44 }, @@ -369,7 +307,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet", + "Node Type": "ResultSet_1", "PlanNodeId": 1, "PlanNodeType": "ResultSet", "Plans": [ @@ -426,249 +364,184 @@ "PlanNodeId": 9, "Plans": [ { - "Node Type": "Filter", + "Node Type": "TableRangeScan", "Operators": [ { - "Name": "Filter", - "Predicate": "item.EventDate >= \"15887\" And item.EventDate <= \"15917\"" - } - ], - "PlanNodeId": 10, - "Plans": [ - { - "Node Type": "TableFullScan", - "Operators": [ - { - "Name": "TableFullScan", - "ReadColumns": [ - "CounterID", - "DontCountHits", - "EventDate", - "IsRefresh", - "URLHash", - "WindowClientHeight", - "WindowClientWidth" - ], - "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", - "UserID (-\u221e, +\u221e)", - "WatchID (-\u221e, +\u221e)" - ], - "SsaProgram": { - "Command": [ - { - "Assign": { - "Column": { - "Id": 106 - }, - "Constant": { - "Int32": 62 - } - } - }, - { - "Assign": { - "Column": { - "Id": 107 - }, - "Function": { - "Arguments": [ - { - "Id": 7 - }, - { - "Id": 106 - } - ], - "FunctionType": 2, - "KernelIdx": 0, - "YqlOperationId": 11 - } - } - }, - { - "Assign": { - "Column": { - "Id": 108 - }, - "Constant": { - "Int32": 0 - } - } + "Name": "TableRangeScan", + "ReadColumns": [ + "DontCountHits", + "IsRefresh", + "URLHash", + "WindowClientHeight", + "WindowClientWidth" + ], + "ReadRanges": [ + "CounterID [62, 62]", + "EventDate [15887, 15917]" + ], + "ReadRangesExpectedSize": 1, + "ReadRangesKeys": [ + "CounterID", + "EventDate" + ], + "SsaProgram": { + "Command": [ + { + "Assign": { + "Column": { + "Id": 106 }, - { - "Assign": { - "Column": { - "Id": 109 - }, - "Function": { - "Arguments": [ - { - "Id": 16 - }, - { - "Id": 108 - } - ], - "FunctionType": 2, - "KernelIdx": 1, - "YqlOperationId": 11 - } - } + "Constant": { + "Int32": 0 + } + } + }, + { + "Assign": { + "Column": { + "Id": 107 }, - { - "Assign": { - "Column": { - "Id": 110 + "Function": { + "Arguments": [ + { + "Id": 16 }, - "Function": { - "Arguments": [ - { - "Id": 107 - }, - { - "Id": 109 - } - ], - "FunctionType": 2, - "KernelIdx": 2, - "YqlOperationId": 0 + { + "Id": 106 } - } + ], + "FunctionType": 2, + "KernelIdx": 0, + "YqlOperationId": 11 + } + } + }, + { + "Assign": { + "Column": { + "Id": 108 }, - { - "Assign": { - "Column": { - "Id": 111 - }, - "Constant": { - "Int32": 0 - } - } + "Constant": { + "Int32": 0 + } + } + }, + { + "Assign": { + "Column": { + "Id": 109 }, - { - "Assign": { - "Column": { - "Id": 112 + "Function": { + "Arguments": [ + { + "Id": 62 }, - "Function": { - "Arguments": [ - { - "Id": 62 - }, - { - "Id": 111 - } - ], - "FunctionType": 2, - "KernelIdx": 3, - "YqlOperationId": 11 + { + "Id": 108 } - } + ], + "FunctionType": 2, + "KernelIdx": 1, + "YqlOperationId": 11 + } + } + }, + { + "Assign": { + "Column": { + "Id": 110 }, - { - "Assign": { - "Column": { - "Id": 113 - }, - "Constant": { - "Int64": 2868770270353813622 - } - } + "Constant": { + "Int64": 2868770270353813622 + } + } + }, + { + "Assign": { + "Column": { + "Id": 111 }, - { - "Assign": { - "Column": { - "Id": 114 + "Function": { + "Arguments": [ + { + "Id": 104 }, - "Function": { - "Arguments": [ - { - "Id": 104 - }, - { - "Id": 113 - } - ], - "FunctionType": 2, - "KernelIdx": 4, - "YqlOperationId": 11 + { + "Id": 110 } - } + ], + "FunctionType": 2, + "KernelIdx": 2, + "YqlOperationId": 11 + } + } + }, + { + "Assign": { + "Column": { + "Id": 112 }, - { - "Assign": { - "Column": { - "Id": 115 + "Function": { + "Arguments": [ + { + "Id": 109 }, - "Function": { - "Arguments": [ - { - "Id": 112 - }, - { - "Id": 114 - } - ], - "FunctionType": 2, - "KernelIdx": 5, - "YqlOperationId": 0 + { + "Id": 111 } - } + ], + "FunctionType": 2, + "KernelIdx": 3, + "YqlOperationId": 0 + } + } + }, + { + "Assign": { + "Column": { + "Id": 113 }, - { - "Assign": { - "Column": { - "Id": 116 + "Function": { + "Arguments": [ + { + "Id": 107 }, - "Function": { - "Arguments": [ - { - "Id": 110 - }, - { - "Id": 115 - } - ], - "FunctionType": 2, - "KernelIdx": 6, - "YqlOperationId": 0 - } - } - }, - { - "Filter": { - "Predicate": { - "Id": 116 + { + "Id": 112 } - } - }, - { - "Projection": { - "Columns": [ - { - "Id": 6 - }, - { - "Id": 44 - }, - { - "Id": 43 - } - ] - } + ], + "FunctionType": 2, + "KernelIdx": 4, + "YqlOperationId": 0 } - ], - "Version": 5 + } }, - "Table": "clickbench/plans/column/hits" - } - ], - "PlanNodeId": 11 + { + "Filter": { + "Predicate": { + "Id": 113 + } + } + }, + { + "Projection": { + "Columns": [ + { + "Id": 44 + }, + { + "Id": 43 + } + ] + } + } + ], + "Version": 5 + }, + "Table": "clickbench/plans/column/hits" } - ] + ], + "PlanNodeId": 10 } ] } @@ -690,22 +563,17 @@ "reads": [ { "columns": [ - "CounterID", "DontCountHits", - "EventDate", "IsRefresh", "URLHash", "WindowClientHeight", "WindowClientWidth" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", - "UserID (-\u221e, +\u221e)", - "WatchID (-\u221e, +\u221e)" + "CounterID [62, 62]", + "EventDate [15887, 15917]" ], - "type": "FullScan" + "type": "Scan" } ] } diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-42 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-42 index 9ee1956accc4..1c35520cd146 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-42 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-42 @@ -10,7 +10,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet", + "Node Type": "ResultSet_1", "PlanNodeId": 8, "PlanNodeType": "ResultSet", "Plans": [ @@ -88,7 +88,7 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate-Filter-TableFullScan", + "Node Type": "Aggregate-TableRangeScan", "Operators": [ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", @@ -100,31 +100,22 @@ ], "Name": "Aggregate" }, - { - "Inputs": [ - { - "InternalOperatorId": 2 - } - ], - "Name": "Filter", - "Predicate": "item.EventDate >= \"15900\" And item.EventDate <= \"15901\"" - }, { "Inputs": [], - "Name": "TableFullScan", + "Name": "TableRangeScan", "ReadColumns": [ - "CounterID", "DontCountHits", - "EventDate", "EventTime", "IsRefresh" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", - "UserID (-\u221e, +\u221e)", - "WatchID (-\u221e, +\u221e)" + "CounterID [62, 62]", + "EventDate [15900, 15901]" + ], + "ReadRangesExpectedSize": 1, + "ReadRangesKeys": [ + "CounterID", + "EventDate" ], "SsaProgram": { "Command": [ @@ -134,7 +125,7 @@ "Id": 106 }, "Constant": { - "Int32": 62 + "Int32": 0 } } }, @@ -146,7 +137,7 @@ "Function": { "Arguments": [ { - "Id": 7 + "Id": 16 }, { "Id": 106 @@ -176,7 +167,7 @@ "Function": { "Arguments": [ { - "Id": 16 + "Id": 62 }, { "Id": 108 @@ -193,67 +184,17 @@ "Column": { "Id": 110 }, - "Constant": { - "Int32": 0 - } - } - }, - { - "Assign": { - "Column": { - "Id": 111 - }, - "Function": { - "Arguments": [ - { - "Id": 62 - }, - { - "Id": 110 - } - ], - "FunctionType": 2, - "KernelIdx": 2, - "YqlOperationId": 11 - } - } - }, - { - "Assign": { - "Column": { - "Id": 112 - }, - "Function": { - "Arguments": [ - { - "Id": 109 - }, - { - "Id": 111 - } - ], - "FunctionType": 2, - "KernelIdx": 3, - "YqlOperationId": 0 - } - } - }, - { - "Assign": { - "Column": { - "Id": 113 - }, "Function": { "Arguments": [ { "Id": 107 }, { - "Id": 112 + "Id": 109 } ], "FunctionType": 2, - "KernelIdx": 4, + "KernelIdx": 2, "YqlOperationId": 0 } } @@ -261,16 +202,13 @@ { "Filter": { "Predicate": { - "Id": 113 + "Id": 110 } } }, { "Projection": { "Columns": [ - { - "Id": 6 - }, { "Id": 5 } @@ -313,7 +251,7 @@ "PlanNodeType": "Query", "Plans": [ { - "Node Type": "ResultSet", + "Node Type": "ResultSet_1", "PlanNodeId": 1, "PlanNodeType": "ResultSet", "Plans": [ @@ -370,194 +308,129 @@ "PlanNodeId": 9, "Plans": [ { - "Node Type": "Filter", + "Node Type": "TableRangeScan", "Operators": [ { - "Name": "Filter", - "Predicate": "item.EventDate >= \"15900\" And item.EventDate <= \"15901\"" - } - ], - "PlanNodeId": 10, - "Plans": [ - { - "Node Type": "TableFullScan", - "Operators": [ - { - "Name": "TableFullScan", - "ReadColumns": [ - "CounterID", - "DontCountHits", - "EventDate", - "EventTime", - "IsRefresh" - ], - "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", - "UserID (-\u221e, +\u221e)", - "WatchID (-\u221e, +\u221e)" - ], - "SsaProgram": { - "Command": [ - { - "Assign": { - "Column": { - "Id": 106 - }, - "Constant": { - "Int32": 62 - } - } - }, - { - "Assign": { - "Column": { - "Id": 107 - }, - "Function": { - "Arguments": [ - { - "Id": 7 - }, - { - "Id": 106 - } - ], - "FunctionType": 2, - "KernelIdx": 0, - "YqlOperationId": 11 - } - } - }, - { - "Assign": { - "Column": { - "Id": 108 - }, - "Constant": { - "Int32": 0 - } - } + "Name": "TableRangeScan", + "ReadColumns": [ + "DontCountHits", + "EventTime", + "IsRefresh" + ], + "ReadRanges": [ + "CounterID [62, 62]", + "EventDate [15900, 15901]" + ], + "ReadRangesExpectedSize": 1, + "ReadRangesKeys": [ + "CounterID", + "EventDate" + ], + "SsaProgram": { + "Command": [ + { + "Assign": { + "Column": { + "Id": 106 }, - { - "Assign": { - "Column": { - "Id": 109 - }, - "Function": { - "Arguments": [ - { - "Id": 16 - }, - { - "Id": 108 - } - ], - "FunctionType": 2, - "KernelIdx": 1, - "YqlOperationId": 11 - } - } + "Constant": { + "Int32": 0 + } + } + }, + { + "Assign": { + "Column": { + "Id": 107 }, - { - "Assign": { - "Column": { - "Id": 110 + "Function": { + "Arguments": [ + { + "Id": 16 }, - "Constant": { - "Int32": 0 + { + "Id": 106 } - } + ], + "FunctionType": 2, + "KernelIdx": 0, + "YqlOperationId": 11 + } + } + }, + { + "Assign": { + "Column": { + "Id": 108 }, - { - "Assign": { - "Column": { - "Id": 111 - }, - "Function": { - "Arguments": [ - { - "Id": 62 - }, - { - "Id": 110 - } - ], - "FunctionType": 2, - "KernelIdx": 2, - "YqlOperationId": 11 - } - } + "Constant": { + "Int32": 0 + } + } + }, + { + "Assign": { + "Column": { + "Id": 109 }, - { - "Assign": { - "Column": { - "Id": 112 + "Function": { + "Arguments": [ + { + "Id": 62 }, - "Function": { - "Arguments": [ - { - "Id": 109 - }, - { - "Id": 111 - } - ], - "FunctionType": 2, - "KernelIdx": 3, - "YqlOperationId": 0 + { + "Id": 108 } - } + ], + "FunctionType": 2, + "KernelIdx": 1, + "YqlOperationId": 11 + } + } + }, + { + "Assign": { + "Column": { + "Id": 110 }, - { - "Assign": { - "Column": { - "Id": 113 + "Function": { + "Arguments": [ + { + "Id": 107 }, - "Function": { - "Arguments": [ - { - "Id": 107 - }, - { - "Id": 112 - } - ], - "FunctionType": 2, - "KernelIdx": 4, - "YqlOperationId": 0 - } - } - }, - { - "Filter": { - "Predicate": { - "Id": 113 + { + "Id": 109 } - } - }, - { - "Projection": { - "Columns": [ - { - "Id": 6 - }, - { - "Id": 5 - } - ] - } + ], + "FunctionType": 2, + "KernelIdx": 2, + "YqlOperationId": 0 } - ], - "Version": 5 + } }, - "Table": "clickbench/plans/column/hits" - } - ], - "PlanNodeId": 11 + { + "Filter": { + "Predicate": { + "Id": 110 + } + } + }, + { + "Projection": { + "Columns": [ + { + "Id": 5 + } + ] + } + } + ], + "Version": 5 + }, + "Table": "clickbench/plans/column/hits" } - ] + ], + "PlanNodeId": 10 } ] } @@ -579,20 +452,15 @@ "reads": [ { "columns": [ - "CounterID", "DontCountHits", - "EventDate", "EventTime", "IsRefresh" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", - "UserID (-\u221e, +\u221e)", - "WatchID (-\u221e, +\u221e)" + "CounterID [62, 62]", + "EventDate [15900, 15901]" ], - "type": "FullScan" + "type": "Scan" } ] } diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-5 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-5 index 8e455afa34dc..64da5b004633 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-5 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-5 @@ -104,10 +104,10 @@ "SearchPhrase" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -203,10 +203,10 @@ "SearchPhrase" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -249,10 +249,10 @@ "SearchPhrase" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-6 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-6 index 47e9f3f57db5..30fee3fdeaa6 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-6 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-6 @@ -81,10 +81,10 @@ "EventDate" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -191,10 +191,10 @@ "EventDate" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -283,10 +283,10 @@ "EventDate" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -360,10 +360,10 @@ "EventDate" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-7 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-7 index c3b59907f014..d8aeaadbc754 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-7 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-7 @@ -78,10 +78,10 @@ "AdvEngineID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -209,10 +209,10 @@ "AdvEngineID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -290,10 +290,10 @@ "AdvEngineID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-8 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-8 index 431639c66329..935dfd3c0f73 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-8 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-8 @@ -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": { @@ -217,10 +217,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -267,10 +267,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-9 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-9 index 95f04031aa64..595c7211d686 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-9 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-9 @@ -103,10 +103,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -198,10 +198,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -321,10 +321,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -391,10 +391,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "SsaProgram": { @@ -451,10 +451,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" @@ -467,10 +467,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-0 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-0 index 1ef611b809e2..2cf7ffdcf9d1 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-0 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-0 @@ -78,10 +78,10 @@ "Name": "TableFullScan", "ReadColumns": null, "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -146,10 +146,10 @@ "Name": "TableFullScan", "ReadColumns": null, "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -173,10 +173,10 @@ "reads": [ { "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-1 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-1 index 1d5ca56beefb..e72f2a8f46b7 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-1 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-1 @@ -89,10 +89,10 @@ "AdvEngineID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -169,10 +169,10 @@ "AdvEngineID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -201,10 +201,10 @@ "AdvEngineID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-10 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-10 index 9101e37d5a23..6e626559d5a2 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-10 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-10 @@ -113,10 +113,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -219,10 +219,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -254,10 +254,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-11 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-11 index 8283b6313d04..a550013bb856 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-11 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-11 @@ -116,10 +116,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -223,10 +223,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -259,10 +259,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-12 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-12 index e182d61c7208..fcc0e0d16b94 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-12 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-12 @@ -87,10 +87,10 @@ "SearchPhrase" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -177,10 +177,10 @@ "SearchPhrase" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -209,10 +209,10 @@ "SearchPhrase" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-13 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-13 index 94f1e09a4096..606e542258e2 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-13 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-13 @@ -113,10 +113,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -219,10 +219,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -254,10 +254,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-14 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-14 index 1e7c671f669a..6019ecb21d57 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-14 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-14 @@ -89,10 +89,10 @@ "SearchPhrase" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -180,10 +180,10 @@ "SearchPhrase" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -213,10 +213,10 @@ "SearchPhrase" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-15 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-15 index e390b499b0f4..a1d9d514e458 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-15 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-15 @@ -78,10 +78,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -158,10 +158,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -188,10 +188,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-16 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-16 index 71b4672498d7..77c17b40dfc0 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-16 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-16 @@ -80,10 +80,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -161,10 +161,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -192,10 +192,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-17 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-17 index f0667dbd949d..d3f120638993 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-17 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-17 @@ -79,10 +79,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -156,10 +156,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -187,10 +187,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-18 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-18 index 74c39336831f..e795b79188dc 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-18 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-18 @@ -82,10 +82,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -164,10 +164,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -196,10 +196,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-19 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-19 index c601c9a97d3f..ad927321645b 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-19 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-19 @@ -62,10 +62,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -133,10 +133,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -163,10 +163,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-2 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-2 index 8ccfa321c215..fa6193a44bd2 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-2 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-2 @@ -90,10 +90,10 @@ "ResolutionWidth" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -161,10 +161,10 @@ "ResolutionWidth" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -216,10 +216,10 @@ "ResolutionWidth" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -247,10 +247,10 @@ "ResolutionWidth" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-20 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-20 index 6b0f6f5c370a..05e27608f149 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-20 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-20 @@ -89,10 +89,10 @@ "URL" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -169,10 +169,10 @@ "URL" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -201,10 +201,10 @@ "URL" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-21 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-21 index 3d4a095eb9d5..1a2830edca4c 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-21 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-21 @@ -88,10 +88,10 @@ "URL" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -179,10 +179,10 @@ "URL" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -212,10 +212,10 @@ "URL" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-22 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-22 index a7b9fc8a11e6..806586b95c09 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-22 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-22 @@ -112,10 +112,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -193,10 +193,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -303,10 +303,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -362,10 +362,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -401,10 +401,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" @@ -417,10 +417,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-23 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-23 index 432897d377d0..c9f5da5358ce 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-23 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-23 @@ -35,7 +35,7 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Limit-Filter-TableFullScan", + "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { "Inputs": [ @@ -44,7 +44,8 @@ } ], "Limit": "10", - "Name": "Limit" + "Name": "TopSort", + "TopSortBy": "$4.EventTime" }, { "Inputs": [ @@ -166,10 +167,10 @@ "WithHash" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -212,11 +213,12 @@ "PlanNodeId": 2, "Plans": [ { - "Node Type": "Limit", + "Node Type": "TopSort", "Operators": [ { "Limit": "10", - "Name": "Limit" + "Name": "TopSort", + "TopSortBy": "$4.EventTime" } ], "PlanNodeId": 4, @@ -344,10 +346,10 @@ "WithHash" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -478,10 +480,10 @@ "WithHash" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-24 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-24 index 1d61e93ad9a8..7a571546ba99 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-24 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-24 @@ -35,7 +35,7 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Limit-Filter-TableFullScan", + "Node Type": "TopSort-Filter-TableFullScan", "Operators": [ { "Inputs": [ @@ -44,7 +44,8 @@ } ], "Limit": "10", - "Name": "Limit" + "Name": "TopSort", + "TopSortBy": "$4.EventTime" }, { "Inputs": [ @@ -63,10 +64,10 @@ "SearchPhrase" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -109,11 +110,12 @@ "PlanNodeId": 2, "Plans": [ { - "Node Type": "Limit", + "Node Type": "TopSort", "Operators": [ { "Limit": "10", - "Name": "Limit" + "Name": "TopSort", + "TopSortBy": "$4.EventTime" } ], "PlanNodeId": 4, @@ -138,10 +140,10 @@ "SearchPhrase" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -169,10 +171,10 @@ "SearchPhrase" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-25 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-25 index 367bb349f1b4..3a96a4044dc0 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-25 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-25 @@ -63,10 +63,10 @@ "SearchPhrase" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -138,10 +138,10 @@ "SearchPhrase" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -168,10 +168,10 @@ "SearchPhrase" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-26 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-26 index 2ba90d4d2238..045c0ae1e085 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-26 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-26 @@ -64,10 +64,10 @@ "SearchPhrase" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -141,10 +141,10 @@ "SearchPhrase" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -172,10 +172,10 @@ "SearchPhrase" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-27 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-27 index afca1b848d53..100f7fc60584 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-27 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-27 @@ -97,10 +97,10 @@ "URL" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -198,10 +198,10 @@ "URL" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -233,10 +233,10 @@ "URL" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-28 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-28 index 986403f196c0..b29b8a2365ab 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-28 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-28 @@ -96,10 +96,10 @@ "Referer" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -196,10 +196,10 @@ "Referer" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -230,10 +230,10 @@ "Referer" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-29 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-29 index 662b7d72845f..a101b4bfa2f3 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-29 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-29 @@ -89,10 +89,10 @@ "ResolutionWidth" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -159,10 +159,10 @@ "ResolutionWidth" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -213,10 +213,10 @@ "ResolutionWidth" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -243,10 +243,10 @@ "ResolutionWidth" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-3 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-3 index 7893731cc961..c505b47c45f0 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-3 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-3 @@ -80,10 +80,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -150,10 +150,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -180,10 +180,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-30 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-30 index a4d5b1bc5d55..92c859769b71 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-30 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-30 @@ -92,10 +92,10 @@ "SearchPhrase" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -186,10 +186,10 @@ "SearchPhrase" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -222,10 +222,10 @@ "SearchPhrase" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-31 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-31 index 61bbb6c66a22..3d00146d4e72 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-31 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-31 @@ -92,10 +92,10 @@ "WatchID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -186,10 +186,10 @@ "WatchID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -222,10 +222,10 @@ "WatchID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-32 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-32 index 3caa0ba968b1..52b202ddb852 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-32 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-32 @@ -82,10 +82,10 @@ "WatchID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -165,10 +165,10 @@ "WatchID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -198,10 +198,10 @@ "WatchID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-33 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-33 index 6ae1db1d9ea6..3e256b46aad9 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-33 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-33 @@ -78,10 +78,10 @@ "URL" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -158,10 +158,10 @@ "URL" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -188,10 +188,10 @@ "URL" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-34 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-34 index 87f0d196e666..e2eff916294f 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-34 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-34 @@ -80,10 +80,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -161,10 +161,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -192,10 +192,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-35 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-35 index a3679758bf76..1ff646e3dcb8 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-35 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-35 @@ -81,10 +81,10 @@ "ClientIP" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -161,10 +161,10 @@ "ClientIP" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -191,10 +191,10 @@ "ClientIP" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-36 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-36 index 45b864ae1fc4..64bc51b02dd7 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-36 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-36 @@ -59,7 +59,7 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate-Filter-TableFullScan", + "Node Type": "Aggregate-Filter-TableRangeScan", "Operators": [ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", @@ -78,23 +78,21 @@ } ], "Name": "Filter", - "Predicate": "item.CounterID == 62 And item.EventDate >= \"15887\" And item.EventDate <= \"15917\" And item.DontCountHits == 0 And item.IsRefresh == 0 And item.URL != \"\"" + "Predicate": "item.DontCountHits == 0 And item.IsRefresh == 0 And item.URL != \"\"" }, { "Inputs": [], - "Name": "TableFullScan", + "Name": "TableRangeScan", "ReadColumns": [ - "CounterID", "DontCountHits", - "EventDate", "IsRefresh", "URL" ], - "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", + "ReadRange": [ + "CounterID (62)", + "EventDate [15887, 15917]", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -167,28 +165,26 @@ "Operators": [ { "Name": "Filter", - "Predicate": "item.CounterID == 62 And item.EventDate >= \"15887\" And item.EventDate <= \"15917\" And item.DontCountHits == 0 And item.IsRefresh == 0 And item.URL != \"\"" + "Predicate": "item.DontCountHits == 0 And item.IsRefresh == 0 And item.URL != \"\"" } ], "PlanNodeId": 7, "Plans": [ { - "Node Type": "TableFullScan", + "Node Type": "TableRangeScan", "Operators": [ { - "Name": "TableFullScan", + "Name": "TableRangeScan", "ReadColumns": [ - "CounterID", "DontCountHits", - "EventDate", "IsRefresh", "URL" ], - "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", + "ReadRange": [ + "CounterID (62)", + "EventDate [15887, 15917]", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -214,20 +210,20 @@ "reads": [ { "columns": [ - "CounterID", "DontCountHits", - "EventDate", "IsRefresh", "URL" ], + "lookup_by": [ + "CounterID (62)" + ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", + "EventDate [15887, 15917]", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], - "type": "FullScan" + "type": "Scan" } ] } diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-37 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-37 index d84d2e5e67bf..98d45c7ceee8 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-37 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-37 @@ -59,7 +59,7 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate-Filter-TableFullScan", + "Node Type": "Aggregate-Filter-TableRangeScan", "Operators": [ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", @@ -78,23 +78,21 @@ } ], "Name": "Filter", - "Predicate": "item.CounterID == 62 And item.EventDate >= \"15887\" And item.EventDate <= \"15917\" And item.DontCountHits == 0 And item.IsRefresh == 0 And item.Title != \"\"" + "Predicate": "item.DontCountHits == 0 And item.IsRefresh == 0 And item.Title != \"\"" }, { "Inputs": [], - "Name": "TableFullScan", + "Name": "TableRangeScan", "ReadColumns": [ - "CounterID", "DontCountHits", - "EventDate", "IsRefresh", "Title" ], - "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", + "ReadRange": [ + "CounterID (62)", + "EventDate [15887, 15917]", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -167,28 +165,26 @@ "Operators": [ { "Name": "Filter", - "Predicate": "item.CounterID == 62 And item.EventDate >= \"15887\" And item.EventDate <= \"15917\" And item.DontCountHits == 0 And item.IsRefresh == 0 And item.Title != \"\"" + "Predicate": "item.DontCountHits == 0 And item.IsRefresh == 0 And item.Title != \"\"" } ], "PlanNodeId": 7, "Plans": [ { - "Node Type": "TableFullScan", + "Node Type": "TableRangeScan", "Operators": [ { - "Name": "TableFullScan", + "Name": "TableRangeScan", "ReadColumns": [ - "CounterID", "DontCountHits", - "EventDate", "IsRefresh", "Title" ], - "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", + "ReadRange": [ + "CounterID (62)", + "EventDate [15887, 15917]", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -214,20 +210,20 @@ "reads": [ { "columns": [ - "CounterID", "DontCountHits", - "EventDate", "IsRefresh", "Title" ], + "lookup_by": [ + "CounterID (62)" + ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", + "EventDate [15887, 15917]", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], - "type": "FullScan" + "type": "Scan" } ] } diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-38 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-38 index 0ba3a87d8cd2..00adbe65f9c9 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-38 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-38 @@ -88,7 +88,7 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate-Filter-TableFullScan", + "Node Type": "Aggregate-Filter-TableRangeScan", "Operators": [ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", @@ -107,24 +107,22 @@ } ], "Name": "Filter", - "Predicate": "item.CounterID == 62 And item.EventDate >= \"15887\" And item.EventDate <= \"15917\" And item.IsRefresh == 0 And item.IsLink != 0 And item.IsDownload == 0" + "Predicate": "item.IsRefresh == 0 And item.IsLink != 0 And item.IsDownload == 0" }, { "Inputs": [], - "Name": "TableFullScan", + "Name": "TableRangeScan", "ReadColumns": [ - "CounterID", - "EventDate", "IsDownload", "IsLink", "IsRefresh", "URL" ], - "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", + "ReadRange": [ + "CounterID (62)", + "EventDate [15887, 15917]", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -221,29 +219,27 @@ "Operators": [ { "Name": "Filter", - "Predicate": "item.CounterID == 62 And item.EventDate >= \"15887\" And item.EventDate <= \"15917\" And item.IsRefresh == 0 And item.IsLink != 0 And item.IsDownload == 0" + "Predicate": "item.IsRefresh == 0 And item.IsLink != 0 And item.IsDownload == 0" } ], "PlanNodeId": 10, "Plans": [ { - "Node Type": "TableFullScan", + "Node Type": "TableRangeScan", "Operators": [ { - "Name": "TableFullScan", + "Name": "TableRangeScan", "ReadColumns": [ - "CounterID", - "EventDate", "IsDownload", "IsLink", "IsRefresh", "URL" ], - "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", + "ReadRange": [ + "CounterID (62)", + "EventDate [15887, 15917]", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -273,21 +269,21 @@ "reads": [ { "columns": [ - "CounterID", - "EventDate", "IsDownload", "IsLink", "IsRefresh", "URL" ], + "lookup_by": [ + "CounterID (62)" + ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", + "EventDate [15887, 15917]", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], - "type": "FullScan" + "type": "Scan" } ] } diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-39 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-39 index 2cc5681d35ae..e37ac195061c 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-39 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-39 @@ -92,7 +92,7 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate-Filter-TableFullScan", + "Node Type": "Aggregate-Filter-TableRangeScan", "Operators": [ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", @@ -111,26 +111,24 @@ } ], "Name": "Filter", - "Predicate": "item.CounterID == 62 And item.EventDate >= \"15887\" And item.EventDate <= \"15917\" And item.IsRefresh == 0" + "Predicate": "item.IsRefresh == 0" }, { "Inputs": [], - "Name": "TableFullScan", + "Name": "TableRangeScan", "ReadColumns": [ "AdvEngineID", - "CounterID", - "EventDate", "IsRefresh", "Referer", "SearchEngineID", "TraficSourceID", "URL" ], - "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", + "ReadRange": [ + "CounterID (62)", + "EventDate [15887, 15917]", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -227,31 +225,29 @@ "Operators": [ { "Name": "Filter", - "Predicate": "item.CounterID == 62 And item.EventDate >= \"15887\" And item.EventDate <= \"15917\" And item.IsRefresh == 0" + "Predicate": "item.IsRefresh == 0" } ], "PlanNodeId": 10, "Plans": [ { - "Node Type": "TableFullScan", + "Node Type": "TableRangeScan", "Operators": [ { - "Name": "TableFullScan", + "Name": "TableRangeScan", "ReadColumns": [ "AdvEngineID", - "CounterID", - "EventDate", "IsRefresh", "Referer", "SearchEngineID", "TraficSourceID", "URL" ], - "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", + "ReadRange": [ + "CounterID (62)", + "EventDate [15887, 15917]", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -282,22 +278,22 @@ { "columns": [ "AdvEngineID", - "CounterID", - "EventDate", "IsRefresh", "Referer", "SearchEngineID", "TraficSourceID", "URL" ], + "lookup_by": [ + "CounterID (62)" + ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", + "EventDate [15887, 15917]", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], - "type": "FullScan" + "type": "Scan" } ] } diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-4 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-4 index 77ee960840a5..3996be22107c 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-4 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-4 @@ -104,10 +104,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -189,10 +189,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -221,10 +221,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-40 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-40 index 56e895833626..ec6e39e00ed3 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-40 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-40 @@ -89,7 +89,7 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate-Filter-TableFullScan", + "Node Type": "Aggregate-Filter-TableRangeScan", "Operators": [ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", @@ -108,24 +108,23 @@ } ], "Name": "Filter", - "Predicate": "item.CounterID == 62 And item.EventDate >= \"15887\" And item.EventDate <= \"15917\" And item.IsRefresh == 0 And If And item.RefererHash == 3594120000172545465" + "Predicate": "item.IsRefresh == 0 And If And item.RefererHash == 3594120000172545465" }, { "Inputs": [], - "Name": "TableFullScan", + "Name": "TableRangeScan", "ReadColumns": [ - "CounterID", "EventDate", "IsRefresh", "RefererHash", "TraficSourceID", "URLHash" ], - "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", + "ReadRange": [ + "CounterID (62)", + "EventDate [15887, 15917]", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -222,29 +221,28 @@ "Operators": [ { "Name": "Filter", - "Predicate": "item.CounterID == 62 And item.EventDate >= \"15887\" And item.EventDate <= \"15917\" And item.IsRefresh == 0 And If And item.RefererHash == 3594120000172545465" + "Predicate": "item.IsRefresh == 0 And If And item.RefererHash == 3594120000172545465" } ], "PlanNodeId": 10, "Plans": [ { - "Node Type": "TableFullScan", + "Node Type": "TableRangeScan", "Operators": [ { - "Name": "TableFullScan", + "Name": "TableRangeScan", "ReadColumns": [ - "CounterID", "EventDate", "IsRefresh", "RefererHash", "TraficSourceID", "URLHash" ], - "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", + "ReadRange": [ + "CounterID (62)", + "EventDate [15887, 15917]", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -274,21 +272,22 @@ "reads": [ { "columns": [ - "CounterID", "EventDate", "IsRefresh", "RefererHash", "TraficSourceID", "URLHash" ], + "lookup_by": [ + "CounterID (62)" + ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", + "EventDate [15887, 15917]", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], - "type": "FullScan" + "type": "Scan" } ] } diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-41 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-41 index 2f73b73dbf42..085e27f0790c 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-41 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-41 @@ -89,7 +89,7 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate-Filter-TableFullScan", + "Node Type": "Aggregate-Filter-TableRangeScan", "Operators": [ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", @@ -108,25 +108,23 @@ } ], "Name": "Filter", - "Predicate": "item.CounterID == 62 And item.EventDate >= \"15887\" And item.EventDate <= \"15917\" And item.IsRefresh == 0 And item.DontCountHits == 0 And item.URLHash == 2868770270353813622" + "Predicate": "item.IsRefresh == 0 And item.DontCountHits == 0 And item.URLHash == 2868770270353813622" }, { "Inputs": [], - "Name": "TableFullScan", + "Name": "TableRangeScan", "ReadColumns": [ - "CounterID", "DontCountHits", - "EventDate", "IsRefresh", "URLHash", "WindowClientHeight", "WindowClientWidth" ], - "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", + "ReadRange": [ + "CounterID (62)", + "EventDate [15887, 15917]", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -223,30 +221,28 @@ "Operators": [ { "Name": "Filter", - "Predicate": "item.CounterID == 62 And item.EventDate >= \"15887\" And item.EventDate <= \"15917\" And item.IsRefresh == 0 And item.DontCountHits == 0 And item.URLHash == 2868770270353813622" + "Predicate": "item.IsRefresh == 0 And item.DontCountHits == 0 And item.URLHash == 2868770270353813622" } ], "PlanNodeId": 10, "Plans": [ { - "Node Type": "TableFullScan", + "Node Type": "TableRangeScan", "Operators": [ { - "Name": "TableFullScan", + "Name": "TableRangeScan", "ReadColumns": [ - "CounterID", "DontCountHits", - "EventDate", "IsRefresh", "URLHash", "WindowClientHeight", "WindowClientWidth" ], - "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", + "ReadRange": [ + "CounterID (62)", + "EventDate [15887, 15917]", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -276,22 +272,22 @@ "reads": [ { "columns": [ - "CounterID", "DontCountHits", - "EventDate", "IsRefresh", "URLHash", "WindowClientHeight", "WindowClientWidth" ], + "lookup_by": [ + "CounterID (62)" + ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", + "EventDate [15887, 15917]", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], - "type": "FullScan" + "type": "Scan" } ] } diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-42 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-42 index f0ccfe4133e7..2bab3137a8e2 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-42 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-42 @@ -88,7 +88,7 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate-Filter-TableFullScan", + "Node Type": "Aggregate-Filter-TableRangeScan", "Operators": [ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", @@ -107,23 +107,21 @@ } ], "Name": "Filter", - "Predicate": "item.CounterID == 62 And item.EventDate >= \"15900\" And item.EventDate <= \"15901\" And item.IsRefresh == 0 And item.DontCountHits == 0" + "Predicate": "item.IsRefresh == 0 And item.DontCountHits == 0" }, { "Inputs": [], - "Name": "TableFullScan", + "Name": "TableRangeScan", "ReadColumns": [ - "CounterID", "DontCountHits", - "EventDate", "EventTime", "IsRefresh" ], - "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", + "ReadRange": [ + "CounterID (62)", + "EventDate [15900, 15901]", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -220,28 +218,26 @@ "Operators": [ { "Name": "Filter", - "Predicate": "item.CounterID == 62 And item.EventDate >= \"15900\" And item.EventDate <= \"15901\" And item.IsRefresh == 0 And item.DontCountHits == 0" + "Predicate": "item.IsRefresh == 0 And item.DontCountHits == 0" } ], "PlanNodeId": 10, "Plans": [ { - "Node Type": "TableFullScan", + "Node Type": "TableRangeScan", "Operators": [ { - "Name": "TableFullScan", + "Name": "TableRangeScan", "ReadColumns": [ - "CounterID", "DontCountHits", - "EventDate", "EventTime", "IsRefresh" ], - "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", + "ReadRange": [ + "CounterID (62)", + "EventDate [15900, 15901]", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -271,20 +267,20 @@ "reads": [ { "columns": [ - "CounterID", "DontCountHits", - "EventDate", "EventTime", "IsRefresh" ], + "lookup_by": [ + "CounterID (62)" + ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", - "CounterID (-\u221e, +\u221e)", - "EventDate (-\u221e, +\u221e)", + "EventDate [15900, 15901]", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], - "type": "FullScan" + "type": "Scan" } ] } diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-5 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-5 index ce6fcf89cc4d..cf047f57ac43 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-5 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-5 @@ -104,10 +104,10 @@ "SearchPhrase" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -189,10 +189,10 @@ "SearchPhrase" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -221,10 +221,10 @@ "SearchPhrase" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-6 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-6 index 64b25c06f135..2b4eed446bac 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-6 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-6 @@ -89,10 +89,10 @@ "EventDate" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -159,10 +159,10 @@ "EventDate" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -213,10 +213,10 @@ "EventDate" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -243,10 +243,10 @@ "EventDate" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-7 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-7 index 29b3dcc1e78e..a4835febff63 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-7 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-7 @@ -87,10 +87,10 @@ "AdvEngineID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -177,10 +177,10 @@ "AdvEngineID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -209,10 +209,10 @@ "AdvEngineID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-8 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-8 index 3d2a2a9eda8b..47d70fdd33ee 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-8 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-8 @@ -104,10 +104,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -200,10 +200,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -233,10 +233,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-9 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-9 index 569fdcf4b140..408d1569b7ce 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-9 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-9 @@ -103,10 +103,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -175,10 +175,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -275,10 +275,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -322,10 +322,10 @@ "UserID" ], "ReadRanges": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "Table": "clickbench/plans/row/hits" @@ -359,10 +359,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan" @@ -375,10 +375,10 @@ "UserID" ], "scan_by": [ - "EventTime (-\u221e, +\u221e)", "CounterID (-\u221e, +\u221e)", "EventDate (-\u221e, +\u221e)", "UserID (-\u221e, +\u221e)", + "EventTime (-\u221e, +\u221e)", "WatchID (-\u221e, +\u221e)" ], "type": "FullScan"