diff --git a/.github/config/muted_ya.txt b/.github/config/muted_ya.txt index 64bf5d988885..bc28a1e19ab5 100644 --- a/.github/config/muted_ya.txt +++ b/.github/config/muted_ya.txt @@ -97,7 +97,6 @@ ydb/tests/fq/yds * ydb/tests/fq/control_plane_storage * ydb/tests/functional/audit * ydb/tests/functional/blobstorage test_replication.py.TestReplicationAfterNodesRestart.test_replication* -ydb/tests/functional/clickbench test.py.test_plans[column] ydb/tests/functional/kqp/kqp_indexes ConsistentIndexRead.InteractiveTx ydb/tests/functional/kqp/kqp_query_session KqpQuerySession.NoLocalAttach ydb/tests/functional/restarts test_restarts.py.* 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 46ff82f75cb9..e83db242df17 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 @@ -103,7 +103,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -191,7 +191,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 3913b96d05d5..897e750c37fb 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 @@ -142,7 +142,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -269,7 +269,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 aa15cbd14f95..2b73fc9b9827 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 @@ -163,7 +163,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -314,7 +314,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 3d4c586f9981..f220192bffc3 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 @@ -169,7 +169,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -324,7 +324,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 06503a06c400..16b69fb8840b 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 @@ -134,7 +134,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -266,7 +266,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 8feefc633c55..536f110df353 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 @@ -163,7 +163,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -314,7 +314,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 bfd4f3272c02..540a47da8afa 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 @@ -139,7 +139,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -275,7 +275,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 534fdd410cf4..c9fb982c086a 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 @@ -97,7 +97,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -192,7 +192,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 8f33c6dee206..3fb5e7befa7d 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 @@ -102,7 +102,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -201,7 +201,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 78683ee80f4e..94ef751b2c62 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 @@ -101,7 +101,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -196,7 +196,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 571add1f0ce9..eb9b55dc45ec 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 @@ -107,7 +107,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -210,7 +210,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 10ab24edc1f8..aae07eb4e3b4 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 @@ -110,7 +110,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -224,7 +224,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 7337a23bd387..89c49e8cb049 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 @@ -163,7 +163,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -302,7 +302,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 109653e05519..fdcf67ca43ab 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 @@ -142,7 +142,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -269,7 +269,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 c8b56cec8e77..7e17b759c25f 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 @@ -178,7 +178,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -354,7 +354,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 0826a49f14f1..e0ca11709049 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 @@ -274,7 +274,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -513,7 +513,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -780,7 +780,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -994,7 +994,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 852b09175574..b245ac00b09b 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 @@ -526,7 +526,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -1059,7 +1059,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 9aaace15b902..2b4b3b9f118c 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 @@ -114,7 +114,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -235,7 +235,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 a4942dd1cc7d..c69ff1a493ee 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 @@ -110,7 +110,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -227,7 +227,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 892d0cd1e918..d875f87b98b7 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 @@ -114,7 +114,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -236,7 +236,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 aff9001a35ac..322086d4bc20 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 @@ -153,7 +153,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -299,7 +299,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 5f557097b8ed..f84911c029d4 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 @@ -152,7 +152,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -294,7 +294,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 11099da50e7c..b0157f8eadc1 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 @@ -108,7 +108,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -193,7 +193,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 cbcb25e21252..1b042ec18693 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 @@ -126,7 +126,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -237,7 +237,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 c5881d8b22fd..9bbc50a61991 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 @@ -148,7 +148,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -293,7 +293,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 5138e7989884..40b8bbae3b1d 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 @@ -148,7 +148,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -293,7 +293,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 693905cb421d..cdb74eef88cd 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 @@ -110,7 +110,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -217,7 +217,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 535e4f14270a..b97bfa06e46c 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 @@ -97,7 +97,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -192,7 +192,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 024e00aff4d4..589267a2ea09 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 @@ -102,7 +102,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -201,7 +201,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 f2b6c6e3161f..186817ce5a9f 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 @@ -100,7 +100,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -195,7 +195,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 1a29ad72fc5e..796d4e89a5ac 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 @@ -238,7 +238,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -474,7 +474,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 6bd71b14d4f5..54add1a7092f 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 @@ -238,7 +238,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -474,7 +474,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 a07374f31124..7bb266311b0d 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 @@ -268,7 +268,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -529,7 +529,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 f9b8d6fa958c..11069be5733b 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 @@ -186,7 +186,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -361,7 +361,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 e78341014eb2..bd0cea24c3a2 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 @@ -123,7 +123,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -223,7 +223,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 be78dd3cd1b3..4bd63edbaacc 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 @@ -89,18 +89,30 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate-TableRangeScan", + "Node Type": "Aggregate-Filter-TableRangeScan", "Operators": [ { "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", "GroupBy": "", "Inputs": [ + { + "InternalOperatorId": 1 + }, { "InternalOperatorId": 1 } ], "Name": "Aggregate" }, + { + "Inputs": [ + { + "InternalOperatorId": 2 + } + ], + "Name": "Filter", + "Predicate": "item.TraficSourceID == -1 Or item.TraficSourceID == 6" + }, { "Inputs": [], "Name": "TableRangeScan", @@ -159,7 +171,7 @@ "Id": 108 }, "Constant": { - "Int32": -1 + "Int64": 3594120000172545465 } } }, @@ -171,7 +183,7 @@ "Function": { "Arguments": [ { - "Id": 38 + "Id": 103 }, { "Id": 108 @@ -188,117 +200,17 @@ "Column": { "Id": 110 }, - "Constant": { - "Int32": 6 - } - } - }, - { - "Assign": { - "Column": { - "Id": 111 - }, - "Function": { - "Arguments": [ - { - "Id": 38 - }, - { - "Id": 110 - } - ], - "FunctionType": 2, - "KernelIdx": 2, - "YqlOperationId": 11 - } - } - }, - { - "Assign": { - "Column": { - "Id": 112 - }, - "Function": { - "Arguments": [ - { - "Id": 109 - }, - { - "Id": 111 - } - ], - "FunctionType": 2, - "KernelIdx": 3, - "YqlOperationId": 1 - } - } - }, - { - "Assign": { - "Column": { - "Id": 113 - }, - "Constant": { - "Int64": 3594120000172545465 - } - } - }, - { - "Assign": { - "Column": { - "Id": 114 - }, - "Function": { - "Arguments": [ - { - "Id": 103 - }, - { - "Id": 113 - } - ], - "FunctionType": 2, - "KernelIdx": 4, - "YqlOperationId": 11 - } - } - }, - { - "Assign": { - "Column": { - "Id": 115 - }, - "Function": { - "Arguments": [ - { - "Id": 112 - }, - { - "Id": 114 - } - ], - "FunctionType": 2, - "KernelIdx": 5, - "YqlOperationId": 0 - } - } - }, - { - "Assign": { - "Column": { - "Id": 116 - }, "Function": { "Arguments": [ { "Id": 107 }, { - "Id": 115 + "Id": 109 } ], "FunctionType": 2, - "KernelIdx": 6, + "KernelIdx": 2, "YqlOperationId": 0 } } @@ -306,7 +218,7 @@ { "Filter": { "Predicate": { - "Id": 116 + "Id": 110 } } }, @@ -316,6 +228,9 @@ { "Id": 6 }, + { + "Id": 38 + }, { "Id": 104 } @@ -323,7 +238,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -415,235 +330,150 @@ "PlanNodeId": 9, "Plans": [ { - "Node Type": "TableRangeScan", + "Node Type": "Filter", "Operators": [ { - "Name": "TableRangeScan", - "ReadColumns": [ - "EventDate", - "IsRefresh", - "RefererHash", - "TraficSourceID", - "URLHash" - ], - "ReadRanges": [ - "CounterID [62, 62]", - "EventDate [15887, 15917]" - ], - "ReadRangesExpectedSize": 1, - "ReadRangesKeys": [ - "CounterID", - "EventDate" - ], - "Scan": "Parallel", - "SsaProgram": { - "Command": [ - { - "Assign": { - "Column": { - "Id": 106 - }, - "Constant": { - "Int32": 0 - } - } - }, - { - "Assign": { - "Column": { - "Id": 107 - }, - "Function": { - "Arguments": [ - { - "Id": 16 - }, - { + "Name": "Filter", + "Predicate": "item.TraficSourceID == -1 Or item.TraficSourceID == 6" + } + ], + "PlanNodeId": 10, + "Plans": [ + { + "Node Type": "TableRangeScan", + "Operators": [ + { + "Name": "TableRangeScan", + "ReadColumns": [ + "EventDate", + "IsRefresh", + "RefererHash", + "TraficSourceID", + "URLHash" + ], + "ReadRanges": [ + "CounterID [62, 62]", + "EventDate [15887, 15917]" + ], + "ReadRangesExpectedSize": 1, + "ReadRangesKeys": [ + "CounterID", + "EventDate" + ], + "Scan": "Parallel", + "SsaProgram": { + "Command": [ + { + "Assign": { + "Column": { "Id": 106 + }, + "Constant": { + "Int32": 0 } - ], - "FunctionType": 2, - "KernelIdx": 0, - "YqlOperationId": 11 - } - } - }, - { - "Assign": { - "Column": { - "Id": 108 - }, - "Constant": { - "Int32": -1 - } - } - }, - { - "Assign": { - "Column": { - "Id": 109 + } }, - "Function": { - "Arguments": [ - { - "Id": 38 + { + "Assign": { + "Column": { + "Id": 107 }, - { - "Id": 108 + "Function": { + "Arguments": [ + { + "Id": 16 + }, + { + "Id": 106 + } + ], + "FunctionType": 2, + "KernelIdx": 0, + "YqlOperationId": 11 } - ], - "FunctionType": 2, - "KernelIdx": 1, - "YqlOperationId": 11 - } - } - }, - { - "Assign": { - "Column": { - "Id": 110 - }, - "Constant": { - "Int32": 6 - } - } - }, - { - "Assign": { - "Column": { - "Id": 111 + } }, - "Function": { - "Arguments": [ - { - "Id": 38 + { + "Assign": { + "Column": { + "Id": 108 }, - { - "Id": 110 + "Constant": { + "Int64": 3594120000172545465 } - ], - "FunctionType": 2, - "KernelIdx": 2, - "YqlOperationId": 11 - } - } - }, - { - "Assign": { - "Column": { - "Id": 112 + } }, - "Function": { - "Arguments": [ - { + { + "Assign": { + "Column": { "Id": 109 }, - { - "Id": 111 + "Function": { + "Arguments": [ + { + "Id": 103 + }, + { + "Id": 108 + } + ], + "FunctionType": 2, + "KernelIdx": 1, + "YqlOperationId": 11 } - ], - "FunctionType": 2, - "KernelIdx": 3, - "YqlOperationId": 1 - } - } - }, - { - "Assign": { - "Column": { - "Id": 113 - }, - "Constant": { - "Int64": 3594120000172545465 - } - } - }, - { - "Assign": { - "Column": { - "Id": 114 + } }, - "Function": { - "Arguments": [ - { - "Id": 103 + { + "Assign": { + "Column": { + "Id": 110 }, - { - "Id": 113 + "Function": { + "Arguments": [ + { + "Id": 107 + }, + { + "Id": 109 + } + ], + "FunctionType": 2, + "KernelIdx": 2, + "YqlOperationId": 0 } - ], - "FunctionType": 2, - "KernelIdx": 4, - "YqlOperationId": 11 - } - } - }, - { - "Assign": { - "Column": { - "Id": 115 + } }, - "Function": { - "Arguments": [ - { - "Id": 112 - }, - { - "Id": 114 + { + "Filter": { + "Predicate": { + "Id": 110 } - ], - "FunctionType": 2, - "KernelIdx": 5, - "YqlOperationId": 0 - } - } - }, - { - "Assign": { - "Column": { - "Id": 116 + } }, - "Function": { - "Arguments": [ - { - "Id": 107 - }, - { - "Id": 115 - } - ], - "FunctionType": 2, - "KernelIdx": 6, - "YqlOperationId": 0 - } - } - }, - { - "Filter": { - "Predicate": { - "Id": 116 + { + "Projection": { + "Columns": [ + { + "Id": 6 + }, + { + "Id": 38 + }, + { + "Id": 104 + } + ] + } } - } + ], + "Version": 4 }, - { - "Projection": { - "Columns": [ - { - "Id": 6 - }, - { - "Id": 104 - } - ] - } - } - ], - "Version": 5 - }, - "Table": "clickbench/plans/column/hits" + "Table": "clickbench/plans/column/hits" + } + ], + "PlanNodeId": 11 } - ], - "PlanNodeId": 10 + ] } ] } 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 1e24a0f711ff..4dce9155dc8a 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 @@ -273,7 +273,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -538,7 +538,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 ab5ea784d984..85317e70404e 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 @@ -217,7 +217,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -427,7 +427,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 5c6c8063c544..50fbf7910693 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 @@ -123,7 +123,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -223,7 +223,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 0081b7dccc93..18a6f051beca 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 @@ -135,7 +135,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -246,7 +246,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 7d6be213925f..c875bd726155 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 @@ -134,7 +134,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -266,7 +266,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 62dec1f807dc..dc29c434251c 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 @@ -126,7 +126,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -240,7 +240,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } 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 3dfbae5ef8dd..7c278c11f647 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 @@ -131,7 +131,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -227,7 +227,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -351,7 +351,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" } @@ -422,7 +422,7 @@ } } ], - "Version": 5 + "Version": 4 }, "Table": "clickbench/plans/column/hits" }