diff options
| author | gvit <gvit@ydb.tech> | 2022-08-29 16:13:17 +0300 |
|---|---|---|
| committer | gvit <gvit@ydb.tech> | 2022-08-29 16:13:17 +0300 |
| commit | e31803f9523c2d40aabd97d66f9cc6ea6e8b54e3 (patch) | |
| tree | cace693d5a975df07d8917623236a8c9f169c01f | |
| parent | 42e3178c13abb683e7e07d0caa58b3220d146fd1 (diff) | |
| download | ydb-e31803f9523c2d40aabd97d66f9cc6ea6e8b54e3.tar.gz | |
switch tests to new engine by default
132 files changed, 1251 insertions, 1634 deletions
diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_compute_scheduler.sql-plan_/compute_scheduler.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_compute_scheduler.sql-plan_/compute_scheduler.sql.plan index 69e51bd2065..2b3b8ee5bd3 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_compute_scheduler.sql-plan_/compute_scheduler.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_compute_scheduler.sql-plan_/compute_scheduler.sql.plan @@ -1,20 +1,20 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_compute_scheduler_sql_plan/compute_nodes", "reads": [ { - "type": "FullScan", - "scan_by": [ - "entry_id" - ], "columns": [ "scheduler" - ] + ], + "scan_by": [ + "entry_id (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -22,13 +22,13 @@ "name": "/local/base_compute_scheduler_sql_plan/schedulers", "reads": [ { - "type": "FullScan", - "scan_by": [ - "id" - ], "columns": [ "id" - ] + ], + "scan_by": [ + "id (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dt.sql-plan_/dt.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dt.sql-plan_/dt.sql.plan index a376f78f58c..bedd7457114 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dt.sql-plan_/dt.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dt.sql-plan_/dt.sql.plan @@ -1,7 +1,7 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [] }
\ No newline at end of file diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_insert_from_table.sql-plan_/dynumber_insert_from_table.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_insert_from_table.sql-plan_/dynumber_insert_from_table.sql.plan index 476038248df..73567045c8b 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_insert_from_table.sql-plan_/dynumber_insert_from_table.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_insert_from_table.sql-plan_/dynumber_insert_from_table.sql.plan @@ -1,21 +1,21 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_dynumber_insert_from_table_sql_plan/InputDyNumber", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], "columns": [ "Key", "Value" - ] + ], + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -23,21 +23,16 @@ "name": "/local/base_dynumber_insert_from_table_sql_plan/ResultTableDyNumber", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key (expr)" - ] + "type": "Lookup" } ], "writes": [ { - "type": "MultiUpsert", - "key": [ - "Key (expr)" - ], "columns": [ + "Key", "Value" - ] + ], + "type": "MultiUpsert" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_insert_literal.sql-plan_/dynumber_insert_literal.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_insert_literal.sql-plan_/dynumber_insert_literal.sql.plan index 09487f2fc05..563e72065e1 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_insert_literal.sql-plan_/dynumber_insert_literal.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_insert_literal.sql-plan_/dynumber_insert_literal.sql.plan @@ -1,28 +1,23 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_dynumber_insert_literal_sql_plan/ResultLiteralDyNumber", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key (expr)" - ] + "type": "Lookup" } ], "writes": [ { - "type": "MultiUpsert", - "key": [ - "Key (expr)" - ], "columns": [ + "Key", "Value" - ] + ], + "type": "MultiUpsert" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_insert_params.sql-plan_/dynumber_insert_params.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_insert_params.sql-plan_/dynumber_insert_params.sql.plan index 358e701f117..00465a5cfc2 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_insert_params.sql-plan_/dynumber_insert_params.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_insert_params.sql-plan_/dynumber_insert_params.sql.plan @@ -1,28 +1,23 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_dynumber_insert_params_sql_plan/ResultParamsDyNumber", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key (expr)" - ] + "type": "Lookup" } ], "writes": [ { - "type": "MultiUpsert", - "key": [ - "Key (expr)" - ], "columns": [ + "Key", "Value" - ] + ], + "type": "MultiUpsert" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_select_from_table.sql-plan_/dynumber_select_from_table.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_select_from_table.sql-plan_/dynumber_select_from_table.sql.plan index 1d82a97527e..b3ab6f2ab11 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_select_from_table.sql-plan_/dynumber_select_from_table.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_select_from_table.sql-plan_/dynumber_select_from_table.sql.plan @@ -1,22 +1,22 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_dynumber_select_from_table_sql_plan/InputDyNumber", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], - "limit": "\"1001\"", "columns": [ "Key", "Value" - ] + ], + "limit": "1001", + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_select_literal.sql-plan_/dynumber_select_literal.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_select_literal.sql-plan_/dynumber_select_literal.sql.plan index a376f78f58c..bedd7457114 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_select_literal.sql-plan_/dynumber_select_literal.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_select_literal.sql-plan_/dynumber_select_literal.sql.plan @@ -1,7 +1,7 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [] }
\ No newline at end of file diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_select_params.sql-plan_/dynumber_select_params.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_select_params.sql-plan_/dynumber_select_params.sql.plan index a376f78f58c..bedd7457114 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_select_params.sql-plan_/dynumber_select_params.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_dynumber_select_params.sql-plan_/dynumber_select_params.sql.plan @@ -1,7 +1,7 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [] }
\ No newline at end of file diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_index_predicate_point.sql-plan_/index_predicate_point.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_index_predicate_point.sql-plan_/index_predicate_point.sql.plan index c96eb796ac2..a3b01c30bbb 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_index_predicate_point.sql-plan_/index_predicate_point.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_index_predicate_point.sql-plan_/index_predicate_point.sql.plan @@ -1,24 +1,20 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_index_predicate_point_sql_plan/InputJoinIndex2", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key1 (expr)", - "Key2 (expr)" - ], "columns": [ "Fk2", "Key1", "Key2", "Value" - ] + ], + "type": "Lookup" } ] }, @@ -26,19 +22,19 @@ "name": "/local/base_index_predicate_point_sql_plan/InputJoinIndex2/Index/indexImplTable", "reads": [ { - "type": "Lookup", + "columns": [ + "Key1", + "Key2" + ], + "limit": "1001", "lookup_by": [ - "Fk2 (\"105\")" + "Fk2 (105)" ], "scan_by": [ - "Key1", - "Key2" + "Key1 (-\u221e, +\u221e)", + "Key2 (-\u221e, +\u221e)" ], - "limit": "\"1001\"", - "columns": [ - "Key1", - "Key2" - ] + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_index_select_using_index.sql-plan_/index_select_using_index.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_index_select_using_index.sql-plan_/index_select_using_index.sql.plan index 648035681df..81e58922863 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_index_select_using_index.sql-plan_/index_select_using_index.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_index_select_using_index.sql-plan_/index_select_using_index.sql.plan @@ -1,24 +1,20 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_index_select_using_index_sql_plan/InputJoinIndex2", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key1 (expr)", - "Key2 (expr)" - ], "columns": [ "Fk2", "Key1", "Key2", "Value" - ] + ], + "type": "Lookup" } ] }, @@ -26,19 +22,19 @@ "name": "/local/base_index_select_using_index_sql_plan/InputJoinIndex2/Index/indexImplTable", "reads": [ { - "type": "Lookup", + "columns": [ + "Key1", + "Key2" + ], + "limit": "1001", "lookup_by": [ - "Fk2 (\"103\")" + "Fk2 (103)" ], "scan_by": [ - "Key1", - "Key2" + "Key1 (-\u221e, +\u221e)", + "Key2 (-\u221e, +\u221e)" ], - "limit": "\"1001\"", - "columns": [ - "Key1", - "Key2" - ] + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_index_select_using_index_only.sql-plan_/index_select_using_index_only.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_index_select_using_index_only.sql-plan_/index_select_using_index_only.sql.plan index 8de72c785d9..a9fd63f9c04 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_index_select_using_index_only.sql-plan_/index_select_using_index_only.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_index_select_using_index_only.sql-plan_/index_select_using_index_only.sql.plan @@ -1,25 +1,25 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_index_select_using_index_only_sql_plan/InputJoinIndex2/Index/indexImplTable", "reads": [ { - "type": "Lookup", + "columns": [ + "Key1" + ], + "limit": "1001", "lookup_by": [ - "Fk2 (\"103\")" + "Fk2 (103)" ], "scan_by": [ - "Key1", - "Key2" + "Key1 (-\u221e, +\u221e)", + "Key2 (-\u221e, +\u221e)" ], - "limit": "\"1001\"", - "columns": [ - "Key1" - ] + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_double_lookup.sql-plan_/join_join_double_lookup.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_double_lookup.sql-plan_/join_join_double_lookup.sql.plan index 3da5d0a51d3..b378e6256a4 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_double_lookup.sql-plan_/join_join_double_lookup.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_double_lookup.sql-plan_/join_join_double_lookup.sql.plan @@ -1,20 +1,20 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_join_join_double_lookup_sql_plan/InputJoin1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], "columns": [ "Fk21" - ] + ], + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -22,16 +22,11 @@ "name": "/local/base_join_join_double_lookup_sql_plan/InputJoin2", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key1 (expr)" - ], - "scan_by": [ - "Key2" - ], "columns": [ + "Key1", "Key2" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_dup_column_right.sql-plan_/join_join_dup_column_right.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_dup_column_right.sql-plan_/join_join_dup_column_right.sql.plan index c925057dbb5..f6790ddd943 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_dup_column_right.sql-plan_/join_join_dup_column_right.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_dup_column_right.sql-plan_/join_join_dup_column_right.sql.plan @@ -1,22 +1,22 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_join_join_dup_column_right_sql_plan/InputJoin1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], "columns": [ "Fk21", "Key", "Value" - ] + ], + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -24,15 +24,11 @@ "name": "/local/base_join_join_dup_column_right_sql_plan/InputJoin2", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key1", - "Key2" - ], "columns": [ "Key1", "Key2" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_range_right.sql-plan_/join_join_range_right.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_range_right.sql-plan_/join_join_range_right.sql.plan index 5e1eb6f1d58..97a7424c79e 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_range_right.sql-plan_/join_join_range_right.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_range_right.sql-plan_/join_join_range_right.sql.plan @@ -1,22 +1,22 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_join_join_range_right_sql_plan/InputJoin1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], "columns": [ "Fk21", "Fk22", "Value" - ] + ], + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -24,18 +24,18 @@ "name": "/local/base_join_join_range_right_sql_plan/InputJoin2", "reads": [ { - "type": "Lookup", - "lookup_by": [ - "Key1 (\"103\")" - ], - "scan_by": [ - "Key2" - ], "columns": [ "Key1", "Key2", "Value" - ] + ], + "lookup_by": [ + "Key1 (103)" + ], + "scan_by": [ + "Key2 (-\u221e, +\u221e)" + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup.sql-plan_/join_join_to_idx_lookup.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup.sql-plan_/join_join_to_idx_lookup.sql.plan index 85794d35e1f..fb8adb1aff1 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup.sql-plan_/join_join_to_idx_lookup.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup.sql-plan_/join_join_to_idx_lookup.sql.plan @@ -1,22 +1,22 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_join_join_to_idx_lookup_sql_plan/InputJoin1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], "columns": [ "Fk21", "Fk22", "Value" - ] + ], + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -24,16 +24,12 @@ "name": "/local/base_join_join_to_idx_lookup_sql_plan/InputJoin2", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key1 (expr)", - "Key2 (expr)" - ], "columns": [ "Fk3", "Key1", "Key2" - ] + ], + "type": "Lookup" } ] }, @@ -41,14 +37,11 @@ "name": "/local/base_join_join_to_idx_lookup_sql_plan/InputJoin3", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key (expr)" - ], "columns": [ "Key", "Value" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_cast.sql-plan_/join_join_to_idx_lookup_cast.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_cast.sql-plan_/join_join_to_idx_lookup_cast.sql.plan index 3174769614d..c4b1449d35e 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_cast.sql-plan_/join_join_to_idx_lookup_cast.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_cast.sql-plan_/join_join_to_idx_lookup_cast.sql.plan @@ -1,23 +1,19 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_join_join_to_idx_lookup_cast_sql_plan/InputJoin2", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key1 (expr)", - "Key2 (expr)" - ], "columns": [ "Key1", "Key2", "Value" - ] + ], + "type": "Lookup" } ] }, @@ -25,15 +21,15 @@ "name": "/local/base_join_join_to_idx_lookup_cast_sql_plan/InputJoin6", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], "columns": [ "Fk21", "Fk22", "Value" - ] + ], + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_cast2.sql-plan_/join_join_to_idx_lookup_cast2.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_cast2.sql-plan_/join_join_to_idx_lookup_cast2.sql.plan index b07f475ab7b..6cfd9406258 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_cast2.sql-plan_/join_join_to_idx_lookup_cast2.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_cast2.sql-plan_/join_join_to_idx_lookup_cast2.sql.plan @@ -1,22 +1,22 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_join_join_to_idx_lookup_cast2_sql_plan/InputJoin1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], "columns": [ "Fk21", "Key", "Value" - ] + ], + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -24,19 +24,13 @@ "name": "/local/base_join_join_to_idx_lookup_cast2_sql_plan/InputJoin2", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key1 (expr)" - ], - "scan_by": [ - "Key2" - ], "columns": [ "Fk3", "Key1", "Key2", "Value" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_dup_c_left.sql-plan_/join_join_to_idx_lookup_dup_c_left.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_dup_c_left.sql-plan_/join_join_to_idx_lookup_dup_c_left.sql.plan index b62400da0e6..72375bfab23 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_dup_c_left.sql-plan_/join_join_to_idx_lookup_dup_c_left.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_dup_c_left.sql-plan_/join_join_to_idx_lookup_dup_c_left.sql.plan @@ -1,21 +1,21 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_join_join_to_idx_lookup_dup_c_left_sql_plan/InputJoin1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], "columns": [ "Fk21", "Value" - ] + ], + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -23,16 +23,12 @@ "name": "/local/base_join_join_to_idx_lookup_dup_c_left_sql_plan/InputJoin5", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key1 (expr)", - "Key2 (expr)" - ], "columns": [ "Key1", "Key2", "Value" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_equi.sql-plan_/join_join_to_idx_lookup_equi.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_equi.sql-plan_/join_join_to_idx_lookup_equi.sql.plan index a3c38f009a3..58663c896e3 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_equi.sql-plan_/join_join_to_idx_lookup_equi.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_equi.sql-plan_/join_join_to_idx_lookup_equi.sql.plan @@ -1,23 +1,23 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_join_join_to_idx_lookup_equi_sql_plan/InputJoin1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], "columns": [ "Fk21", "Fk22", "Key", "Value" - ] + ], + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -25,17 +25,13 @@ "name": "/local/base_join_join_to_idx_lookup_equi_sql_plan/InputJoin2", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key1 (expr)", - "Key2 (expr)" - ], "columns": [ "Fk3", "Key1", "Key2", "Value" - ] + ], + "type": "Lookup" } ] }, @@ -43,14 +39,14 @@ "name": "/local/base_join_join_to_idx_lookup_equi_sql_plan/InputJoin3", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], "columns": [ "Key", "Value" - ] + ], + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_inner.sql-plan_/join_join_to_idx_lookup_inner.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_inner.sql-plan_/join_join_to_idx_lookup_inner.sql.plan index 117b03c35ca..9425366fa02 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_inner.sql-plan_/join_join_to_idx_lookup_inner.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_inner.sql-plan_/join_join_to_idx_lookup_inner.sql.plan @@ -1,22 +1,22 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_join_join_to_idx_lookup_inner_sql_plan/InputJoin1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], "columns": [ "Fk21", "Fk22", "Value" - ] + ], + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -24,16 +24,12 @@ "name": "/local/base_join_join_to_idx_lookup_inner_sql_plan/InputJoin2", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key1 (expr)", - "Key2 (expr)" - ], "columns": [ "Fk3", "Key1", "Key2" - ] + ], + "type": "Lookup" } ] }, @@ -41,14 +37,11 @@ "name": "/local/base_join_join_to_idx_lookup_inner_sql_plan/InputJoin3", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key (expr)" - ], "columns": [ "Key", "Value" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_leftonly.sql-plan_/join_join_to_idx_lookup_leftonly.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_leftonly.sql-plan_/join_join_to_idx_lookup_leftonly.sql.plan index c1a8da087be..e3cd0cc87d2 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_leftonly.sql-plan_/join_join_to_idx_lookup_leftonly.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_leftonly.sql-plan_/join_join_to_idx_lookup_leftonly.sql.plan @@ -1,22 +1,22 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_join_join_to_idx_lookup_leftonly_sql_plan/InputJoin2", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key1", - "Key2" - ], "columns": [ "Fk3", "Value" - ] + ], + "scan_by": [ + "Key1 (-\u221e, +\u221e)", + "Key2 (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -24,13 +24,10 @@ "name": "/local/base_join_join_to_idx_lookup_leftonly_sql_plan/InputJoin3", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key (expr)" - ], "columns": [ "Key" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_leftsemi.sql-plan_/join_join_to_idx_lookup_leftsemi.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_leftsemi.sql-plan_/join_join_to_idx_lookup_leftsemi.sql.plan index 9b4b1453cb6..af8b7b3f2b6 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_leftsemi.sql-plan_/join_join_to_idx_lookup_leftsemi.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_leftsemi.sql-plan_/join_join_to_idx_lookup_leftsemi.sql.plan @@ -1,22 +1,22 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_join_join_to_idx_lookup_leftsemi_sql_plan/InputJoin1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], "columns": [ "Fk21", "Fk22", "Value" - ] + ], + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -24,15 +24,11 @@ "name": "/local/base_join_join_to_idx_lookup_leftsemi_sql_plan/InputJoin2", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key1 (expr)", - "Key2 (expr)" - ], "columns": [ "Key1", "Key2" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_partial_inner.sql-plan_/join_join_to_idx_lookup_partial_inner.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_partial_inner.sql-plan_/join_join_to_idx_lookup_partial_inner.sql.plan index 1d4153778cc..e37eefcb708 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_partial_inner.sql-plan_/join_join_to_idx_lookup_partial_inner.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_partial_inner.sql-plan_/join_join_to_idx_lookup_partial_inner.sql.plan @@ -1,21 +1,21 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_join_join_to_idx_lookup_partial_inner_sql_plan/InputJoin1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], "columns": [ "Fk21", "Value" - ] + ], + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -23,17 +23,12 @@ "name": "/local/base_join_join_to_idx_lookup_partial_inner_sql_plan/InputJoin2", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key1 (expr)" - ], - "scan_by": [ - "Key2" - ], "columns": [ "Fk3", + "Key1", "Value" - ] + ], + "type": "Lookup" } ] }, @@ -41,14 +36,11 @@ "name": "/local/base_join_join_to_idx_lookup_partial_inner_sql_plan/InputJoin3", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key (expr)" - ], "columns": [ "Key", "Value" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_partial_lefonly.sql-plan_/join_join_to_idx_lookup_partial_lefonly.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_partial_lefonly.sql-plan_/join_join_to_idx_lookup_partial_lefonly.sql.plan index 18d0b3d5e7f..efaed603a97 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_partial_lefonly.sql-plan_/join_join_to_idx_lookup_partial_lefonly.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_partial_lefonly.sql-plan_/join_join_to_idx_lookup_partial_lefonly.sql.plan @@ -1,22 +1,22 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_join_join_to_idx_lookup_partial_lefonly_sql_plan/InputJoin1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], "columns": [ "Fk21", "Key", "Value" - ] + ], + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -24,16 +24,10 @@ "name": "/local/base_join_join_to_idx_lookup_partial_lefonly_sql_plan/InputJoin2", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key1 (expr)" - ], - "scan_by": [ - "Key2" - ], "columns": [ "Key1" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_partial_lefsemi.sql-plan_/join_join_to_idx_lookup_partial_lefsemi.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_partial_lefsemi.sql-plan_/join_join_to_idx_lookup_partial_lefsemi.sql.plan index f68edd7f359..6e63812915b 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_partial_lefsemi.sql-plan_/join_join_to_idx_lookup_partial_lefsemi.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_partial_lefsemi.sql-plan_/join_join_to_idx_lookup_partial_lefsemi.sql.plan @@ -1,22 +1,22 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_join_join_to_idx_lookup_partial_lefsemi_sql_plan/InputJoin1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], "columns": [ "Fk21", "Key", "Value" - ] + ], + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -24,16 +24,10 @@ "name": "/local/base_join_join_to_idx_lookup_partial_lefsemi_sql_plan/InputJoin2", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key1 (expr)" - ], - "scan_by": [ - "Key2" - ], "columns": [ "Key1" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_partial_left.sql-plan_/join_join_to_idx_lookup_partial_left.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_partial_left.sql-plan_/join_join_to_idx_lookup_partial_left.sql.plan index d48b3caafab..a0e042f8f37 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_partial_left.sql-plan_/join_join_to_idx_lookup_partial_left.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_partial_left.sql-plan_/join_join_to_idx_lookup_partial_left.sql.plan @@ -1,21 +1,21 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_join_join_to_idx_lookup_partial_left_sql_plan/InputJoin1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], "columns": [ "Fk21", "Value" - ] + ], + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -23,18 +23,12 @@ "name": "/local/base_join_join_to_idx_lookup_partial_left_sql_plan/InputJoin2", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key1 (expr)" - ], - "scan_by": [ - "Key2" - ], "columns": [ "Fk3", "Key1", "Value" - ] + ], + "type": "Lookup" } ] }, @@ -42,14 +36,11 @@ "name": "/local/base_join_join_to_idx_lookup_partial_left_sql_plan/InputJoin3", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key (expr)" - ], "columns": [ "Key", "Value" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_predicate_left_null.sql-plan_/join_join_to_idx_lookup_predicate_left_null.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_predicate_left_null.sql-plan_/join_join_to_idx_lookup_predicate_left_null.sql.plan index 87e9b0fb9e8..ae67256912b 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_predicate_left_null.sql-plan_/join_join_to_idx_lookup_predicate_left_null.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_predicate_left_null.sql-plan_/join_join_to_idx_lookup_predicate_left_null.sql.plan @@ -1,21 +1,21 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_join_join_to_idx_lookup_predicate_left_null_sql_plan/InputJoin1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], "columns": [ "Fk21", "Value" - ] + ], + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -23,16 +23,11 @@ "name": "/local/base_join_join_to_idx_lookup_predicate_left_null_sql_plan/InputJoin2", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key1 (expr)" - ], - "scan_by": [ - "Key2" - ], "columns": [ + "Key1", "Value" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_predicate_right.sql-plan_/join_join_to_idx_lookup_predicate_right.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_predicate_right.sql-plan_/join_join_to_idx_lookup_predicate_right.sql.plan index c9988cdc6a0..8de4469d03c 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_predicate_right.sql-plan_/join_join_to_idx_lookup_predicate_right.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_predicate_right.sql-plan_/join_join_to_idx_lookup_predicate_right.sql.plan @@ -1,22 +1,22 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_join_join_to_idx_lookup_predicate_right_sql_plan/InputJoin1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], "columns": [ "Fk21", "Fk22", "Value" - ] + ], + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -24,17 +24,13 @@ "name": "/local/base_join_join_to_idx_lookup_predicate_right_sql_plan/InputJoin2", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key1 (expr)", - "Key2 (expr)" - ], "columns": [ "Fk3", "Key1", "Key2", "Value" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_predicate_right_2.sql-plan_/join_join_to_idx_lookup_predicate_right_2.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_predicate_right_2.sql-plan_/join_join_to_idx_lookup_predicate_right_2.sql.plan index f813841dffa..28918880a43 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_predicate_right_2.sql-plan_/join_join_to_idx_lookup_predicate_right_2.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_predicate_right_2.sql-plan_/join_join_to_idx_lookup_predicate_right_2.sql.plan @@ -1,21 +1,21 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_join_join_to_idx_lookup_predicate_right_2_sql_plan/InputJoin1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], "columns": [ "Fk21", "Fk22" - ] + ], + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -23,17 +23,13 @@ "name": "/local/base_join_join_to_idx_lookup_predicate_right_2_sql_plan/InputJoin2", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key1 (expr)", - "Key2 (expr)" - ], "columns": [ "Fk3", "Key1", "Key2", "Value" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_range_left.sql-plan_/join_join_to_idx_lookup_range_left.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_range_left.sql-plan_/join_join_to_idx_lookup_range_left.sql.plan index 7a88e2f2e48..c101dfe9e48 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_range_left.sql-plan_/join_join_to_idx_lookup_range_left.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_range_left.sql-plan_/join_join_to_idx_lookup_range_left.sql.plan @@ -1,22 +1,22 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_join_join_to_idx_lookup_range_left_sql_plan/InputJoin1", "reads": [ { - "type": "Scan", - "scan_by": [ - "Key (\"1\", \"5\"]" - ], "columns": [ "Fk21", "Fk22", "Value" - ] + ], + "scan_by": [ + "Key (1, 5]" + ], + "type": "Scan" } ] }, @@ -24,16 +24,12 @@ "name": "/local/base_join_join_to_idx_lookup_range_left_sql_plan/InputJoin2", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key1 (expr)", - "Key2 (expr)" - ], "columns": [ "Key1", "Key2", "Value" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_right_key_range.sql-plan_/join_join_to_idx_lookup_right_key_range.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_right_key_range.sql-plan_/join_join_to_idx_lookup_right_key_range.sql.plan index 21eb8c89c43..849e8d9dabf 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_right_key_range.sql-plan_/join_join_to_idx_lookup_right_key_range.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_right_key_range.sql-plan_/join_join_to_idx_lookup_right_key_range.sql.plan @@ -1,21 +1,21 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_join_join_to_idx_lookup_right_key_range_sql_plan/InputJoin1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], "columns": [ "Fk22", "Value" - ] + ], + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -23,17 +23,11 @@ "name": "/local/base_join_join_to_idx_lookup_right_key_range_sql_plan/InputJoin2", "reads": [ { - "type": "Lookup", - "lookup_by": [ - "Key1 (\"101\")" - ], - "scan_by": [ - "Key2" - ], "columns": [ "Key2", "Value" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_rightsemi.sql-plan_/join_join_to_idx_lookup_rightsemi.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_rightsemi.sql-plan_/join_join_to_idx_lookup_rightsemi.sql.plan index cafa6374a6b..25e8013b6c9 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_rightsemi.sql-plan_/join_join_to_idx_lookup_rightsemi.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_rightsemi.sql-plan_/join_join_to_idx_lookup_rightsemi.sql.plan @@ -1,21 +1,21 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_join_join_to_idx_lookup_rightsemi_sql_plan/InputJoin1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], "columns": [ "Fk21", "Value" - ] + ], + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -23,42 +23,32 @@ "name": "/local/base_join_join_to_idx_lookup_rightsemi_sql_plan/InputJoin2", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key1", - "Key2" - ], "columns": [ "Key1" - ] - }, - { - "type": "MultiLookup", - "lookup_by": [ - "Key1 (expr)" ], "scan_by": [ - "Key2" + "Key1 (-\u221e, +\u221e)", + "Key2 (-\u221e, +\u221e)" ], + "type": "FullScan" + }, + { "columns": [ "Fk3", "Key1", "Key2", "Value" - ] + ], + "type": "Lookup" }, { - "type": "MultiLookup", - "lookup_by": [ - "Key1 (expr)", - "Key2 (expr)" - ], "columns": [ "Fk3", "Key1", "Key2", "Value" - ] + ], + "type": "Lookup" } ] }, @@ -66,15 +56,15 @@ "name": "/local/base_join_join_to_idx_lookup_rightsemi_sql_plan/InputJoin4", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key1", - "Key2" - ], "columns": [ "Key1", "Key2" - ] + ], + "scan_by": [ + "Key1 (-\u221e, +\u221e)", + "Key2 (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -82,17 +72,13 @@ "name": "/local/base_join_join_to_idx_lookup_rightsemi_sql_plan/InputJoinIndex2", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key1 (expr)", - "Key2 (expr)" - ], "columns": [ "Fk2", "Key1", "Key2", "Value" - ] + ], + "type": "Lookup" } ] }, @@ -100,18 +86,11 @@ "name": "/local/base_join_join_to_idx_lookup_rightsemi_sql_plan/InputJoinIndex2/Index/indexImplTable", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Fk2 (expr)" - ], - "scan_by": [ - "Key1", - "Key2" - ], "columns": [ "Key1", "Key2" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_simple_c.sql-plan_/join_join_to_idx_lookup_simple_c.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_simple_c.sql-plan_/join_join_to_idx_lookup_simple_c.sql.plan index aa8cc68ccfc..7773bbb2e53 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_simple_c.sql-plan_/join_join_to_idx_lookup_simple_c.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_to_idx_lookup_simple_c.sql-plan_/join_join_to_idx_lookup_simple_c.sql.plan @@ -1,22 +1,22 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_join_join_to_idx_lookup_simple_c_sql_plan/InputJoin1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], "columns": [ "Fk21", "Fk22", "Value" - ] + ], + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -24,17 +24,13 @@ "name": "/local/base_join_join_to_idx_lookup_simple_c_sql_plan/InputJoin2", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key1 (expr)", - "Key2 (expr)" - ], "columns": [ "Fk3", "Key1", "Key2", "Value" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_using_index.sql-plan_/join_join_using_index.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_using_index.sql-plan_/join_join_using_index.sql.plan index 66bae99660f..cbf6e8dbe6c 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_using_index.sql-plan_/join_join_using_index.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_using_index.sql-plan_/join_join_using_index.sql.plan @@ -1,22 +1,18 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_join_join_using_index_sql_plan/InputJoin1", "reads": [ { - "type": "Lookup", - "lookup_by": [ - "Key (\"3\")" - ], "columns": [ "Fk21", - "Key", "Value" - ] + ], + "type": "Lookup" } ] }, @@ -24,15 +20,11 @@ "name": "/local/base_join_join_using_index_sql_plan/InputJoinIndex2", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key1 (expr)", - "Key2 (expr)" - ], "columns": [ "Fk2", "Value" - ] + ], + "type": "Lookup" } ] }, @@ -40,18 +32,11 @@ "name": "/local/base_join_join_using_index_sql_plan/InputJoinIndex2/Index/indexImplTable", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Fk2 (expr)" - ], - "scan_by": [ - "Key1", - "Key2" - ], "columns": [ "Key1", "Key2" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_with_agg.sql-plan_/join_join_with_agg.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_with_agg.sql-plan_/join_join_with_agg.sql.plan index b609724d304..801dbcd6785 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_with_agg.sql-plan_/join_join_with_agg.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_join_with_agg.sql-plan_/join_join_with_agg.sql.plan @@ -1,30 +1,27 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_join_join_with_agg_sql_plan/InputJoin1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], "columns": [ "Fk21", "Value" - ] + ], + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" }, { - "type": "MultiLookup", - "lookup_by": [ - "Key (expr)" - ], "columns": [ "Key" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_insert_from_table.sql-plan_/json_insert_from_table.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_insert_from_table.sql-plan_/json_insert_from_table.sql.plan index 63f333fbc5f..c5b4ce448af 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_insert_from_table.sql-plan_/json_insert_from_table.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_insert_from_table.sql-plan_/json_insert_from_table.sql.plan @@ -1,21 +1,21 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_json_insert_from_table_sql_plan/InputJD", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], "columns": [ "Key", "Value" - ] + ], + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -23,21 +23,16 @@ "name": "/local/base_json_insert_from_table_sql_plan/ResultTableJD", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key (expr)" - ] + "type": "Lookup" } ], "writes": [ { - "type": "MultiUpsert", - "key": [ - "Key (expr)" - ], "columns": [ + "Key", "Value" - ] + ], + "type": "MultiUpsert" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_insert_literal.sql-plan_/json_insert_literal.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_insert_literal.sql-plan_/json_insert_literal.sql.plan index ed88fe1b0e1..d3f90215416 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_insert_literal.sql-plan_/json_insert_literal.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_insert_literal.sql-plan_/json_insert_literal.sql.plan @@ -1,28 +1,23 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_json_insert_literal_sql_plan/ResultLiteralJD", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key (expr)" - ] + "type": "Lookup" } ], "writes": [ { - "type": "MultiUpsert", - "key": [ - "Key (expr)" - ], "columns": [ + "Key", "Value" - ] + ], + "type": "MultiUpsert" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_insert_params.sql-plan_/json_insert_params.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_insert_params.sql-plan_/json_insert_params.sql.plan index f187287d05d..ebc1b74f8e1 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_insert_params.sql-plan_/json_insert_params.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_insert_params.sql-plan_/json_insert_params.sql.plan @@ -1,28 +1,23 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_json_insert_params_sql_plan/ResultParamsJD", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key (expr)" - ] + "type": "Lookup" } ], "writes": [ { - "type": "MultiUpsert", - "key": [ - "Key (expr)" - ], "columns": [ + "Key", "Value" - ] + ], + "type": "MultiUpsert" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_json_query.sql-plan_/json_json_query.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_json_query.sql-plan_/json_json_query.sql.plan index a376f78f58c..bedd7457114 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_json_query.sql-plan_/json_json_query.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_json_query.sql-plan_/json_json_query.sql.plan @@ -1,7 +1,7 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [] }
\ No newline at end of file diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_select_from_table.sql-plan_/json_select_from_table.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_select_from_table.sql-plan_/json_select_from_table.sql.plan index 809fa7b2684..e23ebd7505a 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_select_from_table.sql-plan_/json_select_from_table.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_select_from_table.sql-plan_/json_select_from_table.sql.plan @@ -1,22 +1,22 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_json_select_from_table_sql_plan/InputJD", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Key" - ], - "limit": "\"1001\"", "columns": [ "Key", "Value" - ] + ], + "limit": "1001", + "scan_by": [ + "Key (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_select_literal.sql-plan_/json_select_literal.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_select_literal.sql-plan_/json_select_literal.sql.plan index a376f78f58c..bedd7457114 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_select_literal.sql-plan_/json_select_literal.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_select_literal.sql-plan_/json_select_literal.sql.plan @@ -1,7 +1,7 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [] }
\ No newline at end of file diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_select_params.sql-plan_/json_select_params.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_select_params.sql-plan_/json_select_params.sql.plan index a376f78f58c..bedd7457114 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_select_params.sql-plan_/json_select_params.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_json_select_params.sql-plan_/json_select_params.sql.plan @@ -1,7 +1,7 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [] }
\ No newline at end of file diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_order_by_order_by_pk.sql-plan_/order_by_order_by_pk.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_order_by_order_by_pk.sql-plan_/order_by_order_by_pk.sql.plan index b6c14579f20..95ca2c47311 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_order_by_order_by_pk.sql-plan_/order_by_order_by_pk.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_order_by_order_by_pk.sql-plan_/order_by_order_by_pk.sql.plan @@ -1,25 +1,25 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_order_by_order_by_pk_sql_plan/Input1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Group", - "Name" - ], - "limit": "\"3\"", "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "limit": "3", + "scan_by": [ + "Group (-\u221e, +\u221e)", + "Name (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_order_by_order_by_pk_composite.sql-plan_/order_by_order_by_pk_composite.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_order_by_order_by_pk_composite.sql-plan_/order_by_order_by_pk_composite.sql.plan index c92f2f0e696..2e01dd471da 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_order_by_order_by_pk_composite.sql-plan_/order_by_order_by_pk_composite.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_order_by_order_by_pk_composite.sql-plan_/order_by_order_by_pk_composite.sql.plan @@ -1,25 +1,25 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_order_by_order_by_pk_composite_sql_plan/Input1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Group", - "Name" - ], - "limit": "\"5\"", "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "limit": "5", + "scan_by": [ + "Group (-\u221e, +\u221e)", + "Name (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_bool.sql-plan_/pk_predicate_pk_predicate_bool.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_bool.sql-plan_/pk_predicate_pk_predicate_bool.sql.plan index 4115f254327..4513fedff0a 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_bool.sql-plan_/pk_predicate_pk_predicate_bool.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_bool.sql-plan_/pk_predicate_pk_predicate_bool.sql.plan @@ -1,57 +1,49 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_bool_sql_plan/Input4", "reads": [ { - "type": "Lookup", - "lookup_by": [ - "Key1 (\"false\")" - ], - "scan_by": [ - "Key2 (\"false\", +inf]" - ], - "limit": "\"1001\"", "columns": [ "Value" - ] + ], + "type": "Lookup" }, { - "type": "Lookup", - "lookup_by": [ - "Key1 (\"false\")", - "Key2 (\"true\")" - ], "columns": [ "Value" - ] + ], + "type": "Lookup" }, { - "type": "Lookup", + "columns": [ + "Value" + ], + "limit": "1001", "lookup_by": [ - "Key1 (\"true\")" + "Key1 (false)" ], "scan_by": [ - "Key2 [-inf, \"true\")" + "Key2 (false, +\u221e)" ], - "limit": "\"1001\"", - "columns": [ - "Value" - ] + "type": "Lookup" }, { - "type": "Lookup", - "lookup_by": [ - "Key1 (\"true\")", - "Key2 (\"false\")" - ], "columns": [ "Value" - ] + ], + "limit": "1001", + "lookup_by": [ + "Key1 (true)" + ], + "scan_by": [ + "Key2 (-\u221e, true)" + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_composite.sql-plan_/pk_predicate_pk_predicate_composite.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_composite.sql-plan_/pk_predicate_pk_predicate_composite.sql.plan index b687fe31899..bee72432dec 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_composite.sql-plan_/pk_predicate_pk_predicate_composite.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_composite.sql-plan_/pk_predicate_pk_predicate_composite.sql.plan @@ -1,39 +1,39 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_composite_sql_plan/Input1", "reads": [ { - "type": "Scan", - "scan_by": [ - "Group (\"4\", +inf]", - "Name" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] - }, - { - "type": "Lookup", - "lookup_by": [ - "Group (\"4\")" ], "scan_by": [ - "Name (\"Name1\", +inf]" + "Group (4, +\u221e)", + "Name (-\u221e, +\u221e)" ], + "type": "Scan" + }, + { "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "lookup_by": [ + "Group (4)" + ], + "scan_by": [ + "Name (Name1, +\u221e)" + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_dependent.sql-plan_/pk_predicate_pk_predicate_dependent.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_dependent.sql-plan_/pk_predicate_pk_predicate_dependent.sql.plan index 44b3d91b806..20d68d9abb5 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_dependent.sql-plan_/pk_predicate_pk_predicate_dependent.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_dependent.sql-plan_/pk_predicate_pk_predicate_dependent.sql.plan @@ -1,24 +1,20 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_dependent_sql_plan/Input1", "reads": [ { - "type": "Lookup", - "lookup_by": [ - "Group (\"4\")", - "Name (expr)" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "type": "Lookup" } ] }, @@ -26,13 +22,10 @@ "name": "/local/base_pk_predicate_pk_predicate_dependent_sql_plan/Input2", "reads": [ { - "type": "Lookup", - "lookup_by": [ - "Key (\"101\")" - ], "columns": [ "Value2" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_dependent_nopush.sql-plan_/pk_predicate_pk_predicate_dependent_nopush.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_dependent_nopush.sql-plan_/pk_predicate_pk_predicate_dependent_nopush.sql.plan index c55b8e9aa9f..4474f76043e 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_dependent_nopush.sql-plan_/pk_predicate_pk_predicate_dependent_nopush.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_dependent_nopush.sql-plan_/pk_predicate_pk_predicate_dependent_nopush.sql.plan @@ -1,26 +1,26 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_dependent_nopush_sql_plan/Input1", "reads": [ { - "type": "Lookup", - "lookup_by": [ - "Group (\"4\")" - ], - "scan_by": [ - "Name" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "lookup_by": [ + "Group (4)" + ], + "scan_by": [ + "Name (-\u221e, +\u221e)" + ], + "type": "Lookup" } ] }, @@ -28,13 +28,10 @@ "name": "/local/base_pk_predicate_pk_predicate_dependent_nopush_sql_plan/Input2", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Key (\"101\")" - ], "columns": [ "Value2" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_equi_multi.sql-plan_/pk_predicate_pk_predicate_equi_multi.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_equi_multi.sql-plan_/pk_predicate_pk_predicate_equi_multi.sql.plan index daa446967d9..f2c60071eff 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_equi_multi.sql-plan_/pk_predicate_pk_predicate_equi_multi.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_equi_multi.sql-plan_/pk_predicate_pk_predicate_equi_multi.sql.plan @@ -1,37 +1,29 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_equi_multi_sql_plan/Input1", "reads": [ { - "type": "Lookup", - "lookup_by": [ - "Group (\"2\")", - "Name (\"Name1\")" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "type": "Lookup" }, { - "type": "Lookup", - "lookup_by": [ - "Group (\"4\")", - "Name (\"Name4\")" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_equi_multi_rp.sql-plan_/pk_predicate_pk_predicate_equi_multi_rp.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_equi_multi_rp.sql-plan_/pk_predicate_pk_predicate_equi_multi_rp.sql.plan index 66e9736ca52..1e2d9dde886 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_equi_multi_rp.sql-plan_/pk_predicate_pk_predicate_equi_multi_rp.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_equi_multi_rp.sql-plan_/pk_predicate_pk_predicate_equi_multi_rp.sql.plan @@ -1,37 +1,29 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_equi_multi_rp_sql_plan/Input1", "reads": [ { - "type": "Lookup", - "lookup_by": [ - "Group (\"1\")", - "Name (\"Name1\")" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "type": "Lookup" }, { - "type": "Lookup", - "lookup_by": [ - "Group (\"4\")", - "Name (\"Name4\")" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_equi_multi_rp_1.sql-plan_/pk_predicate_pk_predicate_equi_multi_rp_1.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_equi_multi_rp_1.sql-plan_/pk_predicate_pk_predicate_equi_multi_rp_1.sql.plan index a5c74c7653f..3871db22b61 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_equi_multi_rp_1.sql-plan_/pk_predicate_pk_predicate_equi_multi_rp_1.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_equi_multi_rp_1.sql-plan_/pk_predicate_pk_predicate_equi_multi_rp_1.sql.plan @@ -1,50 +1,38 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_equi_multi_rp_1_sql_plan/Input1", "reads": [ { - "type": "Lookup", - "lookup_by": [ - "Group (\"1\")", - "Name (\"Name1\")" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "type": "Lookup" }, { - "type": "Lookup", - "lookup_by": [ - "Group (\"4\")", - "Name (\"Name4\")" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "type": "Lookup" }, { - "type": "Lookup", - "lookup_by": [ - "Group (\"6\")", - "Name (\"Name2\")" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_in.sql-plan_/pk_predicate_pk_predicate_in.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_in.sql-plan_/pk_predicate_pk_predicate_in.sql.plan index d2642a9d04a..254e6f28cbc 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_in.sql-plan_/pk_predicate_pk_predicate_in.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_in.sql-plan_/pk_predicate_pk_predicate_in.sql.plan @@ -1,66 +1,51 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_in_sql_plan/Input2", "reads": [ { - "type": "Lookup", - "lookup_by": [ - "Key (\"1\")" - ], "columns": [ "Key", "Value1", "Value2" - ] + ], + "type": "Lookup" }, { - "type": "Lookup", - "lookup_by": [ - "Key (\"11\")" - ], "columns": [ "Key", "Value1", "Value2" - ] + ], + "type": "Lookup" }, { - "type": "Lookup", - "lookup_by": [ - "Key (\"3\")" - ], "columns": [ "Key", "Value1", "Value2" - ] + ], + "type": "Lookup" }, { - "type": "Lookup", - "lookup_by": [ - "Key (\"7\")" - ], "columns": [ "Key", "Value1", "Value2" - ] + ], + "type": "Lookup" }, { - "type": "Lookup", - "lookup_by": [ - "Key (\"9\")" - ], "columns": [ "Key", "Value1", "Value2" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_in_range.sql-plan_/pk_predicate_pk_predicate_in_range.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_in_range.sql-plan_/pk_predicate_pk_predicate_in_range.sql.plan index 9a69aed19de..705429c3666 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_in_range.sql-plan_/pk_predicate_pk_predicate_in_range.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_in_range.sql-plan_/pk_predicate_pk_predicate_in_range.sql.plan @@ -1,86 +1,86 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_in_range_sql_plan/Input1", "reads": [ { - "type": "Lookup", - "lookup_by": [ - "Group (\"1\")" - ], - "scan_by": [ - "Name" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] - }, - { - "type": "Lookup", + ], "lookup_by": [ - "Group (\"15\")" + "Group (1)" ], "scan_by": [ - "Name" + "Name (-\u221e, +\u221e)" ], + "type": "Lookup" + }, + { "columns": [ "Amount", "Comment", "Group", "Name" - ] - }, - { - "type": "Lookup", + ], "lookup_by": [ - "Group (\"3\")" + "Group (15)" ], "scan_by": [ - "Name" + "Name (-\u221e, +\u221e)" ], + "type": "Lookup" + }, + { "columns": [ "Amount", "Comment", "Group", "Name" - ] - }, - { - "type": "Lookup", + ], "lookup_by": [ - "Group (\"4\")" + "Group (3)" ], "scan_by": [ - "Name" + "Name (-\u221e, +\u221e)" ], + "type": "Lookup" + }, + { "columns": [ "Amount", "Comment", "Group", "Name" - ] - }, - { - "type": "Lookup", + ], "lookup_by": [ - "Group (\"6\")" + "Group (4)" ], "scan_by": [ - "Name" + "Name (-\u221e, +\u221e)" ], + "type": "Lookup" + }, + { "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "lookup_by": [ + "Group (6)" + ], + "scan_by": [ + "Name (-\u221e, +\u221e)" + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_in_rp.sql-plan_/pk_predicate_pk_predicate_in_rp.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_in_rp.sql-plan_/pk_predicate_pk_predicate_in_rp.sql.plan index c485d89174b..4458f0d81c6 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_in_rp.sql-plan_/pk_predicate_pk_predicate_in_rp.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_in_rp.sql-plan_/pk_predicate_pk_predicate_in_rp.sql.plan @@ -1,44 +1,35 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_in_rp_sql_plan/Input2", "reads": [ { - "type": "Lookup", - "lookup_by": [ - "Key (\"1\")" - ], "columns": [ "Key", "Value1", "Value2" - ] + ], + "type": "Lookup" }, { - "type": "Lookup", - "lookup_by": [ - "Key (\"3\")" - ], "columns": [ "Key", "Value1", "Value2" - ] + ], + "type": "Lookup" }, { - "type": "Lookup", - "lookup_by": [ - "Key (\"5\")" - ], "columns": [ "Key", "Value1", "Value2" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_null.sql-plan_/pk_predicate_pk_predicate_null.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_null.sql-plan_/pk_predicate_pk_predicate_null.sql.plan index 80d723a420d..c37cc68559d 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_null.sql-plan_/pk_predicate_pk_predicate_null.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_null.sql-plan_/pk_predicate_pk_predicate_null.sql.plan @@ -1,27 +1,27 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_null_sql_plan/Input1", "reads": [ { - "type": "Lookup", - "lookup_by": [ - "Group (expr)" - ], - "scan_by": [ - "Name [-inf, \"Name2\")" - ], - "limit": "\"1001\"", "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "limit": "1001", + "lookup_by": [ + "Group (0)" + ], + "scan_by": [ + "Name (-\u221e, Name2)" + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_null_1.sql-plan_/pk_predicate_pk_predicate_null_1.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_null_1.sql-plan_/pk_predicate_pk_predicate_null_1.sql.plan index a892412c708..71195cbc109 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_null_1.sql-plan_/pk_predicate_pk_predicate_null_1.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_null_1.sql-plan_/pk_predicate_pk_predicate_null_1.sql.plan @@ -1,24 +1,20 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_null_1_sql_plan/Input1", "reads": [ { - "type": "Lookup", - "lookup_by": [ - "Group (\"1\")", - "Name (expr)" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_point.sql-plan_/pk_predicate_pk_predicate_point.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_point.sql-plan_/pk_predicate_pk_predicate_point.sql.plan index b2bb29d2261..c44fd05983c 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_point.sql-plan_/pk_predicate_pk_predicate_point.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_point.sql-plan_/pk_predicate_pk_predicate_point.sql.plan @@ -1,27 +1,27 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_point_sql_plan/Input1", "reads": [ { - "type": "Lookup", - "lookup_by": [ - "Group (\"1\")" - ], - "scan_by": [ - "Name" - ], - "limit": "\"1001\"", "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "limit": "1001", + "lookup_by": [ + "Group (1)" + ], + "scan_by": [ + "Name (-\u221e, +\u221e)" + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_point_range_rp.sql-plan_/pk_predicate_pk_predicate_point_range_rp.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_point_range_rp.sql-plan_/pk_predicate_pk_predicate_point_range_rp.sql.plan index 12ecd5dc75e..a5fcb81ad87 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_point_range_rp.sql-plan_/pk_predicate_pk_predicate_point_range_rp.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_point_range_rp.sql-plan_/pk_predicate_pk_predicate_point_range_rp.sql.plan @@ -1,26 +1,26 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_point_range_rp_sql_plan/Input1", "reads": [ { - "type": "Lookup", - "lookup_by": [ - "Group (\"1\")" - ], - "scan_by": [ - "Name [\"Name1\", \"Name3\")" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "lookup_by": [ + "Group (1)" + ], + "scan_by": [ + "Name [Name1, Name3)" + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_range.sql-plan_/pk_predicate_pk_predicate_range.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_range.sql-plan_/pk_predicate_pk_predicate_range.sql.plan index 48e292ae3bf..1650bb87fba 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_range.sql-plan_/pk_predicate_pk_predicate_range.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_range.sql-plan_/pk_predicate_pk_predicate_range.sql.plan @@ -1,25 +1,25 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_range_sql_plan/Input1", "reads": [ { - "type": "Scan", - "scan_by": [ - "Group (\"3\", \"2\"]", - "Name" - ], - "limit": "\"1001\"", "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "limit": "1001", + "scan_by": [ + "Group (3, 2]", + "Name (-\u221e, +\u221e)" + ], + "type": "Scan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_range_nonkey_rp.sql-plan_/pk_predicate_pk_predicate_range_nonkey_rp.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_range_nonkey_rp.sql-plan_/pk_predicate_pk_predicate_range_nonkey_rp.sql.plan index 36ffbc0d2db..ec483d113b7 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_range_nonkey_rp.sql-plan_/pk_predicate_pk_predicate_range_nonkey_rp.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_range_nonkey_rp.sql-plan_/pk_predicate_pk_predicate_range_nonkey_rp.sql.plan @@ -1,24 +1,24 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_range_nonkey_rp_sql_plan/Input1", "reads": [ { - "type": "Scan", - "scan_by": [ - "Group [-inf, \"4\")", - "Name" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "scan_by": [ + "Group (-\u221e, 4)", + "Name (-\u221e, +\u221e)" + ], + "type": "Scan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_range_rp.sql-plan_/pk_predicate_pk_predicate_range_rp.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_range_rp.sql-plan_/pk_predicate_pk_predicate_range_rp.sql.plan index fd54d39d8b1..28a9e34d6d2 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_range_rp.sql-plan_/pk_predicate_pk_predicate_range_rp.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_range_rp.sql-plan_/pk_predicate_pk_predicate_range_rp.sql.plan @@ -1,24 +1,24 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_range_rp_sql_plan/Input1", "reads": [ { - "type": "Scan", - "scan_by": [ - "Group [\"3\", \"6\")", - "Name" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "scan_by": [ + "Group [3, 6)", + "Name (-\u221e, +\u221e)" + ], + "type": "Scan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_range_rp_1.sql-plan_/pk_predicate_pk_predicate_range_rp_1.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_range_rp_1.sql-plan_/pk_predicate_pk_predicate_range_rp_1.sql.plan index 837c5563a62..c925568ee43 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_range_rp_1.sql-plan_/pk_predicate_pk_predicate_range_rp_1.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_range_rp_1.sql-plan_/pk_predicate_pk_predicate_range_rp_1.sql.plan @@ -1,24 +1,24 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_range_rp_1_sql_plan/Input1", "reads": [ { - "type": "Scan", - "scan_by": [ - "Group [\"100001\", +inf]", - "Name" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "scan_by": [ + "Group [100001, +\u221e)", + "Name (-\u221e, +\u221e)" + ], + "type": "Scan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_range_single_rp.sql-plan_/pk_predicate_pk_predicate_range_single_rp.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_range_single_rp.sql-plan_/pk_predicate_pk_predicate_range_single_rp.sql.plan index 4b878422166..e73c7f5e894 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_range_single_rp.sql-plan_/pk_predicate_pk_predicate_range_single_rp.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_range_single_rp.sql-plan_/pk_predicate_pk_predicate_range_single_rp.sql.plan @@ -1,24 +1,24 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_range_single_rp_sql_plan/Input1", "reads": [ { - "type": "Scan", - "scan_by": [ - "Group (\"1\", \"4\"]", - "Name" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "scan_by": [ + "Group (1, 4]", + "Name (-\u221e, +\u221e)" + ], + "type": "Scan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_ranges_1.sql-plan_/pk_predicate_pk_predicate_ranges_1.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_ranges_1.sql-plan_/pk_predicate_pk_predicate_ranges_1.sql.plan index 4699eca39a8..ee6f80bde9a 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_ranges_1.sql-plan_/pk_predicate_pk_predicate_ranges_1.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_ranges_1.sql-plan_/pk_predicate_pk_predicate_ranges_1.sql.plan @@ -1,56 +1,56 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_ranges_1_sql_plan/Input1", "reads": [ { - "type": "Lookup", - "lookup_by": [ - "Group (\"10\")" - ], - "scan_by": [ - "Name [\"Name1\", \"Name3\")" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] - }, - { - "type": "Lookup", + ], "lookup_by": [ - "Group (\"10\")" + "Group (10)" ], "scan_by": [ - "Name [\"Name3\", \"Name5\"]" + "Name [Name1, Name3)" ], + "type": "Lookup" + }, + { "columns": [ "Amount", "Comment", "Group", "Name" - ] - }, - { - "type": "Lookup", + ], "lookup_by": [ - "Group (\"2\")" + "Group (10)" ], "scan_by": [ - "Name" + "Name [Name3, Name5]" ], + "type": "Lookup" + }, + { "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "lookup_by": [ + "Group (2)" + ], + "scan_by": [ + "Name (-\u221e, +\u221e)" + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_ranges_int.sql-plan_/pk_predicate_pk_predicate_ranges_int.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_ranges_int.sql-plan_/pk_predicate_pk_predicate_ranges_int.sql.plan index d981a290af5..fd8ebb8af46 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_ranges_int.sql-plan_/pk_predicate_pk_predicate_ranges_int.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_ranges_int.sql-plan_/pk_predicate_pk_predicate_ranges_int.sql.plan @@ -1,24 +1,24 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_ranges_int_sql_plan/Input1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Group", - "Name" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "scan_by": [ + "Group (-\u221e, +\u221e)", + "Name (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_ranges_int_1.sql-plan_/pk_predicate_pk_predicate_ranges_int_1.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_ranges_int_1.sql-plan_/pk_predicate_pk_predicate_ranges_int_1.sql.plan index b7af2b88a66..aa7d16ec023 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_ranges_int_1.sql-plan_/pk_predicate_pk_predicate_ranges_int_1.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_ranges_int_1.sql-plan_/pk_predicate_pk_predicate_ranges_int_1.sql.plan @@ -1,24 +1,24 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_ranges_int_1_sql_plan/Input1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Group", - "Name" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "scan_by": [ + "Group (-\u221e, +\u221e)", + "Name (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_ranges_rp.sql-plan_/pk_predicate_pk_predicate_ranges_rp.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_ranges_rp.sql-plan_/pk_predicate_pk_predicate_ranges_rp.sql.plan index 1292a3df124..3032cfd2a95 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_ranges_rp.sql-plan_/pk_predicate_pk_predicate_ranges_rp.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_ranges_rp.sql-plan_/pk_predicate_pk_predicate_ranges_rp.sql.plan @@ -1,37 +1,37 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_ranges_rp_sql_plan/Input1", "reads": [ { - "type": "Scan", - "scan_by": [ - "Group (\"1\", \"3\"]", - "Name" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] - }, - { - "type": "Scan", + ], "scan_by": [ - "Group [\"4\", \"10\")", - "Name" + "Group (1, 3]", + "Name (-\u221e, +\u221e)" ], + "type": "Scan" + }, + { "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "scan_by": [ + "Group [4, 10)", + "Name (-\u221e, +\u221e)" + ], + "type": "Scan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_ranges_rp_1.sql-plan_/pk_predicate_pk_predicate_ranges_rp_1.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_ranges_rp_1.sql-plan_/pk_predicate_pk_predicate_ranges_rp_1.sql.plan index e32c1531afb..9a3a2901d79 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_ranges_rp_1.sql-plan_/pk_predicate_pk_predicate_ranges_rp_1.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_ranges_rp_1.sql-plan_/pk_predicate_pk_predicate_ranges_rp_1.sql.plan @@ -1,50 +1,42 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_ranges_rp_1_sql_plan/Input1", "reads": [ { - "type": "Scan", - "scan_by": [ - "Group [\"3\", \"5\")", - "Name" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "scan_by": [ + "Group [3, 5)", + "Name (-\u221e, +\u221e)" + ], + "type": "Scan" }, { - "type": "Lookup", - "lookup_by": [ - "Group (\"10\")", - "Name (\"Name5\")" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "type": "Lookup" }, { - "type": "Lookup", - "lookup_by": [ - "Group (\"6\")", - "Name (\"Name1\")" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_reverse.sql-plan_/pk_predicate_pk_predicate_reverse.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_reverse.sql-plan_/pk_predicate_pk_predicate_reverse.sql.plan index 2872108b7a5..b9386a17e3b 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_reverse.sql-plan_/pk_predicate_pk_predicate_reverse.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_reverse.sql-plan_/pk_predicate_pk_predicate_reverse.sql.plan @@ -1,25 +1,25 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_reverse_sql_plan/Input1", "reads": [ { - "type": "Scan", - "scan_by": [ - "Group (\"1\", \"3\"]", - "Name" - ], - "limit": "\"1001\"", "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "limit": "1001", + "scan_by": [ + "Group (1, 3]", + "Name (-\u221e, +\u221e)" + ], + "type": "Scan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_reverse_1.sql-plan_/pk_predicate_pk_predicate_reverse_1.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_reverse_1.sql-plan_/pk_predicate_pk_predicate_reverse_1.sql.plan index 7d0986a7589..0b94c6609e1 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_reverse_1.sql-plan_/pk_predicate_pk_predicate_reverse_1.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_reverse_1.sql-plan_/pk_predicate_pk_predicate_reverse_1.sql.plan @@ -1,27 +1,27 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_reverse_1_sql_plan/Input1", "reads": [ { - "type": "Lookup", - "lookup_by": [ - "Group (\"10\")" - ], - "scan_by": [ - "Name [\"Name2\", \"Name4\")" - ], - "limit": "\"1001\"", "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "limit": "1001", + "lookup_by": [ + "Group (10)" + ], + "scan_by": [ + "Name [Name2, Name4)" + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_subquery.sql-plan_/pk_predicate_pk_predicate_subquery.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_subquery.sql-plan_/pk_predicate_pk_predicate_subquery.sql.plan index 6c7041acb12..f21c212c2a0 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_subquery.sql-plan_/pk_predicate_pk_predicate_subquery.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_subquery.sql-plan_/pk_predicate_pk_predicate_subquery.sql.plan @@ -1,26 +1,26 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_subquery_sql_plan/Input1", "reads": [ { - "type": "Lookup", - "lookup_by": [ - "Group (expr)" - ], - "scan_by": [ - "Name" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "lookup_by": [ + "Group (n/a)" + ], + "scan_by": [ + "Name (-\u221e, +\u221e)" + ], + "type": "Lookup" } ] }, @@ -28,15 +28,15 @@ "name": "/local/base_pk_predicate_pk_predicate_subquery_sql_plan/Input3", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Name", - "Type" - ], "columns": [ "Type", "Value" - ] + ], + "scan_by": [ + "Name (-\u221e, +\u221e)", + "Type (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_utf8.sql-plan_/pk_predicate_pk_predicate_utf8.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_utf8.sql-plan_/pk_predicate_pk_predicate_utf8.sql.plan index f2203c434ef..e7c35b5cf20 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_utf8.sql-plan_/pk_predicate_pk_predicate_utf8.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pk_predicate_pk_predicate_utf8.sql-plan_/pk_predicate_pk_predicate_utf8.sql.plan @@ -1,39 +1,39 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_pk_predicate_pk_predicate_utf8_sql_plan/Input3", "reads": [ { - "type": "Lookup", - "lookup_by": [ - "Name (\"Anna\")" - ], - "scan_by": [ - "Type" - ], "columns": [ "Name", "Type", "Value" - ] - }, - { - "type": "Lookup", + ], "lookup_by": [ - "Name (\"Dmitry\")" + "Name (Anna)" ], "scan_by": [ - "Type" + "Type (-\u221e, +\u221e)" ], + "type": "Lookup" + }, + { "columns": [ "Name", "Type", "Value" - ] + ], + "lookup_by": [ + "Name (Dmitry)" + ], + "scan_by": [ + "Type (-\u221e, +\u221e)" + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_1.sql-plan_/pure_trivial_1.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_1.sql-plan_/pure_trivial_1.sql.plan index a376f78f58c..bedd7457114 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_1.sql-plan_/pure_trivial_1.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_1.sql-plan_/pure_trivial_1.sql.plan @@ -1,7 +1,7 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [] }
\ No newline at end of file diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_10.sql-plan_/pure_trivial_10.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_10.sql-plan_/pure_trivial_10.sql.plan index a376f78f58c..bedd7457114 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_10.sql-plan_/pure_trivial_10.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_10.sql-plan_/pure_trivial_10.sql.plan @@ -1,7 +1,7 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [] }
\ No newline at end of file diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_11.sql-plan_/pure_trivial_11.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_11.sql-plan_/pure_trivial_11.sql.plan index a376f78f58c..bedd7457114 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_11.sql-plan_/pure_trivial_11.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_11.sql-plan_/pure_trivial_11.sql.plan @@ -1,7 +1,7 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [] }
\ No newline at end of file diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_12.sql-plan_/pure_trivial_12.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_12.sql-plan_/pure_trivial_12.sql.plan index a376f78f58c..bedd7457114 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_12.sql-plan_/pure_trivial_12.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_12.sql-plan_/pure_trivial_12.sql.plan @@ -1,7 +1,7 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [] }
\ No newline at end of file diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_13.sql-plan_/pure_trivial_13.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_13.sql-plan_/pure_trivial_13.sql.plan index a376f78f58c..bedd7457114 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_13.sql-plan_/pure_trivial_13.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_13.sql-plan_/pure_trivial_13.sql.plan @@ -1,7 +1,7 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [] }
\ No newline at end of file diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_2.sql-plan_/pure_trivial_2.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_2.sql-plan_/pure_trivial_2.sql.plan index a376f78f58c..bedd7457114 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_2.sql-plan_/pure_trivial_2.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_2.sql-plan_/pure_trivial_2.sql.plan @@ -1,7 +1,7 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [] }
\ No newline at end of file diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_3.sql-plan_/pure_trivial_3.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_3.sql-plan_/pure_trivial_3.sql.plan index a376f78f58c..bedd7457114 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_3.sql-plan_/pure_trivial_3.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_3.sql-plan_/pure_trivial_3.sql.plan @@ -1,7 +1,7 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [] }
\ No newline at end of file diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_4.sql-plan_/pure_trivial_4.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_4.sql-plan_/pure_trivial_4.sql.plan index a376f78f58c..bedd7457114 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_4.sql-plan_/pure_trivial_4.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_4.sql-plan_/pure_trivial_4.sql.plan @@ -1,7 +1,7 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [] }
\ No newline at end of file diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_5.sql-plan_/pure_trivial_5.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_5.sql-plan_/pure_trivial_5.sql.plan index a376f78f58c..bedd7457114 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_5.sql-plan_/pure_trivial_5.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_5.sql-plan_/pure_trivial_5.sql.plan @@ -1,7 +1,7 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [] }
\ No newline at end of file diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_6.sql-plan_/pure_trivial_6.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_6.sql-plan_/pure_trivial_6.sql.plan index a376f78f58c..bedd7457114 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_6.sql-plan_/pure_trivial_6.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_6.sql-plan_/pure_trivial_6.sql.plan @@ -1,7 +1,7 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [] }
\ No newline at end of file diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_7.sql-plan_/pure_trivial_7.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_7.sql-plan_/pure_trivial_7.sql.plan index a376f78f58c..bedd7457114 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_7.sql-plan_/pure_trivial_7.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_7.sql-plan_/pure_trivial_7.sql.plan @@ -1,7 +1,7 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [] }
\ No newline at end of file diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_8.sql-plan_/pure_trivial_8.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_8.sql-plan_/pure_trivial_8.sql.plan index a376f78f58c..bedd7457114 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_8.sql-plan_/pure_trivial_8.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_8.sql-plan_/pure_trivial_8.sql.plan @@ -1,7 +1,7 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [] }
\ No newline at end of file diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_9.sql-plan_/pure_trivial_9.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_9.sql-plan_/pure_trivial_9.sql.plan index a376f78f58c..bedd7457114 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_9.sql-plan_/pure_trivial_9.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_pure_trivial_9.sql-plan_/pure_trivial_9.sql.plan @@ -1,7 +1,7 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [] }
\ No newline at end of file diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_range_skip_take.sql-plan_/range_skip_take.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_range_skip_take.sql-plan_/range_skip_take.sql.plan index 059b030bb1a..69e68c39b0b 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_range_skip_take.sql-plan_/range_skip_take.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_range_skip_take.sql-plan_/range_skip_take.sql.plan @@ -1,25 +1,25 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_range_skip_take_sql_plan/Input1", "reads": [ { - "type": "Scan", - "scan_by": [ - "Group [\"5\", \"10\"]", - "Name" - ], - "limit": "\"7\"", "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "limit": "7", + "scan_by": [ + "Group [5, 10]", + "Name (-\u221e, +\u221e)" + ], + "type": "Scan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_select_result_limit.sql-plan_/select_result_limit.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_select_result_limit.sql-plan_/select_result_limit.sql.plan index d413a47585b..2379c1eebd5 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_select_result_limit.sql-plan_/select_result_limit.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_select_result_limit.sql-plan_/select_result_limit.sql.plan @@ -1,47 +1,23 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_select_result_limit_sql_plan/Input", "reads": [ { - "type": "FullScan", - "scan_by": [ - "key", - "subkey" - ], "columns": [ "key", + "subkey", "value" - ] - }, - { - "type": "FullScan", - "scan_by": [ - "key", - "subkey" ], - "limit": "\"1001\"", - "columns": [ - "key", - "subkey" - ] - }, - { - "type": "FullScan", "scan_by": [ - "key", - "subkey" + "key (-\u221e, +\u221e)", + "subkey (-\u221e, +\u221e)" ], - "limit": "\"1001\"", - "columns": [ - "key", - "subkey", - "value" - ] + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_empty_select.sql-plan_/simple_empty_select.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_empty_select.sql-plan_/simple_empty_select.sql.plan index a376f78f58c..bedd7457114 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_empty_select.sql-plan_/simple_empty_select.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_empty_select.sql-plan_/simple_empty_select.sql.plan @@ -1,7 +1,7 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [] }
\ No newline at end of file diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_multi_select.sql-plan_/simple_multi_select.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_multi_select.sql-plan_/simple_multi_select.sql.plan index c724f8f51e2..f3560b3d2d7 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_multi_select.sql-plan_/simple_multi_select.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_multi_select.sql-plan_/simple_multi_select.sql.plan @@ -1,24 +1,24 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_simple_multi_select_sql_plan/Input", "reads": [ { - "type": "FullScan", - "scan_by": [ - "key", - "subkey" - ], - "limit": "\"2\"", "columns": [ "key", "subkey", "value" - ] + ], + "limit": "2", + "scan_by": [ + "key (-\u221e, +\u221e)", + "subkey (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -26,18 +26,18 @@ "name": "/local/base_simple_multi_select_sql_plan/Input1", "reads": [ { - "type": "Lookup", - "lookup_by": [ - "Group (\"1\")" - ], - "scan_by": [ - "Name" - ], "columns": [ "Amount", "Group", "Name" - ] + ], + "lookup_by": [ + "Group (1)" + ], + "scan_by": [ + "Name (-\u221e, +\u221e)" + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q1.sql-plan_/simple_q1.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q1.sql-plan_/simple_q1.sql.plan index b9f3b9a509f..3a37090d87f 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q1.sql-plan_/simple_q1.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q1.sql-plan_/simple_q1.sql.plan @@ -1,21 +1,21 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_simple_q1_sql_plan/t1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "rowid" - ], "columns": [ "a", "b" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q10.sql-plan_/simple_q10.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q10.sql-plan_/simple_q10.sql.plan index 01c84f3af4b..9661cb545ac 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q10.sql-plan_/simple_q10.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q10.sql-plan_/simple_q10.sql.plan @@ -1,21 +1,31 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_simple_q10_sql_plan/t1", "reads": [ { - "type": "FullScan", + "columns": [ + "a", + "b" + ], "scan_by": [ - "rowid" + "rowid (-\u221e, +\u221e)" ], + "type": "FullScan" + }, + { "columns": [ "a", "b" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q11.sql-plan_/simple_q11.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q11.sql-plan_/simple_q11.sql.plan index 6a3b28c2e3f..db1f4599c8c 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q11.sql-plan_/simple_q11.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q11.sql-plan_/simple_q11.sql.plan @@ -1,21 +1,31 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_simple_q11_sql_plan/t1", "reads": [ { - "type": "FullScan", + "columns": [ + "a", + "b" + ], "scan_by": [ - "rowid" + "rowid (-\u221e, +\u221e)" ], + "type": "FullScan" + }, + { "columns": [ "a", "b" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q12.sql-plan_/simple_q12.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q12.sql-plan_/simple_q12.sql.plan index a0c12b8c497..2a8e3050a5d 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q12.sql-plan_/simple_q12.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q12.sql-plan_/simple_q12.sql.plan @@ -1,22 +1,22 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_simple_q12_sql_plan/t1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "rowid" - ], "columns": [ "a", "b", "rowid" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q13.sql-plan_/simple_q13.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q13.sql-plan_/simple_q13.sql.plan index f2798712f6c..7c9efecf4f6 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q13.sql-plan_/simple_q13.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q13.sql-plan_/simple_q13.sql.plan @@ -1,23 +1,23 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_simple_q13_sql_plan/t1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "rowid" - ], - "limit": "\"15\"", "columns": [ "a", "b", "rowid" - ] + ], + "limit": "15", + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q14.sql-plan_/simple_q14.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q14.sql-plan_/simple_q14.sql.plan index 91d170049dd..1fa838d86a0 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q14.sql-plan_/simple_q14.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q14.sql-plan_/simple_q14.sql.plan @@ -1,23 +1,23 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_simple_q14_sql_plan/t1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "rowid" - ], - "limit": "\"15\"", "columns": [ "a", "b", "rowid" - ] + ], + "limit": "15", + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q15.sql-plan_/simple_q15.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q15.sql-plan_/simple_q15.sql.plan index 122ffb9d23d..94f290bea9c 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q15.sql-plan_/simple_q15.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q15.sql-plan_/simple_q15.sql.plan @@ -1,21 +1,21 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_simple_q15_sql_plan/t3", "reads": [ { - "type": "FullScan", - "scan_by": [ - "rowid" - ], "columns": [ "a", "c" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -23,14 +23,14 @@ "name": "/local/base_simple_q15_sql_plan/t4", "reads": [ { - "type": "FullScan", - "scan_by": [ - "rowid" - ], "columns": [ "a", "c" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q16.sql-plan_/simple_q16.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q16.sql-plan_/simple_q16.sql.plan index 3a0ac65a374..580e54a49b9 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q16.sql-plan_/simple_q16.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q16.sql-plan_/simple_q16.sql.plan @@ -1,21 +1,21 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_simple_q16_sql_plan/t1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "rowid" - ], "columns": [ "a", "b" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -23,14 +23,14 @@ "name": "/local/base_simple_q16_sql_plan/t2", "reads": [ { - "type": "FullScan", - "scan_by": [ - "rowid" - ], "columns": [ "a", "b" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q17.sql-plan_/simple_q17.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q17.sql-plan_/simple_q17.sql.plan index a97926996d3..73ae04dfca0 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q17.sql-plan_/simple_q17.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q17.sql-plan_/simple_q17.sql.plan @@ -1,20 +1,29 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_simple_q17_sql_plan/t1", "reads": [ { - "type": "FullScan", + "columns": [ + "a" + ], "scan_by": [ - "rowid" + "rowid (-\u221e, +\u221e)" ], + "type": "FullScan" + }, + { "columns": [ "a" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -22,14 +31,14 @@ "name": "/local/base_simple_q17_sql_plan/t2", "reads": [ { - "type": "FullScan", - "scan_by": [ - "rowid" - ], "columns": [ "a", "b" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q18.sql-plan_/simple_q18.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q18.sql-plan_/simple_q18.sql.plan index a9c09177e31..a21e203bab4 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q18.sql-plan_/simple_q18.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q18.sql-plan_/simple_q18.sql.plan @@ -1,30 +1,31 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_simple_q18_sql_plan/t1", "reads": [ { - "type": "FullScan", + "columns": [ + "a", + "b" + ], "scan_by": [ - "rowid" + "rowid (-\u221e, +\u221e)" ], - "columns": [ - "a" - ] + "type": "FullScan" }, { - "type": "FullScan", - "scan_by": [ - "rowid" - ], "columns": [ "a", "b" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -32,13 +33,13 @@ "name": "/local/base_simple_q18_sql_plan/t3", "reads": [ { - "type": "FullScan", - "scan_by": [ - "rowid" - ], "columns": [ "a" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q19.sql-plan_/simple_q19.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q19.sql-plan_/simple_q19.sql.plan index 04ad1393a7f..bfe3ef2cc34 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q19.sql-plan_/simple_q19.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q19.sql-plan_/simple_q19.sql.plan @@ -1,20 +1,29 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_simple_q19_sql_plan/t1", "reads": [ { - "type": "FullScan", + "columns": [ + "a" + ], "scan_by": [ - "rowid" + "rowid (-\u221e, +\u221e)" ], + "type": "FullScan" + }, + { "columns": [ "a" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -22,14 +31,14 @@ "name": "/local/base_simple_q19_sql_plan/t2", "reads": [ { - "type": "FullScan", - "scan_by": [ - "rowid" - ], "columns": [ "a", "b" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q2.sql-plan_/simple_q2.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q2.sql-plan_/simple_q2.sql.plan index bd779e9d237..4791fb6ce2b 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q2.sql-plan_/simple_q2.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q2.sql-plan_/simple_q2.sql.plan @@ -1,20 +1,20 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_simple_q2_sql_plan/t1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "rowid" - ], "columns": [ "a" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q20.sql-plan_/simple_q20.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q20.sql-plan_/simple_q20.sql.plan index f002b0c3542..f6c0c10229f 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q20.sql-plan_/simple_q20.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q20.sql-plan_/simple_q20.sql.plan @@ -1,21 +1,31 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_simple_q20_sql_plan/t1", "reads": [ { - "type": "FullScan", + "columns": [ + "a", + "b" + ], "scan_by": [ - "rowid" + "rowid (-\u221e, +\u221e)" ], + "type": "FullScan" + }, + { "columns": [ "a", "b" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q21.sql-plan_/simple_q21.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q21.sql-plan_/simple_q21.sql.plan index f9ed4084e86..4c23a10a134 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q21.sql-plan_/simple_q21.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q21.sql-plan_/simple_q21.sql.plan @@ -1,21 +1,21 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_simple_q21_sql_plan/t1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "rowid" - ], "columns": [ "a", "b" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -23,14 +23,14 @@ "name": "/local/base_simple_q21_sql_plan/t2", "reads": [ { - "type": "FullScan", - "scan_by": [ - "rowid" - ], "columns": [ "a", "b" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q22.sql-plan_/simple_q22.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q22.sql-plan_/simple_q22.sql.plan index 3e29f39af76..052f0a3acaa 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q22.sql-plan_/simple_q22.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q22.sql-plan_/simple_q22.sql.plan @@ -1,21 +1,21 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_simple_q22_sql_plan/t1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "rowid" - ], "columns": [ "a", "b" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -23,14 +23,14 @@ "name": "/local/base_simple_q22_sql_plan/t3", "reads": [ { - "type": "FullScan", - "scan_by": [ - "rowid" - ], "columns": [ "a", "c" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q3.sql-plan_/simple_q3.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q3.sql-plan_/simple_q3.sql.plan index 5ad1c9e34a6..1516c4912ba 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q3.sql-plan_/simple_q3.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q3.sql-plan_/simple_q3.sql.plan @@ -1,20 +1,20 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_simple_q3_sql_plan/t1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "rowid" - ], "columns": [ "b" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q4.sql-plan_/simple_q4.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q4.sql-plan_/simple_q4.sql.plan index 980db1774d9..b61ad57b924 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q4.sql-plan_/simple_q4.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q4.sql-plan_/simple_q4.sql.plan @@ -1,21 +1,21 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_simple_q4_sql_plan/t1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "rowid" - ], "columns": [ "a", "b" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q5.sql-plan_/simple_q5.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q5.sql-plan_/simple_q5.sql.plan index 2fd27fed93f..afd81b6c816 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q5.sql-plan_/simple_q5.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q5.sql-plan_/simple_q5.sql.plan @@ -1,21 +1,21 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_simple_q5_sql_plan/t1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "rowid" - ], "columns": [ "a", "b" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q6.sql-plan_/simple_q6.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q6.sql-plan_/simple_q6.sql.plan index 42b25b3f2eb..96103cb9420 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q6.sql-plan_/simple_q6.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q6.sql-plan_/simple_q6.sql.plan @@ -1,21 +1,21 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_simple_q6_sql_plan/t1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "rowid" - ], "columns": [ "a", "b" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q7.sql-plan_/simple_q7.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q7.sql-plan_/simple_q7.sql.plan index ac079077e0c..5fefa198563 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q7.sql-plan_/simple_q7.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q7.sql-plan_/simple_q7.sql.plan @@ -1,21 +1,21 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_simple_q7_sql_plan/t1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "rowid" - ], "columns": [ "a", "b" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q8.sql-plan_/simple_q8.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q8.sql-plan_/simple_q8.sql.plan index 7bba18b2848..a973823dacd 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q8.sql-plan_/simple_q8.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q8.sql-plan_/simple_q8.sql.plan @@ -1,21 +1,21 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_simple_q8_sql_plan/t1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "rowid" - ], "columns": [ "a", "b" - ] + ], + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q9.sql-plan_/simple_q9.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q9.sql-plan_/simple_q9.sql.plan index 7e0e9490e23..92c5bac59c1 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q9.sql-plan_/simple_q9.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_simple_q9.sql-plan_/simple_q9.sql.plan @@ -1,21 +1,21 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_simple_q9_sql_plan/t1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "rowid" - ], - "limit": "\"1001\"", "columns": [ "rowid" - ] + ], + "limit": "1001", + "scan_by": [ + "rowid (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_topsort_topsort.sql-plan_/topsort_topsort.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_topsort_topsort.sql-plan_/topsort_topsort.sql.plan index 4f7c49e68e5..ae32ec38bbb 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_topsort_topsort.sql-plan_/topsort_topsort.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_topsort_topsort.sql-plan_/topsort_topsort.sql.plan @@ -1,24 +1,24 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_topsort_topsort_sql_plan/Input1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Group", - "Name" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "scan_by": [ + "Group (-\u221e, +\u221e)", + "Name (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_topsort_topsort_multi_range.sql-plan_/topsort_topsort_multi_range.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_topsort_topsort_multi_range.sql-plan_/topsort_topsort_multi_range.sql.plan index 4b5ee476efc..84a8f7b6c13 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_topsort_topsort_multi_range.sql-plan_/topsort_topsort_multi_range.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_topsort_topsort_multi_range.sql-plan_/topsort_topsort_multi_range.sql.plan @@ -1,39 +1,39 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_topsort_topsort_multi_range_sql_plan/Input1", "reads": [ { - "type": "Scan", - "scan_by": [ - "Group (\"10\", +inf]", - "Name" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] - }, - { - "type": "Lookup", - "lookup_by": [ - "Group (\"10\")" ], "scan_by": [ - "Name [\"Name3\", +inf]" + "Group (10, +\u221e)", + "Name (-\u221e, +\u221e)" ], + "type": "Scan" + }, + { "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "lookup_by": [ + "Group (10)" + ], + "scan_by": [ + "Name [Name3, +\u221e)" + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_topsort_topsort_multi_range_pk.sql-plan_/topsort_topsort_multi_range_pk.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_topsort_topsort_multi_range_pk.sql-plan_/topsort_topsort_multi_range_pk.sql.plan index 5d540eda091..f83b145ce81 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_topsort_topsort_multi_range_pk.sql-plan_/topsort_topsort_multi_range_pk.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_topsort_topsort_multi_range_pk.sql-plan_/topsort_topsort_multi_range_pk.sql.plan @@ -1,39 +1,39 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_topsort_topsort_multi_range_pk_sql_plan/Input1", "reads": [ { - "type": "Scan", - "scan_by": [ - "Group (\"10\", +inf]", - "Name" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] - }, - { - "type": "Lookup", - "lookup_by": [ - "Group (\"10\")" ], "scan_by": [ - "Name (\"Name4\", +inf]" + "Group (10, +\u221e)", + "Name (-\u221e, +\u221e)" ], + "type": "Scan" + }, + { "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "lookup_by": [ + "Group (10)" + ], + "scan_by": [ + "Name (Name4, +\u221e)" + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_topsort_topsort_multi_range_skip.sql-plan_/topsort_topsort_multi_range_skip.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_topsort_topsort_multi_range_skip.sql-plan_/topsort_topsort_multi_range_skip.sql.plan index a38b91b8b68..69ad78e4e8d 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_topsort_topsort_multi_range_skip.sql-plan_/topsort_topsort_multi_range_skip.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_topsort_topsort_multi_range_skip.sql-plan_/topsort_topsort_multi_range_skip.sql.plan @@ -1,39 +1,39 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_topsort_topsort_multi_range_skip_sql_plan/Input1", "reads": [ { - "type": "Scan", - "scan_by": [ - "Group (\"10\", +inf]", - "Name" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] - }, - { - "type": "Lookup", - "lookup_by": [ - "Group (\"10\")" ], "scan_by": [ - "Name (\"Name2\", +inf]" + "Group (10, +\u221e)", + "Name (-\u221e, +\u221e)" ], + "type": "Scan" + }, + { "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "lookup_by": [ + "Group (10)" + ], + "scan_by": [ + "Name (Name2, +\u221e)" + ], + "type": "Lookup" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_topsort_topsort_pk.sql-plan_/topsort_topsort_pk.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_topsort_topsort_pk.sql-plan_/topsort_topsort_pk.sql.plan index f30eefe4a45..22daefe226b 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_topsort_topsort_pk.sql-plan_/topsort_topsort_pk.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_topsort_topsort_pk.sql-plan_/topsort_topsort_pk.sql.plan @@ -1,24 +1,24 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_topsort_topsort_pk_sql_plan/Input1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Group", - "Name" - ], "columns": [ "Amount", "Comment", "Group", "Name" - ] + ], + "scan_by": [ + "Group (-\u221e, +\u221e)", + "Name (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_delete_by_pk.sql-plan_/write_delete_by_pk.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_delete_by_pk.sql-plan_/write_delete_by_pk.sql.plan index d328d8a0c03..534710880fc 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_delete_by_pk.sql-plan_/write_delete_by_pk.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_delete_by_pk.sql-plan_/write_delete_by_pk.sql.plan @@ -1,18 +1,14 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_write_delete_by_pk_sql_plan/Input", "writes": [ { - "type": "Erase", - "key": [ - "key (\"3\")", - "subkey (\"4\")" - ] + "type": "MultiErase" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_delete_on.sql-plan_/write_delete_on.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_delete_on.sql-plan_/write_delete_on.sql.plan index 5df9de45a40..1c3b1d74b78 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_delete_on.sql-plan_/write_delete_on.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_delete_on.sql-plan_/write_delete_on.sql.plan @@ -1,32 +1,28 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_write_delete_on_sql_plan/Input", "reads": [ { - "type": "FullScan", - "scan_by": [ - "key", - "subkey" - ], "columns": [ "key", "subkey", "value" - ] + ], + "scan_by": [ + "key (-\u221e, +\u221e)", + "subkey (-\u221e, +\u221e)" + ], + "type": "FullScan" } ], "writes": [ { - "type": "MultiErase", - "key": [ - "key (expr)", - "subkey (expr)" - ] + "type": "MultiErase" } ] }, @@ -34,11 +30,7 @@ "name": "/local/base_write_delete_on_sql_plan/Input1", "writes": [ { - "type": "MultiErase", - "key": [ - "Group (expr)", - "Name (expr)" - ] + "type": "MultiErase" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_delete_same.sql-plan_/write_delete_same.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_delete_same.sql-plan_/write_delete_same.sql.plan index 5a308132a06..da70d7f8e81 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_delete_same.sql-plan_/write_delete_same.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_delete_same.sql-plan_/write_delete_same.sql.plan @@ -1,31 +1,30 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_write_delete_same_sql_plan/Input1", "reads": [ { - "type": "FullScan", - "scan_by": [ - "Group", - "Name" - ], "columns": [ "Group", "Name" - ] + ], + "scan_by": [ + "Group (-\u221e, +\u221e)", + "Name (-\u221e, +\u221e)" + ], + "type": "FullScan" } ], "writes": [ { - "type": "MultiErase", - "key": [ - "Group (expr)", - "Name (expr)" - ] + "type": "MultiErase" + }, + { + "type": "MultiErase" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_insert.sql-plan_/write_insert.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_insert.sql-plan_/write_insert.sql.plan index facf51549d7..99f2399f23c 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_insert.sql-plan_/write_insert.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_insert.sql-plan_/write_insert.sql.plan @@ -1,30 +1,24 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_write_insert_sql_plan/Input", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "key (expr)", - "subkey (expr)" - ] + "type": "Lookup" } ], "writes": [ { - "type": "MultiUpsert", - "key": [ - "key (expr)", - "subkey (expr)" - ], "columns": [ + "key", + "subkey", "value" - ] + ], + "type": "MultiUpsert" } ] }, @@ -32,36 +26,30 @@ "name": "/local/base_write_insert_sql_plan/Input1", "reads": [ { - "type": "Lookup", - "lookup_by": [ - "Group (\"1\")" - ], - "scan_by": [ - "Name" - ], + "type": "Lookup" + }, + { "columns": [ "Group", "Name" - ] - }, - { - "type": "MultiLookup", + ], "lookup_by": [ - "Group (expr)", - "Name (expr)" - ] + "Group (1)" + ], + "scan_by": [ + "Name (-\u221e, +\u221e)" + ], + "type": "Lookup" } ], "writes": [ { - "type": "MultiUpsert", - "key": [ - "Group (expr)", - "Name (expr)" - ], "columns": [ - "Amount" - ] + "Amount", + "Group", + "Name" + ], + "type": "MultiUpsert" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_insert_revert.sql-plan_/write_insert_revert.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_insert_revert.sql-plan_/write_insert_revert.sql.plan index 8ca4d557285..421bcb3001e 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_insert_revert.sql-plan_/write_insert_revert.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_insert_revert.sql-plan_/write_insert_revert.sql.plan @@ -1,30 +1,24 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_write_insert_revert_sql_plan/Input", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "key (expr)", - "subkey (expr)" - ] + "type": "Lookup" } ], "writes": [ { - "type": "MultiUpsert", - "key": [ - "key (expr)", - "subkey (expr)" - ], "columns": [ + "key", + "subkey", "value" - ] + ], + "type": "MultiUpsert" } ] }, @@ -32,23 +26,17 @@ "name": "/local/base_write_insert_revert_sql_plan/Input1", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "Group (expr)", - "Name (expr)" - ] + "type": "Lookup" } ], "writes": [ { - "type": "MultiUpsert", - "key": [ - "Group (expr)", - "Name (expr)" - ], "columns": [ - "Comment" - ] + "Comment", + "Group", + "Name" + ], + "type": "MultiUpsert" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_multi_write.sql-plan_/write_multi_write.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_multi_write.sql-plan_/write_multi_write.sql.plan index c4735585c01..841dfdec96d 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_multi_write.sql-plan_/write_multi_write.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_multi_write.sql-plan_/write_multi_write.sql.plan @@ -1,46 +1,34 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_write_multi_write_sql_plan/Input1", "writes": [ { - "type": "MultiUpsert", - "key": [ - "Group (expr)", - "Name (expr)" - ], "columns": [ "Amount", - "Comment" - ] + "Comment", + "Group", + "Name" + ], + "type": "MultiUpsert" }, { - "type": "MultiUpsert", - "key": [ - "Group (expr)", - "Name (expr)" - ], "columns": [ - "Comment" - ] + "Comment", + "Group", + "Name" + ], + "type": "MultiUpsert" }, { - "type": "Erase", - "key": [ - "Group (\"1\")", - "Name (\"Name5\")" - ] + "type": "MultiErase" }, { - "type": "MultiErase", - "key": [ - "Group (expr)", - "Name (expr)" - ] + "type": "MultiErase" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_replace.sql-plan_/write_replace.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_replace.sql-plan_/write_replace.sql.plan index 64a6f306d23..cd2b46dbe89 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_replace.sql-plan_/write_replace.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_replace.sql-plan_/write_replace.sql.plan @@ -1,34 +1,32 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_write_replace_sql_plan/Input", "reads": [ { - "type": "Scan", - "scan_by": [ - "key (\"1\", +inf]", - "subkey" - ], "columns": [ "key", "subkey" - ] + ], + "scan_by": [ + "key (1, +\u221e)", + "subkey (-\u221e, +\u221e)" + ], + "type": "Scan" } ], "writes": [ { - "type": "MultiUpsert", - "key": [ - "key (expr)", - "subkey (expr)" - ], "columns": [ + "key", + "subkey", "value" - ] + ], + "type": "MultiUpsert" } ] }, @@ -36,26 +34,22 @@ "name": "/local/base_write_replace_sql_plan/Input1", "writes": [ { - "type": "MultiUpsert", - "key": [ - "Group (expr)", - "Name (expr)" - ], "columns": [ "Amount", - "Comment" - ] + "Comment", + "Group", + "Name" + ], + "type": "MultiUpsert" }, { - "type": "MultiUpsert", - "key": [ - "Group (expr)", - "Name (expr)" - ], "columns": [ "Amount", - "Comment" - ] + "Comment", + "Group", + "Name" + ], + "type": "MultiUpsert" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_update.sql-plan_/write_update.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_update.sql-plan_/write_update.sql.plan index 57bb3ac1e39..2cc57d45ef5 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_update.sql-plan_/write_update.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_update.sql-plan_/write_update.sql.plan @@ -1,37 +1,35 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_write_update_sql_plan/Input1", "reads": [ { - "type": "Lookup", - "lookup_by": [ - "Group (\"1\")" - ], - "scan_by": [ - "Name" - ], "columns": [ "Amount", "Group", "Name" - ] + ], + "lookup_by": [ + "Group (1)" + ], + "scan_by": [ + "Name (-\u221e, +\u221e)" + ], + "type": "Lookup" } ], "writes": [ { - "type": "MultiUpsert", - "key": [ - "Group (expr)", - "Name (expr)" - ], "columns": [ - "Amount" - ] + "Amount", + "Name", + "Group" + ], + "type": "MultiUpsert" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_update_on.sql-plan_/write_update_on.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_update_on.sql-plan_/write_update_on.sql.plan index 831a3c427aa..29e4ad1fcf6 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_update_on.sql-plan_/write_update_on.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_update_on.sql-plan_/write_update_on.sql.plan @@ -1,34 +1,28 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_write_update_on_sql_plan/Input", "reads": [ { - "type": "MultiLookup", - "lookup_by": [ - "key (expr)", - "subkey (expr)" - ], "columns": [ "key", "subkey" - ] + ], + "type": "Lookup" } ], "writes": [ { - "type": "MultiUpsert", - "key": [ - "key (expr)", - "subkey (expr)" - ], "columns": [ + "key", + "subkey", "value" - ] + ], + "type": "MultiUpsert" } ] }, @@ -36,41 +30,35 @@ "name": "/local/base_write_update_on_sql_plan/Input1", "reads": [ { - "type": "Lookup", - "lookup_by": [ - "Group (\"1\")" - ], - "scan_by": [ - "Name" - ], "columns": [ - "Amount", "Group", "Name" - ] + ], + "type": "Lookup" }, { - "type": "MultiLookup", - "lookup_by": [ - "Group (expr)", - "Name (expr)" - ], "columns": [ + "Amount", "Group", "Name" - ] + ], + "lookup_by": [ + "Group (1)" + ], + "scan_by": [ + "Name (-\u221e, +\u221e)" + ], + "type": "Lookup" } ], "writes": [ { - "type": "MultiUpsert", - "key": [ - "Group (expr)", - "Name (expr)" - ], "columns": [ - "Amount" - ] + "Amount", + "Group", + "Name" + ], + "type": "MultiUpsert" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_upsert.sql-plan_/write_upsert.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_upsert.sql-plan_/write_upsert.sql.plan index 57007254fb7..6f7c578e125 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_upsert.sql-plan_/write_upsert.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_upsert.sql-plan_/write_upsert.sql.plan @@ -1,34 +1,32 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_write_upsert_sql_plan/Input", "reads": [ { - "type": "Scan", - "scan_by": [ - "key [-inf, \"5\")", - "subkey" - ], "columns": [ "key", "subkey" - ] + ], + "scan_by": [ + "key (-\u221e, 5)", + "subkey (-\u221e, +\u221e)" + ], + "type": "Scan" } ], "writes": [ { - "type": "MultiUpsert", - "key": [ - "key (expr)", - "subkey (expr)" - ], "columns": [ + "key", + "subkey", "value" - ] + ], + "type": "MultiUpsert" } ] }, @@ -36,24 +34,20 @@ "name": "/local/base_write_upsert_sql_plan/Input1", "writes": [ { - "type": "MultiUpsert", - "key": [ - "Group (expr)", - "Name (expr)" - ], "columns": [ - "Amount" - ] + "Amount", + "Group", + "Name" + ], + "type": "MultiUpsert" }, { - "type": "MultiUpsert", - "key": [ - "Group (expr)", - "Name (expr)" - ], "columns": [ - "Comment" - ] + "Comment", + "Group", + "Name" + ], + "type": "MultiUpsert" } ] } diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_upsert_cast.sql-plan_/write_upsert_cast.sql.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_upsert_cast.sql-plan_/write_upsert_cast.sql.plan index 90292cd2d18..6f5acf91c01 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_upsert_cast.sql-plan_/write_upsert_cast.sql.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_upsert_cast.sql-plan_/write_upsert_cast.sql.plan @@ -1,23 +1,23 @@ { "meta": { - "version": "0.1", - "type": "query" + "type": "query", + "version": "0.2" }, "tables": [ { "name": "/local/base_write_upsert_cast_sql_plan/Input", "reads": [ { - "type": "FullScan", - "scan_by": [ - "key", - "subkey" - ], "columns": [ "key", "subkey", "value" - ] + ], + "scan_by": [ + "key (-\u221e, +\u221e)", + "subkey (-\u221e, +\u221e)" + ], + "type": "FullScan" } ] }, @@ -25,14 +25,12 @@ "name": "/local/base_write_upsert_cast_sql_plan/Input1", "writes": [ { - "type": "MultiUpsert", - "key": [ - "Group (expr)", - "Name (expr)" - ], "columns": [ - "Amount" - ] + "Amount", + "Group", + "Name" + ], + "type": "MultiUpsert" } ] } diff --git a/ydb/tests/functional/canonical/sql/join/test_config.json b/ydb/tests/functional/canonical/sql/join/test_config.json index 53049765258..2c63c085104 100644 --- a/ydb/tests/functional/canonical/sql/join/test_config.json +++ b/ydb/tests/functional/canonical/sql/join/test_config.json @@ -1,5 +1,2 @@ { - "join_dup_column_right.sql": { - "check_new_engine_plan": false - } } diff --git a/ydb/tests/functional/canonical/sql/simple/test_config.json b/ydb/tests/functional/canonical/sql/simple/test_config.json index 45bcbdf91c8..576e0b45766 100644 --- a/ydb/tests/functional/canonical/sql/simple/test_config.json +++ b/ydb/tests/functional/canonical/sql/simple/test_config.json @@ -5,20 +5,5 @@ }, "ct.script": { "compare_tables": ["Questions"] - }, - "q11.sql": { - "check_new_engine_plan": false - }, - "q20.sql": { - "check_new_engine_plan": false - }, - "q19.sql": { - "check_new_engine_plan": false - }, - "q17.sql": { - "check_new_engine_plan": false - }, - "q10.sql": { - "check_new_engine_plan": false } } diff --git a/ydb/tests/functional/canonical/sql/test_config.json b/ydb/tests/functional/canonical/sql/test_config.json index f4c99a977e6..2c63c085104 100644 --- a/ydb/tests/functional/canonical/sql/test_config.json +++ b/ydb/tests/functional/canonical/sql/test_config.json @@ -1,5 +1,2 @@ { - "select_result_limit.sql": { - "check_new_engine_plan": false - } } diff --git a/ydb/tests/functional/canonical/sql/write/test_config.json b/ydb/tests/functional/canonical/sql/write/test_config.json index c933b4d80fd..851dbfb0a78 100644 --- a/ydb/tests/functional/canonical/sql/write/test_config.json +++ b/ydb/tests/functional/canonical/sql/write/test_config.json @@ -6,8 +6,7 @@ "compare_tables": ["Input", "Input1"] }, "delete_same.sql": { - "compare_tables": ["Input1"], - "check_new_engine_plan": false + "compare_tables": ["Input1"] }, "insert_revert.sql": { "compare_tables": ["Input", "Input1"] diff --git a/ydb/tests/functional/canonical/test_sql.py b/ydb/tests/functional/canonical/test_sql.py index d34c0ed63bb..2f7dda31408 100644 --- a/ydb/tests/functional/canonical/test_sql.py +++ b/ydb/tests/functional/canonical/test_sql.py @@ -120,7 +120,7 @@ class BaseCanonicalTest(object): cls.cluster.stop() @classmethod - def format_query(cls, query, use_new_engine=False): + def format_query(cls, query): query_parts = query.split('\n') is_v1 = False @@ -128,8 +128,7 @@ class BaseCanonicalTest(object): query_parts.pop(0) is_v1 = True - if use_new_engine: - query_parts = ["PRAGMA Kikimr.UseNewEngine=\"True\";"] + query_parts + query_parts = ["PRAGMA Kikimr.UseNewEngine=\"True\";"] + query_parts query_parts = ["PRAGMA TablePathPrefix=\"{}\";".format(cls.prefix)] + query_parts if is_v1: @@ -442,40 +441,6 @@ class BaseCanonicalTest(object): ) ) - def format_plan(self, plan): - def drop(what, j): - if what in j: - del j[what] - - drop('meta', plan) - # new pg like plan, but use tables section to compare - drop('Plan', plan) - - for table in plan.get('tables', []): - for write in table.get('writes', []): - drop('columns', write) - drop('key', write) - drop('scan_by', write) - drop('lookup_by', write) - # TODO(gvit): return limit checks - drop('limit', write) - - if write.get('type') == 'Erase': - write['type'] = 'MultiErase' - - for read in table.get('reads', []): - drop('columns', read) - drop('key', read) - drop('scan_by', read) - drop('lookup_by', read) - # TODO(gvit): return limit checks - drop('limit', read) - - if read.get('type') == 'Lookup': - read['type'] = 'MultiLookup' - - return plan - def run_test_case(self, query_name, kind): self.initialize_common(query_name, kind) query = self.format_query(self.read_query_text(query_name)) @@ -490,15 +455,10 @@ class BaseCanonicalTest(object): canons['script_plan'] = self.canonical_plan(query_name, self.script_explain(query)) self.compare_tables_test(canons, config, query_name) elif kind == 'plan': - plan = self.explain(query) - canons['plan'] = self.canonical_plan(query_name, plan) - new_engine_query = self.format_query(self.read_query_text(query_name), use_new_engine=True) - new_engine_plan = json.loads(self.explain(new_engine_query)) - plan = json.loads(plan) - - if config.get('check_new_engine_plan', True): - assert self.pretty_json(self.format_plan(plan)) == self.pretty_json(self.format_plan(new_engine_plan)) - + plan = json.loads(self.explain(query)) + if 'Plan' in plan: + del plan['Plan'] + canons['plan'] = self.canonical_plan(query_name, self.pretty_json(plan)) elif kind == 'result_sets': result_sets = self.serializable_execute(query, config.get('parameters', {})) canons['result_sets'] = self.canonical_results(query_name, self.pretty_json(result_sets)) @@ -522,12 +482,6 @@ class BaseCanonicalTest(object): if not scan_query_incompatible: raise - self.initialize_common(query_name, 'new_engine') - new_engine_query = self.format_query(self.read_query_text(query_name), use_new_engine=True) - new_engine_results = self.serializable_execute(new_engine_query, config.get('parameters', {})) - - assert self.pretty_json(new_engine_results) == self.pretty_json(result_sets), "New engine results differs from old engine." - self.compare_tables_test(canons, config, query_name) return canons |