Merge 3818a2d into 1c12b54

ydb-platform · Feb 6, 2024 · 3bd8db0 · 3bd8db0
2 parents 1c12b54 + 3818a2d
commit 3bd8db0
Show file tree

Hide file tree

Showing 15 changed files with 73 additions and 73 deletions.
diff --git a/ydb/library/yql/tests/sql/dq_file/part10/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part10/canondata/result.json
@@ -2599,26 +2599,26 @@
     ],
     "test.test[window-win_func_part_by_expr_new-default.txt-Analyze]": [
         {
-            "checksum": "3616480a037ff99e46a8a96e2ae79b1c",
-            "size": 5182,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_window-win_func_part_by_expr_new-default.txt-Analyze_/plan.txt"
+            "checksum": "8edf0b02e6b73fd117023ac5daa90d1e",
+            "size": 5202,
+            "uri": "https://{canondata_backend}/1773845/58669ef67391607d0bea8c241fd7cfc291b1e4a8/resource.tar.gz#test.test_window-win_func_part_by_expr_new-default.txt-Analyze_/plan.txt"
         },
         {
             "uri": "file://test.test_window-win_func_part_by_expr_new-default.txt-Analyze_/extracted"
         }
     ],
     "test.test[window-win_func_part_by_expr_new-default.txt-Debug]": [
         {
-            "checksum": "8e7f9a08b9186bbe5bca3d6330e37a36",
-            "size": 3303,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_window-win_func_part_by_expr_new-default.txt-Debug_/opt.yql_patched"
+            "checksum": "593f180f482e1a448e661029d671ba7d",
+            "size": 3314,
+            "uri": "https://{canondata_backend}/1773845/58669ef67391607d0bea8c241fd7cfc291b1e4a8/resource.tar.gz#test.test_window-win_func_part_by_expr_new-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[window-win_func_part_by_expr_new-default.txt-Plan]": [
         {
-            "checksum": "3616480a037ff99e46a8a96e2ae79b1c",
-            "size": 5182,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_window-win_func_part_by_expr_new-default.txt-Plan_/plan.txt"
+            "checksum": "8edf0b02e6b73fd117023ac5daa90d1e",
+            "size": 5202,
+            "uri": "https://{canondata_backend}/1773845/58669ef67391607d0bea8c241fd7cfc291b1e4a8/resource.tar.gz#test.test_window-win_func_part_by_expr_new-default.txt-Plan_/plan.txt"
         }
     ],
     "test.test[window-win_func_part_by_expr_new-default.txt-Results]": [

diff --git a/ydb/library/yql/tests/sql/dq_file/part19/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part19/canondata/result.json
@@ -2620,9 +2620,9 @@
     ],
     "test.test[table_range-range_over_desc--Debug]": [
         {
-            "checksum": "39890d766487deb53ca4878bd0353c5c",
-            "size": 2300,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_table_range-range_over_desc--Debug_/opt.yql_patched"
+            "checksum": "3dd1f4df8426fb522624a0556da07bff",
+            "size": 2439,
+            "uri": "https://{canondata_backend}/1784826/66abdb7f6ea46c5c7564f94f24f2656a0e2aa349/resource.tar.gz#test.test_table_range-range_over_desc--Debug_/opt.yql_patched"
         }
     ],
     "test.test[table_range-range_over_desc--Plan]": [

diff --git a/ydb/library/yql/tests/sql/dq_file/part2/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part2/canondata/result.json
@@ -1649,9 +1649,9 @@
     ],
     "test.test[key_filter-pushdown_keyextract_passthrough-default.txt-Debug]": [
         {
-            "checksum": "f9a5989efad89a834911d2997a74db31",
-            "size": 2095,
-            "uri": "https://{canondata_backend}/1937027/0d4e7463a2cca915bc28cdfa63111f875afc615b/resource.tar.gz#test.test_key_filter-pushdown_keyextract_passthrough-default.txt-Debug_/opt.yql_patched"
+            "checksum": "acc919af36f171a72056b2ee2faaf3b0",
+            "size": 2145,
+            "uri": "https://{canondata_backend}/1936273/675c4946b21871cc600565c50ebb14d6b242301d/resource.tar.gz#test.test_key_filter-pushdown_keyextract_passthrough-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[key_filter-pushdown_keyextract_passthrough-default.txt-Plan]": [

diff --git a/ydb/library/yql/tests/sql/dq_file/part5/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part5/canondata/result.json
@@ -2878,9 +2878,9 @@
     ],
     "test.test[window-current/session_aliases--Debug]": [
         {
-            "checksum": "f036aa63149f58f6076a04819ae3f08a",
-            "size": 4560,
-            "uri": "https://{canondata_backend}/1942278/4753a3574c7d4c4cc4a6ef5262a4559e7e493c80/resource.tar.gz#test.test_window-current_session_aliases--Debug_/opt.yql_patched"
+            "checksum": "3f2a84af83929f62c8ab836a6dfdf595",
+            "size": 4647,
+            "uri": "https://{canondata_backend}/1600758/4facc3887d7be655ebe11f112eb8a7dc7a544811/resource.tar.gz#test.test_window-current_session_aliases--Debug_/opt.yql_patched"
         }
     ],
     "test.test[window-current/session_aliases--Plan]": [

diff --git a/ydb/library/yql/tests/sql/dq_file/part8/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part8/canondata/result.json
@@ -1131,9 +1131,9 @@
     ],
     "test.test[flatten_by-struct_without_correlation-default.txt-Debug]": [
         {
-            "checksum": "6960858506d5c723c4ed0f2a021d33b4",
-            "size": 2862,
-            "uri": "https://{canondata_backend}/1937001/b50cbf33819e30c3dbd3f1d7aa3988fe10d7563d/resource.tar.gz#test.test_flatten_by-struct_without_correlation-default.txt-Debug_/opt.yql_patched"
+            "checksum": "3eae9729a64e8366dd8449eb2322fd3e",
+            "size": 2933,
+            "uri": "https://{canondata_backend}/1777230/5929a5f68e30c5cd123eff09f1b1487815a8578e/resource.tar.gz#test.test_flatten_by-struct_without_correlation-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[flatten_by-struct_without_correlation-default.txt-Plan]": [

diff --git a/ydb/library/yql/tests/sql/sql2yql/canondata/result.json b/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
@@ -6182,9 +6182,9 @@
     ],
     "test_sql2yql.test[flatten_by-struct_without_correlation]": [
         {
-            "checksum": "9136af1146f7b13aeb261f990405a244",
-            "size": 2715,
-            "uri": "https://{canondata_backend}/1936997/00f46808be87e2ae2d4ac3ac45675b659c5ace45/resource.tar.gz#test_sql2yql.test_flatten_by-struct_without_correlation_/sql.yql"
+            "checksum": "ee1fbcd5a8b7ea84e4692034c047c3c9",
+            "size": 2776,
+            "uri": "https://{canondata_backend}/1936273/d1ec294b803f798a75479b94edfd85a02ab1eb54/resource.tar.gz#test_sql2yql.test_flatten_by-struct_without_correlation_/sql.yql"
         }
     ],
     "test_sql2yql.test[flexible_types-basic]": [
@@ -9101,9 +9101,9 @@
     ],
     "test_sql2yql.test[key_filter-pushdown_keyextract_passthrough]": [
         {
-            "checksum": "c9a50473e0b598f23cdf807c5674bfa9",
-            "size": 2370,
-            "uri": "https://{canondata_backend}/1597364/9ccaceac734735b7c9136dd5a6e8d09a3da4a347/resource.tar.gz#test_sql2yql.test_key_filter-pushdown_keyextract_passthrough_/sql.yql"
+            "checksum": "839c2b92a0783dd2b46e180ea6b2e52d",
+            "size": 2423,
+            "uri": "https://{canondata_backend}/1931696/5fe4928f06d2e88e8209e0ef43d522899098153b/resource.tar.gz#test_sql2yql.test_key_filter-pushdown_keyextract_passthrough_/sql.yql"
         }
     ],
     "test_sql2yql.test[key_filter-pushdown_keyextract_type_adjust]": [
@@ -15569,9 +15569,9 @@
     ],
     "test_sql2yql.test[table_range-range_over_desc]": [
         {
-            "checksum": "ad6bb124322dfab26b77621792d7a316",
-            "size": 1436,
-            "uri": "https://{canondata_backend}/1936947/659b615f15086142a8960946dabd06b519d43335/resource.tar.gz#test_sql2yql.test_table_range-range_over_desc_/sql.yql"
+            "checksum": "f177495846e8bb409cdc33d638b30384",
+            "size": 1546,
+            "uri": "https://{canondata_backend}/1937429/5822551fab6aa1fdd3a2a8f46252b4164f4be75d/resource.tar.gz#test_sql2yql.test_table_range-range_over_desc_/sql.yql"
         }
     ],
     "test_sql2yql.test[table_range-range_over_filter]": [
@@ -16647,9 +16647,9 @@
     ],
     "test_sql2yql.test[window-current/session_aliases]": [
         {
-            "checksum": "e9de8f4a3630e17d78ee1b79114ed334",
-            "size": 3655,
-            "uri": "https://{canondata_backend}/1936947/659b615f15086142a8960946dabd06b519d43335/resource.tar.gz#test_sql2yql.test_window-current_session_aliases_/sql.yql"
+            "checksum": "adae4e1a95a1b37f8f66c6df8695df01",
+            "size": 3714,
+            "uri": "https://{canondata_backend}/1942525/c4679680a3f04e525af18da47282958892246bf4/resource.tar.gz#test_sql2yql.test_window-current_session_aliases_/sql.yql"
         }
     ],
     "test_sql2yql.test[window-current/session_extended]": [
@@ -17235,9 +17235,9 @@
     ],
     "test_sql2yql.test[window-win_func_part_by_expr_new]": [
         {
-            "checksum": "d5829d033169a7ae1b25d6ff0c5a2b0b",
-            "size": 2162,
-            "uri": "https://{canondata_backend}/1936997/00f46808be87e2ae2d4ac3ac45675b659c5ace45/resource.tar.gz#test_sql2yql.test_window-win_func_part_by_expr_new_/sql.yql"
+            "checksum": "f097fc545b37645b26e809c6bf9133d6",
+            "size": 2223,
+            "uri": "https://{canondata_backend}/1600758/d2be12e3cc8a37157a962bd9b58c2874635d2195/resource.tar.gz#test_sql2yql.test_window-win_func_part_by_expr_new_/sql.yql"
         }
     ],
     "test_sql2yql.test[window-win_func_rank_by_all]": [
@@ -23668,9 +23668,9 @@
     ],
     "test_sql_format.test[flatten_by-struct_without_correlation]": [
         {
-            "checksum": "3f208962aed8c661e700c7dd9e76a7b1",
-            "size": 452,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_flatten_by-struct_without_correlation_/formatted.sql"
+            "checksum": "10f8b8db24c02604dbdc9bcedb081bb4",
+            "size": 465,
+            "uri": "https://{canondata_backend}/1936273/d1ec294b803f798a75479b94edfd85a02ab1eb54/resource.tar.gz#test_sql_format.test_flatten_by-struct_without_correlation_/formatted.sql"
         }
     ],
     "test_sql_format.test[flexible_types-basic]": [
@@ -26587,9 +26587,9 @@
     ],
     "test_sql_format.test[key_filter-pushdown_keyextract_passthrough]": [
         {
-            "checksum": "1426b7ecefb9ce9031a672869505d4a7",
-            "size": 283,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_key_filter-pushdown_keyextract_passthrough_/formatted.sql"
+            "checksum": "3a798c907690890caa80e6bd6d98dbb0",
+            "size": 294,
+            "uri": "https://{canondata_backend}/1931696/5fe4928f06d2e88e8209e0ef43d522899098153b/resource.tar.gz#test_sql_format.test_key_filter-pushdown_keyextract_passthrough_/formatted.sql"
         }
     ],
     "test_sql_format.test[key_filter-pushdown_keyextract_type_adjust]": [
@@ -30493,9 +30493,9 @@
     ],
     "test_sql_format.test[table_range-range_over_desc]": [
         {
-            "checksum": "2253742a3466e4fd2310075c89aa4629",
-            "size": 202,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_table_range-range_over_desc_/formatted.sql"
+            "checksum": "583757d0b9a28b5d0913e542271735be",
+            "size": 222,
+            "uri": "https://{canondata_backend}/1937429/5822551fab6aa1fdd3a2a8f46252b4164f4be75d/resource.tar.gz#test_sql_format.test_table_range-range_over_desc_/formatted.sql"
         }
     ],
     "test_sql_format.test[table_range-range_over_filter]": [
@@ -31571,9 +31571,9 @@
     ],
     "test_sql_format.test[window-current/session_aliases]": [
         {
-            "checksum": "5afef1b4c9603f4a8fac5d51e71a4b86",
-            "size": 523,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_window-current_session_aliases_/formatted.sql"
+            "checksum": "7f33f1b1242202f39850931a992cd9ba",
+            "size": 540,
+            "uri": "https://{canondata_backend}/1942525/c4679680a3f04e525af18da47282958892246bf4/resource.tar.gz#test_sql_format.test_window-current_session_aliases_/formatted.sql"
         }
     ],
     "test_sql_format.test[window-current/session_extended]": [
@@ -32159,9 +32159,9 @@
     ],
     "test_sql_format.test[window-win_func_part_by_expr_new]": [
         {
-            "checksum": "2d358210915c5f6d475703c19f26221c",
-            "size": 329,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_window-win_func_part_by_expr_new_/formatted.sql"
+            "checksum": "4ed0e6a6836f1d8cf45ee05c4a6caa3d",
+            "size": 342,
+            "uri": "https://{canondata_backend}/1600758/d2be12e3cc8a37157a962bd9b58c2874635d2195/resource.tar.gz#test_sql_format.test_window-win_func_part_by_expr_new_/formatted.sql"
         }
     ],
     "test_sql_format.test[window-win_func_rank_by_all]": [

diff --git a/ydb/library/yql/tests/sql/suites/flatten_by/struct_without_correlation.sql b/ydb/library/yql/tests/sql/suites/flatten_by/struct_without_correlation.sql
@@ -10,5 +10,5 @@ select
   mod, `struct`.`struct`
 from $data_dict as dd
 flatten by list_struct as `struct`
-order by mod
+order by mod, column1;
 --order by mod, iv, ls;
diff --git a/ydb/library/yql/tests/sql/suites/key_filter/pushdown_keyextract_passthrough.sql b/ydb/library/yql/tests/sql/suites/key_filter/pushdown_keyextract_passthrough.sql
@@ -9,5 +9,5 @@ $src = select
 from Input as u
 assume order by key;
 
-select * from $src where key < "075" or key > "075" order by key, subkey;
+select * from $src where key < "075" or key > "075" order by key, subkey, value;
 
diff --git a/ydb/library/yql/tests/sql/suites/table_range/range_over_desc.sql b/ydb/library/yql/tests/sql/suites/table_range/range_over_desc.sql
@@ -4,4 +4,4 @@
 use plato;
 
 select t.*, TableName() as path from range("","Input1", "Input2") as t
-order by path;
+order by path, key, value;
diff --git a/ydb/library/yql/tests/sql/suites/window/current/session_aliases.sql b/ydb/library/yql/tests/sql/suites/window/current/session_aliases.sql
@@ -18,4 +18,4 @@ w1 AS (
     PARTITION BY SessionWindow(ts, 10), user
     ORDER BY ts
 )
-ORDER BY user, ts;
+ORDER BY user, ts, session_len;
diff --git a/ydb/library/yql/tests/sql/suites/window/win_func_part_by_expr_new.sql b/ydb/library/yql/tests/sql/suites/window/win_func_part_by_expr_new.sql
@@ -6,4 +6,4 @@ use plato;
 --insert into Output
 select key_mod, aggr_list(value) over w, aggr_list(subkey) over w
 from Input window w as (partition by cast(key as uint32) % 10 as key_mod order by subkey)
-order by key_mod
+order by key_mod, column1;
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part10/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part10/canondata/result.json
@@ -2456,16 +2456,16 @@
     ],
     "test.test[window-win_func_part_by_expr_new-default.txt-Debug]": [
         {
-            "checksum": "650cff9281f2bca05857456201367ce0",
-            "size": 4077,
-            "uri": "https://{canondata_backend}/1924537/6033fa62c3628f7f8f85fe0b254eb896d2d9c2ce/resource.tar.gz#test.test_window-win_func_part_by_expr_new-default.txt-Debug_/opt.yql"
+            "checksum": "61f12a52c77f5443c1e75642a8991a23",
+            "size": 4520,
+            "uri": "https://{canondata_backend}/1942173/9928a2751094d6eda292ebc93ae8d57670495542/resource.tar.gz#test.test_window-win_func_part_by_expr_new-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[window-win_func_part_by_expr_new-default.txt-Plan]": [
         {
-            "checksum": "09f106a98bd81b4d0ce6c009ded42805",
-            "size": 6524,
-            "uri": "https://{canondata_backend}/1924537/6033fa62c3628f7f8f85fe0b254eb896d2d9c2ce/resource.tar.gz#test.test_window-win_func_part_by_expr_new-default.txt-Plan_/plan.txt"
+            "checksum": "b73530db95f2066d24c54770f074a0f9",
+            "size": 6517,
+            "uri": "https://{canondata_backend}/1942173/9928a2751094d6eda292ebc93ae8d57670495542/resource.tar.gz#test.test_window-win_func_part_by_expr_new-default.txt-Plan_/plan.txt"
         }
     ],
     "test.test[window-win_func_part_by_expr_new-default.txt-Results]": [

diff --git a/ydb/library/yql/tests/sql/yt_native_file/part2/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part2/canondata/result.json
@@ -1420,9 +1420,9 @@
     ],
     "test.test[key_filter-pushdown_keyextract_passthrough-default.txt-Debug]": [
         {
-            "checksum": "7f9f441fd903d00ea3935d658737f66e",
-            "size": 2129,
-            "uri": "https://{canondata_backend}/1937027/f3e1ebe46b7fb51439ce95bea1bfa19086e56f28/resource.tar.gz#test.test_key_filter-pushdown_keyextract_passthrough-default.txt-Debug_/opt.yql"
+            "checksum": "46ea9819abeece403e0f35587ed915cf",
+            "size": 1970,
+            "uri": "https://{canondata_backend}/1924537/f51379f3c31cda6dd09ff4648aec346cda80306b/resource.tar.gz#test.test_key_filter-pushdown_keyextract_passthrough-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[key_filter-pushdown_keyextract_passthrough-default.txt-Plan]": [

diff --git a/ydb/library/yql/tests/sql/yt_native_file/part5/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part5/canondata/result.json
@@ -2752,9 +2752,9 @@
     ],
     "test.test[window-current/session_aliases--Debug]": [
         {
-            "checksum": "305d7894e133e5174d11cd668138b95f",
-            "size": 4766,
-            "uri": "https://{canondata_backend}/1781765/46f4226358450412fe9b9f5dad584e1269a0622d/resource.tar.gz#test.test_window-current_session_aliases--Debug_/opt.yql"
+            "checksum": "3ed433ac4cabbd6dddc931641a2c696c",
+            "size": 4844,
+            "uri": "https://{canondata_backend}/1775059/1cd9ac4e584878562647be4575066a63c92c4981/resource.tar.gz#test.test_window-current_session_aliases--Debug_/opt.yql"
         }
     ],
     "test.test[window-current/session_aliases--Plan]": [

diff --git a/ydb/library/yql/tests/sql/yt_native_file/part8/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part8/canondata/result.json
@@ -1140,9 +1140,9 @@
     ],
     "test.test[flatten_by-struct_without_correlation-default.txt-Debug]": [
         {
-            "checksum": "10e5f84ef7ae1165d3cf04a0dd57c16b",
-            "size": 3614,
-            "uri": "https://{canondata_backend}/1781765/de147e1386c9b98546ba3e14eb71ae4a038b981c/resource.tar.gz#test.test_flatten_by-struct_without_correlation-default.txt-Debug_/opt.yql"
+            "checksum": "4db32f20f6d0237f0a0627cf5d97829d",
+            "size": 3652,
+            "uri": "https://{canondata_backend}/1889210/ae2f3bfa09ec4b9e83b9274bf1f814039c16bcdf/resource.tar.gz#test.test_flatten_by-struct_without_correlation-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[flatten_by-struct_without_correlation-default.txt-Plan]": [
@@ -1154,9 +1154,9 @@
     ],
     "test.test[flatten_by-struct_without_correlation-default.txt-Results]": [
         {
-            "checksum": "54f8eb37d3af26fe206a100a46a9f39a",
+            "checksum": "486ca1be9aa670eb8a46811f980aeb8a",
             "size": 1629,
-            "uri": "https://{canondata_backend}/1900335/4871e48d29e4933514d3ed0c9c5d19de571eda1f/resource.tar.gz#test.test_flatten_by-struct_without_correlation-default.txt-Results_/results.txt"
+            "uri": "https://{canondata_backend}/1889210/ae2f3bfa09ec4b9e83b9274bf1f814039c16bcdf/resource.tar.gz#test.test_flatten_by-struct_without_correlation-default.txt-Results_/results.txt"
         },
         {
             "uri": "file://test.test_flatten_by-struct_without_correlation-default.txt-Results_/extracted"