diff --git a/ydb/library/yql/tests/sql/dq_file/part0/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part0/canondata/result.json
index 22b17406057e..9c6f01828e0e 100644
--- a/ydb/library/yql/tests/sql/dq_file/part0/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part0/canondata/result.json
@@ -704,9 +704,9 @@
     ],
     "test.test[expr-to_sorted_set_vartuple_key-default.txt-Debug]": [
         {
-            "checksum": "845bb393b8fa37e931d04b3524f2a174",
-            "size": 1072,
-            "uri": "https://{canondata_backend}/937458/ca874ae4a90e1527826d17c1da5f3d3dad325887/resource.tar.gz#test.test_expr-to_sorted_set_vartuple_key-default.txt-Debug_/opt.yql_patched"
+            "checksum": "09cceea60fe27f728d3abf3a7d6f645b",
+            "size": 1202,
+            "uri": "https://{canondata_backend}/1775319/bba92b3b1258858b918e2263cd320f202272dd31/resource.tar.gz#test.test_expr-to_sorted_set_vartuple_key-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[expr-to_sorted_set_vartuple_key-default.txt-Plan]": [
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
index 33e84c37958a..2d7fe0efaacf 100644
--- a/ydb/library/yql/tests/sql/dq_file/part10/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part10/canondata/result.json
@@ -786,9 +786,9 @@
     ],
     "test.test[expr-pickle-default.txt-Debug]": [
         {
-            "checksum": "954f1b21d13579ee956292494b2f1d30",
-            "size": 1318,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_expr-pickle-default.txt-Debug_/opt.yql_patched"
+            "checksum": "84f56d5e92d939a4c55b8002dc8cb051",
+            "size": 1453,
+            "uri": "https://{canondata_backend}/1925842/c7d0c85c30d626227cdea35ffc2a17239f601245/resource.tar.gz#test.test_expr-pickle-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[expr-pickle-default.txt-Plan]": [
diff --git a/ydb/library/yql/tests/sql/dq_file/part13/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part13/canondata/result.json
index 8587a21ccddb..b87c8f00a01c 100644
--- a/ydb/library/yql/tests/sql/dq_file/part13/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part13/canondata/result.json
@@ -845,9 +845,9 @@
     ],
     "test.test[expr-to_sorted_dict_tuple_key-default.txt-Debug]": [
         {
-            "checksum": "dad08216d3633a43f584909469ef5f70",
-            "size": 3923,
-            "uri": "https://{canondata_backend}/1936997/93899b3de50fae3f9677baacc98094a7a629590a/resource.tar.gz#test.test_expr-to_sorted_dict_tuple_key-default.txt-Debug_/opt.yql_patched"
+            "checksum": "4a467436fd1c0352026e5b0aa7011ef8",
+            "size": 4604,
+            "uri": "https://{canondata_backend}/1936273/f5ff3cfbdfa653890191f0af3a243b8bf12e50fe/resource.tar.gz#test.test_expr-to_sorted_dict_tuple_key-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[expr-to_sorted_dict_tuple_key-default.txt-Plan]": [
diff --git a/ydb/library/yql/tests/sql/dq_file/part14/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part14/canondata/result.json
index 770eb93730f4..3a5026f56ba6 100644
--- a/ydb/library/yql/tests/sql/dq_file/part14/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part14/canondata/result.json
@@ -925,23 +925,23 @@
     "test.test[expr-struct_slice-default.txt-Results]": [],
     "test.test[expr-to_hashed_dict_dict_key-default.txt-Analyze]": [
         {
-            "checksum": "8ddfa95f10135fbea51411372a704ae9",
-            "size": 5055,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_expr-to_hashed_dict_dict_key-default.txt-Analyze_/plan.txt"
+            "checksum": "f74ec14f540b4bcfb6cbea8907195a7d",
+            "size": 4640,
+            "uri": "https://{canondata_backend}/1936273/8ae056ade64c358b3bb34eda82c0969989c5ee85/resource.tar.gz#test.test_expr-to_hashed_dict_dict_key-default.txt-Analyze_/plan.txt"
         }
     ],
     "test.test[expr-to_hashed_dict_dict_key-default.txt-Debug]": [
         {
-            "checksum": "4e2f6be54a70c57e177b606c2f41595d",
-            "size": 2644,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_expr-to_hashed_dict_dict_key-default.txt-Debug_/opt.yql_patched"
+            "checksum": "8ddaedc85ea4d2dd9f96180df54fb76b",
+            "size": 3455,
+            "uri": "https://{canondata_backend}/1936273/8ae056ade64c358b3bb34eda82c0969989c5ee85/resource.tar.gz#test.test_expr-to_hashed_dict_dict_key-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[expr-to_hashed_dict_dict_key-default.txt-Plan]": [
         {
-            "checksum": "8ddfa95f10135fbea51411372a704ae9",
-            "size": 5055,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_expr-to_hashed_dict_dict_key-default.txt-Plan_/plan.txt"
+            "checksum": "f74ec14f540b4bcfb6cbea8907195a7d",
+            "size": 4640,
+            "uri": "https://{canondata_backend}/1936273/8ae056ade64c358b3bb34eda82c0969989c5ee85/resource.tar.gz#test.test_expr-to_hashed_dict_dict_key-default.txt-Plan_/plan.txt"
         }
     ],
     "test.test[expr-to_hashed_dict_dict_key-default.txt-Results]": [],
@@ -954,9 +954,9 @@
     ],
     "test.test[expr-to_sorted_set_tuple_key-default.txt-Debug]": [
         {
-            "checksum": "40fcedfa1a86d31604c7ed010aba6537",
-            "size": 2299,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_expr-to_sorted_set_tuple_key-default.txt-Debug_/opt.yql_patched"
+            "checksum": "a877dff282730e0a97fe7b887b3202b4",
+            "size": 2650,
+            "uri": "https://{canondata_backend}/1936273/8ae056ade64c358b3bb34eda82c0969989c5ee85/resource.tar.gz#test.test_expr-to_sorted_set_tuple_key-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[expr-to_sorted_set_tuple_key-default.txt-Plan]": [
diff --git a/ydb/library/yql/tests/sql/dq_file/part15/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part15/canondata/result.json
index d813f3e4b333..9e89b15f02f9 100644
--- a/ydb/library/yql/tests/sql/dq_file/part15/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part15/canondata/result.json
@@ -870,9 +870,9 @@
     ],
     "test.test[expr-to_hashed_set_dict_key-default.txt-Debug]": [
         {
-            "checksum": "3e4f29d9220ccb3fb4b02608a38c7c99",
-            "size": 1661,
-            "uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_expr-to_hashed_set_dict_key-default.txt-Debug_/opt.yql_patched"
+            "checksum": "4f6985589c6a2a816b7546a25a8a52da",
+            "size": 1960,
+            "uri": "https://{canondata_backend}/1936273/4c8b3d0f8db4e00cc925f14c59f460eb215abd5e/resource.tar.gz#test.test_expr-to_hashed_set_dict_key-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[expr-to_hashed_set_dict_key-default.txt-Plan]": [
diff --git a/ydb/library/yql/tests/sql/dq_file/part16/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part16/canondata/result.json
index 90a97788e6ce..a383c53148f7 100644
--- a/ydb/library/yql/tests/sql/dq_file/part16/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part16/canondata/result.json
@@ -610,9 +610,9 @@
     ],
     "test.test[expr-as_dict_list_key-default.txt-Debug]": [
         {
-            "checksum": "e216c081497354b76afc4ecbf98efb71",
-            "size": 959,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_expr-as_dict_list_key-default.txt-Debug_/opt.yql_patched"
+            "checksum": "45d5c688004b11e0f299bd02645ffb93",
+            "size": 1078,
+            "uri": "https://{canondata_backend}/1781765/1619c7b1a20592cc5916988b364877cd2b0f3128/resource.tar.gz#test.test_expr-as_dict_list_key-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[expr-as_dict_list_key-default.txt-Plan]": [
diff --git a/ydb/library/yql/tests/sql/dq_file/part17/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part17/canondata/result.json
index 56aeeb866e47..3dc24329ea2c 100644
--- a/ydb/library/yql/tests/sql/dq_file/part17/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part17/canondata/result.json
@@ -864,9 +864,9 @@
     ],
     "test.test[expr-to_sorted_dict_vartuple_key-default.txt-Debug]": [
         {
-            "checksum": "6c30cb58f4b978788509af89da6b353c",
-            "size": 1646,
-            "uri": "https://{canondata_backend}/1936273/7c78e1e45ae282daee686c006624daa21a7c6ca6/resource.tar.gz#test.test_expr-to_sorted_dict_vartuple_key-default.txt-Debug_/opt.yql_patched"
+            "checksum": "688fb936ba1feef8abca3b0026fdab44",
+            "size": 1891,
+            "uri": "https://{canondata_backend}/1925842/7ebc150a0a7f519aa4f55419690a72a55d7dc0de/resource.tar.gz#test.test_expr-to_sorted_dict_vartuple_key-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[expr-to_sorted_dict_vartuple_key-default.txt-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
index f38224ad04e2..f5faeb5cf02f 100644
--- a/ydb/library/yql/tests/sql/dq_file/part2/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part2/canondata/result.json
@@ -847,9 +847,9 @@
     ],
     "test.test[expr-to_sorted_dict_list_key-default.txt-Debug]": [
         {
-            "checksum": "ae89c5c948b377250b7e749eae238a1b",
-            "size": 1634,
-            "uri": "https://{canondata_backend}/1920236/e3a40a0f1b28089f5bcc00a85b3176919dc509ac/resource.tar.gz#test.test_expr-to_sorted_dict_list_key-default.txt-Debug_/opt.yql_patched"
+            "checksum": "ea8bbea25dabeae64479958c2edf2a91",
+            "size": 1700,
+            "uri": "https://{canondata_backend}/1599023/a5380e4a2a405982a2db809113125a77be343da8/resource.tar.gz#test.test_expr-to_sorted_dict_list_key-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[expr-to_sorted_dict_list_key-default.txt-Plan]": [
diff --git a/ydb/library/yql/tests/sql/dq_file/part3/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part3/canondata/result.json
index eceb5c6bff4d..0bcfc7e13070 100644
--- a/ydb/library/yql/tests/sql/dq_file/part3/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part3/canondata/result.json
@@ -795,9 +795,9 @@
     ],
     "test.test[expr-to_sorted_set_list_key-default.txt-Debug]": [
         {
-            "checksum": "57553b93094b8cfd414511dfc10289c1",
-            "size": 1070,
-            "uri": "https://{canondata_backend}/1899731/5f48750839c300c592c921895adce61b6bdd10c7/resource.tar.gz#test.test_expr-to_sorted_set_list_key-default.txt-Debug_/opt.yql_patched"
+            "checksum": "dde01e05fddf3764061a0a784ce9266b",
+            "size": 1199,
+            "uri": "https://{canondata_backend}/1903885/7cceb820bcf6056398a3b4781ea0fe33745b44cd/resource.tar.gz#test.test_expr-to_sorted_set_list_key-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[expr-to_sorted_set_list_key-default.txt-Plan]": [
diff --git a/ydb/library/yql/tests/sql/dq_file/part4/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part4/canondata/result.json
index cb339a78e084..0e0f6c97c1cb 100644
--- a/ydb/library/yql/tests/sql/dq_file/part4/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part4/canondata/result.json
@@ -636,9 +636,9 @@
     ],
     "test.test[expr-as_dict_dict_key-default.txt-Debug]": [
         {
-            "checksum": "f16e4cf85b1a7da3cc195c1763c9e255",
-            "size": 1133,
-            "uri": "https://{canondata_backend}/1817427/cd1ccdb594fb5c0d7ccd4116b70e61c92e494ff1/resource.tar.gz#test.test_expr-as_dict_dict_key-default.txt-Debug_/opt.yql_patched"
+            "checksum": "d9d87b670d8672018682fbea72e69b63",
+            "size": 1425,
+            "uri": "https://{canondata_backend}/1937367/bddc39b328825607a7c8da47b95102cc9333b395/resource.tar.gz#test.test_expr-as_dict_dict_key-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[expr-as_dict_dict_key-default.txt-Plan]": [
@@ -709,9 +709,9 @@
     ],
     "test.test[expr-to_hashed_set_vartuple_key-default.txt-Debug]": [
         {
-            "checksum": "f281ba1402a632de3c5f77b5306c00a4",
-            "size": 1676,
-            "uri": "https://{canondata_backend}/212715/cac0988e3f0d6d4f0bc782106479af0e9a38af20/resource.tar.gz#test.test_expr-to_hashed_set_vartuple_key-default.txt-Debug_/opt.yql_patched"
+            "checksum": "ffe5cc372feacb4861741feff07e5a91",
+            "size": 1916,
+            "uri": "https://{canondata_backend}/1937367/bddc39b328825607a7c8da47b95102cc9333b395/resource.tar.gz#test.test_expr-to_hashed_set_vartuple_key-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[expr-to_hashed_set_vartuple_key-default.txt-Plan]": [
diff --git a/ydb/library/yql/tests/sql/dq_file/part6/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part6/canondata/result.json
index 8fbdab9ad8c2..152cfd3d6b28 100644
--- a/ydb/library/yql/tests/sql/dq_file/part6/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part6/canondata/result.json
@@ -830,9 +830,9 @@
     ],
     "test.test[expr-to_hashed_set_tuple_key-default.txt-Debug]": [
         {
-            "checksum": "4b482c7a9718737e93f292224f0058a8",
-            "size": 3867,
-            "uri": "https://{canondata_backend}/1937150/9114d99ba08350b54158d617466d8f9e5a0e5c73/resource.tar.gz#test.test_expr-to_hashed_set_tuple_key-default.txt-Debug_/opt.yql_patched"
+            "checksum": "09580be4488126ae905792eff96e73d7",
+            "size": 4498,
+            "uri": "https://{canondata_backend}/1889210/ff6f980768ecc0b4a6b2acc4f8ba9204881c47be/resource.tar.gz#test.test_expr-to_hashed_set_tuple_key-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[expr-to_hashed_set_tuple_key-default.txt-Plan]": [
diff --git a/ydb/library/yql/tests/sql/dq_file/part7/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part7/canondata/result.json
index 36ac4b07612b..c004a797e684 100644
--- a/ydb/library/yql/tests/sql/dq_file/part7/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part7/canondata/result.json
@@ -669,9 +669,9 @@
     ],
     "test.test[expr-as_dict_tuple_key-default.txt-Debug]": [
         {
-            "checksum": "5a9f1676547d3807c35c226068e4a7aa",
-            "size": 1885,
-            "uri": "https://{canondata_backend}/1936947/900ed4b07b3e497bdca6ea0063b227dc2b03c52d/resource.tar.gz#test.test_expr-as_dict_tuple_key-default.txt-Debug_/opt.yql_patched"
+            "checksum": "8b762676429d2b11b1acd24acc02711b",
+            "size": 2226,
+            "uri": "https://{canondata_backend}/1871182/1190fc5a06f4110089c31af3c580fe42db3cce31/resource.tar.gz#test.test_expr-as_dict_tuple_key-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[expr-as_dict_tuple_key-default.txt-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
index ca216ca53b0a..4d2f47bf7ac4 100644
--- a/ydb/library/yql/tests/sql/dq_file/part8/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part8/canondata/result.json
@@ -1027,9 +1027,9 @@
     ],
     "test.test[expr-to_hashed_set_varstruct_key-default.txt-Debug]": [
         {
-            "checksum": "f8ccea4289a903536726853f3f8ae4d4",
-            "size": 1699,
-            "uri": "https://{canondata_backend}/1936997/db38af28837978b5cfc77f77b59d165785593692/resource.tar.gz#test.test_expr-to_hashed_set_varstruct_key-default.txt-Debug_/opt.yql_patched"
+            "checksum": "7fb3fb8b72d96182dfaa30b0be8c825e",
+            "size": 1939,
+            "uri": "https://{canondata_backend}/1781765/f9e777fe209fab69cd7ccadffec108363985195b/resource.tar.gz#test.test_expr-to_hashed_set_varstruct_key-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[expr-to_hashed_set_varstruct_key-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
index ededb21a06d0..ff61097f4308 100644
--- a/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
+++ b/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
@@ -4712,9 +4712,9 @@
     ],
     "test_sql2yql.test[expr-as_dict_dict_key]": [
         {
-            "checksum": "1d4d57e19c5b10a67728eb0781babf91",
-            "size": 6402,
-            "uri": "https://{canondata_backend}/1936997/00f46808be87e2ae2d4ac3ac45675b659c5ace45/resource.tar.gz#test_sql2yql.test_expr-as_dict_dict_key_/sql.yql"
+            "checksum": "6fcb796e0181a5984b16a053d0fb7d84",
+            "size": 6638,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql2yql.test_expr-as_dict_dict_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-as_dict_implicit_cast]": [
@@ -4726,16 +4726,16 @@
     ],
     "test_sql2yql.test[expr-as_dict_list_key]": [
         {
-            "checksum": "0a125f8b75410b47f5febaa056fe1e9d",
-            "size": 4398,
-            "uri": "https://{canondata_backend}/1936997/00f46808be87e2ae2d4ac3ac45675b659c5ace45/resource.tar.gz#test_sql2yql.test_expr-as_dict_list_key_/sql.yql"
+            "checksum": "3aa48f61a6020241b46af4402738be9e",
+            "size": 4390,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql2yql.test_expr-as_dict_list_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-as_dict_tuple_key]": [
         {
-            "checksum": "32e86d93a77896f158f6e95d1a246640",
-            "size": 10872,
-            "uri": "https://{canondata_backend}/1936997/00f46808be87e2ae2d4ac3ac45675b659c5ace45/resource.tar.gz#test_sql2yql.test_expr-as_dict_tuple_key_/sql.yql"
+            "checksum": "13574ec11742300684bf9a9f9ea71a58",
+            "size": 10999,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql2yql.test_expr-as_dict_tuple_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-as_set]": [
@@ -5517,9 +5517,9 @@
     ],
     "test_sql2yql.test[expr-pickle]": [
         {
-            "checksum": "8dd5ac02491f7bd2b5102f28e84ce92d",
-            "size": 6314,
-            "uri": "https://{canondata_backend}/1936997/00f46808be87e2ae2d4ac3ac45675b659c5ace45/resource.tar.gz#test_sql2yql.test_expr-pickle_/sql.yql"
+            "checksum": "7956ceb1a60767cf0e04bb857cd708e6",
+            "size": 6514,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql2yql.test_expr-pickle_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-replace_member]": [
@@ -5601,9 +5601,9 @@
     ],
     "test_sql2yql.test[expr-to_hashed_dict_dict_key]": [
         {
-            "checksum": "3cbe41a04a88147a4ec2d85c05e0ed18",
-            "size": 25474,
-            "uri": "https://{canondata_backend}/1936997/00f46808be87e2ae2d4ac3ac45675b659c5ace45/resource.tar.gz#test_sql2yql.test_expr-to_hashed_dict_dict_key_/sql.yql"
+            "checksum": "8cdbcf3eff2c2e5c2ed1142d914cd5f8",
+            "size": 25996,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql2yql.test_expr-to_hashed_dict_dict_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-to_hashed_dict_list_key]": [
@@ -5636,9 +5636,9 @@
     ],
     "test_sql2yql.test[expr-to_hashed_set_dict_key]": [
         {
-            "checksum": "8ed1aaefb02729e244d3098ebc6673a4",
-            "size": 13610,
-            "uri": "https://{canondata_backend}/1936997/00f46808be87e2ae2d4ac3ac45675b659c5ace45/resource.tar.gz#test_sql2yql.test_expr-to_hashed_set_dict_key_/sql.yql"
+            "checksum": "62e65949fbda64a602a593be08562568",
+            "size": 13341,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql2yql.test_expr-to_hashed_set_dict_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-to_hashed_set_list_key]": [
@@ -5650,65 +5650,65 @@
     ],
     "test_sql2yql.test[expr-to_hashed_set_tuple_key]": [
         {
-            "checksum": "913471d5152e8a1495ffd24a5518a74f",
-            "size": 29956,
-            "uri": "https://{canondata_backend}/1936997/00f46808be87e2ae2d4ac3ac45675b659c5ace45/resource.tar.gz#test_sql2yql.test_expr-to_hashed_set_tuple_key_/sql.yql"
+            "checksum": "c6f88f2362e101c5e46c71dca71e8627",
+            "size": 29065,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql2yql.test_expr-to_hashed_set_tuple_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-to_hashed_set_varstruct_key]": [
         {
-            "checksum": "173bd2ff1880d3e56797f5712ccb4bdf",
-            "size": 15826,
-            "uri": "https://{canondata_backend}/1936997/00f46808be87e2ae2d4ac3ac45675b659c5ace45/resource.tar.gz#test_sql2yql.test_expr-to_hashed_set_varstruct_key_/sql.yql"
+            "checksum": "ffe98985d4f0883ba35bfde6ac4322d8",
+            "size": 14975,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql2yql.test_expr-to_hashed_set_varstruct_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-to_hashed_set_vartuple_key]": [
         {
-            "checksum": "bac1f30b7f013be38e5201465aab98c5",
-            "size": 14874,
-            "uri": "https://{canondata_backend}/1936997/00f46808be87e2ae2d4ac3ac45675b659c5ace45/resource.tar.gz#test_sql2yql.test_expr-to_hashed_set_vartuple_key_/sql.yql"
+            "checksum": "5a6b158cb3991df52c98b5c52b754225",
+            "size": 14125,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql2yql.test_expr-to_hashed_set_vartuple_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-to_sorted_dict_list_key]": [
         {
-            "checksum": "84815aebd168b65a951dc65ed1c35d9b",
-            "size": 10762,
-            "uri": "https://{canondata_backend}/1936997/00f46808be87e2ae2d4ac3ac45675b659c5ace45/resource.tar.gz#test_sql2yql.test_expr-to_sorted_dict_list_key_/sql.yql"
+            "checksum": "8773964a35fab360505f1180703c23f3",
+            "size": 10119,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql2yql.test_expr-to_sorted_dict_list_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-to_sorted_dict_tuple_key]": [
         {
-            "checksum": "f5a079a8c9117fe7ed15df90267dac45",
-            "size": 26788,
-            "uri": "https://{canondata_backend}/1936997/00f46808be87e2ae2d4ac3ac45675b659c5ace45/resource.tar.gz#test_sql2yql.test_expr-to_sorted_dict_tuple_key_/sql.yql"
+            "checksum": "8723a3ae1e5977ee7705c5dc38ba5aba",
+            "size": 26329,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql2yql.test_expr-to_sorted_dict_tuple_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-to_sorted_dict_vartuple_key]": [
         {
-            "checksum": "ba238cfa7f9cafb1740a3ed0fd76d491",
-            "size": 11946,
-            "uri": "https://{canondata_backend}/1936997/00f46808be87e2ae2d4ac3ac45675b659c5ace45/resource.tar.gz#test_sql2yql.test_expr-to_sorted_dict_vartuple_key_/sql.yql"
+            "checksum": "ec51d34ba5c27147d93363d3a5e66647",
+            "size": 11563,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql2yql.test_expr-to_sorted_dict_vartuple_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-to_sorted_set_list_key]": [
         {
-            "checksum": "a414cddf6f9662e82806d2f43d4ccefa",
-            "size": 5278,
-            "uri": "https://{canondata_backend}/1936997/00f46808be87e2ae2d4ac3ac45675b659c5ace45/resource.tar.gz#test_sql2yql.test_expr-to_sorted_set_list_key_/sql.yql"
+            "checksum": "57493a549e9d33a5c0360ebc074304f5",
+            "size": 5160,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql2yql.test_expr-to_sorted_set_list_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-to_sorted_set_tuple_key]": [
         {
-            "checksum": "e1f1a65b947fefdb8fe1d90a722d3751",
-            "size": 12906,
-            "uri": "https://{canondata_backend}/1936997/00f46808be87e2ae2d4ac3ac45675b659c5ace45/resource.tar.gz#test_sql2yql.test_expr-to_sorted_set_tuple_key_/sql.yql"
+            "checksum": "ff56e1467b53768618d7bd8a5be81c32",
+            "size": 12759,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql2yql.test_expr-to_sorted_set_tuple_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-to_sorted_set_vartuple_key]": [
         {
-            "checksum": "ff8ef8b0132d3b210151ec7ea55e1b41",
-            "size": 5942,
-            "uri": "https://{canondata_backend}/1936997/00f46808be87e2ae2d4ac3ac45675b659c5ace45/resource.tar.gz#test_sql2yql.test_expr-to_sorted_set_vartuple_key_/sql.yql"
+            "checksum": "41c6d697f88dd1b65aeca8ab703bbe69",
+            "size": 5769,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql2yql.test_expr-to_sorted_set_vartuple_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-type_as_key]": [
@@ -21960,9 +21960,9 @@
     ],
     "test_sql_format.test[expr-as_dict_dict_key]": [
         {
-            "checksum": "c913c6fec3e2c5e87945b5171fd772fe",
-            "size": 522,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_expr-as_dict_dict_key_/formatted.sql"
+            "checksum": "1bce7a4ea240952aae7a6352284e200c",
+            "size": 1000,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql_format.test_expr-as_dict_dict_key_/formatted.sql"
         }
     ],
     "test_sql_format.test[expr-as_dict_implicit_cast]": [
@@ -21974,16 +21974,16 @@
     ],
     "test_sql_format.test[expr-as_dict_list_key]": [
         {
-            "checksum": "0e548f6e5eae80bf8cd57b9d07bdb448",
-            "size": 340,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_expr-as_dict_list_key_/formatted.sql"
+            "checksum": "02faa702bfe667791008ef187fc1f568",
+            "size": 362,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql_format.test_expr-as_dict_list_key_/formatted.sql"
         }
     ],
     "test_sql_format.test[expr-as_dict_tuple_key]": [
         {
-            "checksum": "295e0d86b9672d9228c805be1e0a2148",
-            "size": 877,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_expr-as_dict_tuple_key_/formatted.sql"
+            "checksum": "4461e884084eb500b5cca1e7e89a545f",
+            "size": 943,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql_format.test_expr-as_dict_tuple_key_/formatted.sql"
         }
     ],
     "test_sql_format.test[expr-as_set]": [
@@ -22765,9 +22765,9 @@
     ],
     "test_sql_format.test[expr-pickle]": [
         {
-            "checksum": "38921b4d48a23801f96890c2ec48825f",
-            "size": 534,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_expr-pickle_/formatted.sql"
+            "checksum": "4e7e8906c936c612c7156553ae07db63",
+            "size": 576,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql_format.test_expr-pickle_/formatted.sql"
         }
     ],
     "test_sql_format.test[expr-replace_member]": [
@@ -22849,9 +22849,9 @@
     ],
     "test_sql_format.test[expr-to_hashed_dict_dict_key]": [
         {
-            "checksum": "50607921d97093aa5965d415a03f97dd",
-            "size": 1300,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_expr-to_hashed_dict_dict_key_/formatted.sql"
+            "checksum": "0887fe4d950c58dd38be6a72e93b7e08",
+            "size": 3184,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql_format.test_expr-to_hashed_dict_dict_key_/formatted.sql"
         }
     ],
     "test_sql_format.test[expr-to_hashed_dict_list_key]": [
@@ -22884,9 +22884,9 @@
     ],
     "test_sql_format.test[expr-to_hashed_set_dict_key]": [
         {
-            "checksum": "1ac6c3c96cfcd47b00a617469de5d033",
-            "size": 830,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_expr-to_hashed_set_dict_key_/formatted.sql"
+            "checksum": "43044cffadfa4373e90c4aff429111f7",
+            "size": 1490,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql_format.test_expr-to_hashed_set_dict_key_/formatted.sql"
         }
     ],
     "test_sql_format.test[expr-to_hashed_set_list_key]": [
@@ -22898,65 +22898,65 @@
     ],
     "test_sql_format.test[expr-to_hashed_set_tuple_key]": [
         {
-            "checksum": "db8c24d8c28692e7ae0ada9f102a28bc",
-            "size": 2025,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_expr-to_hashed_set_tuple_key_/formatted.sql"
+            "checksum": "4bd363045d43e8d785cd136fd448c54a",
+            "size": 2157,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql_format.test_expr-to_hashed_set_tuple_key_/formatted.sql"
         }
     ],
     "test_sql_format.test[expr-to_hashed_set_varstruct_key]": [
         {
-            "checksum": "f7a729227d9aba9fed01b058f468456d",
-            "size": 834,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_expr-to_hashed_set_varstruct_key_/formatted.sql"
+            "checksum": "1e98bf98d3580532689bdf6757b6667a",
+            "size": 878,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql_format.test_expr-to_hashed_set_varstruct_key_/formatted.sql"
         }
     ],
     "test_sql_format.test[expr-to_hashed_set_vartuple_key]": [
         {
-            "checksum": "c8095c51c9977e83435fbdd0c1d4cff6",
-            "size": 830,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_expr-to_hashed_set_vartuple_key_/formatted.sql"
+            "checksum": "15aca1a42dd65fb54b79dc2aac28759c",
+            "size": 874,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql_format.test_expr-to_hashed_set_vartuple_key_/formatted.sql"
         }
     ],
     "test_sql_format.test[expr-to_sorted_dict_list_key]": [
         {
-            "checksum": "74cd11b078d4cfa012dd43e5836b3565",
-            "size": 656,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_expr-to_sorted_dict_list_key_/formatted.sql"
+            "checksum": "c43b36618141ec415e55e092d4932cec",
+            "size": 660,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql_format.test_expr-to_sorted_dict_list_key_/formatted.sql"
         }
     ],
     "test_sql_format.test[expr-to_sorted_dict_tuple_key]": [
         {
-            "checksum": "0ba50f1cf322b776c74ad687930549c9",
-            "size": 1741,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_expr-to_sorted_dict_tuple_key_/formatted.sql"
+            "checksum": "84a54e9d762c0e3a3fe1e12bae07ee4e",
+            "size": 1873,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql_format.test_expr-to_sorted_dict_tuple_key_/formatted.sql"
         }
     ],
     "test_sql_format.test[expr-to_sorted_dict_vartuple_key]": [
         {
-            "checksum": "7a30ce093ad654789e8c428f4bdbcd40",
-            "size": 660,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_expr-to_sorted_dict_vartuple_key_/formatted.sql"
+            "checksum": "7b9d637dee9fd86fa50c8fe10c3e247a",
+            "size": 704,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql_format.test_expr-to_sorted_dict_vartuple_key_/formatted.sql"
         }
     ],
     "test_sql_format.test[expr-to_sorted_set_list_key]": [
         {
-            "checksum": "d10bb927ec050011db0f56c0fb6c29e0",
-            "size": 400,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_expr-to_sorted_set_list_key_/formatted.sql"
+            "checksum": "a60822a3ce1414af61142f0a033a7067",
+            "size": 422,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql_format.test_expr-to_sorted_set_list_key_/formatted.sql"
         }
     ],
     "test_sql_format.test[expr-to_sorted_set_tuple_key]": [
         {
-            "checksum": "66d9bb14775af66f5d3f022aceac6f01",
-            "size": 1053,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_expr-to_sorted_set_tuple_key_/formatted.sql"
+            "checksum": "a526cdfb3edb1553d1c0bbee923ae1dd",
+            "size": 1119,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql_format.test_expr-to_sorted_set_tuple_key_/formatted.sql"
         }
     ],
     "test_sql_format.test[expr-to_sorted_set_vartuple_key]": [
         {
-            "checksum": "df5913e6022bd8dc7aa68a389acff107",
-            "size": 439,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_expr-to_sorted_set_vartuple_key_/formatted.sql"
+            "checksum": "3ce2add2330f6f55188b28916029ef5e",
+            "size": 461,
+            "uri": "https://{canondata_backend}/1936842/9dd3254ebbd843324a90765405d3999550dc8d63/resource.tar.gz#test_sql_format.test_expr-to_sorted_set_vartuple_key_/formatted.sql"
         }
     ],
     "test_sql_format.test[expr-type_as_key]": [
diff --git a/ydb/library/yql/tests/sql/suites/expr/as_dict_dict_key.sql b/ydb/library/yql/tests/sql/suites/expr/as_dict_dict_key.sql
index 694759be262e..40024336bf5b 100644
--- a/ydb/library/yql/tests/sql/suites/expr/as_dict_dict_key.sql
+++ b/ydb/library/yql/tests/sql/suites/expr/as_dict_dict_key.sql
@@ -17,6 +17,8 @@ $d = AsDict(
     AsTuple($d2, 32)
 );
 
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(ListFlatten(ListMap(DictItems($d), ($x) -> {return ListMap(DictItems($x.0), ($y) -> {return ($y, $x.1)})}))),
+    ListSort(ListFlatten(ListMap(DictKeys($d), ($x) -> {return DictItems($x)}))),
+    ListSort(DictPayloads($d));
 select DictLookup($d,$d1), DictLookup($d,$d3);
 select DictContains($d,$d1), DictContains($d,$d3);
diff --git a/ydb/library/yql/tests/sql/suites/expr/as_dict_list_key.sql b/ydb/library/yql/tests/sql/suites/expr/as_dict_list_key.sql
index 672761b56f7b..1d105cfdd24f 100644
--- a/ydb/library/yql/tests/sql/suites/expr/as_dict_list_key.sql
+++ b/ydb/library/yql/tests/sql/suites/expr/as_dict_list_key.sql
@@ -4,6 +4,6 @@ $d = AsDict(
     AsTuple(AsList(1,2),"bar")
 );
 
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,AsList(1,2)), DictLookup($d,AsList(1,3));
 select DictContains($d,AsList(1,2)), DictContains($d,AsList(1,3));
diff --git a/ydb/library/yql/tests/sql/suites/expr/as_dict_tuple_key.sql b/ydb/library/yql/tests/sql/suites/expr/as_dict_tuple_key.sql
index 8bf1f4a940c2..78c8bb39244c 100644
--- a/ydb/library/yql/tests/sql/suites/expr/as_dict_tuple_key.sql
+++ b/ydb/library/yql/tests/sql/suites/expr/as_dict_tuple_key.sql
@@ -4,7 +4,7 @@ $d = AsDict(
     AsTuple(AsTuple(),"bar")
 );
 
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,AsTuple());
 select DictContains($d,AsTuple());
 
@@ -13,7 +13,7 @@ $d = AsDict(
     AsTuple(AsTuple(2),"bar")
 );
 
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,AsTuple(1)),DictLookup($d,AsTuple(3));
 select DictContains($d,AsTuple(1)),DictContains($d,AsTuple(3));
 
@@ -22,6 +22,6 @@ $d = AsDict(
     AsTuple(AsTuple(1,3),"bar")
 );
 
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,AsTuple(1,2)),DictLookup($d,AsTuple(1,4));
 select DictContains($d,AsTuple(1,2)),DictContains($d,AsTuple(1,4));
diff --git a/ydb/library/yql/tests/sql/suites/expr/pickle.sql b/ydb/library/yql/tests/sql/suites/expr/pickle.sql
index 09695e7c03e2..2279d409c0b6 100644
--- a/ydb/library/yql/tests/sql/suites/expr/pickle.sql
+++ b/ydb/library/yql/tests/sql/suites/expr/pickle.sql
@@ -9,5 +9,5 @@ $p4 = Pickle(ToDict(ListReverse($lst)));
 $p5 = StablePickle(ToDict(ListReverse($lst)));
 select $p1, Ensure($p2, $p1 != $p2), Ensure($p3, $p2 = $p3),
     Ensure($p4, $p4 != $p1), Ensure($p5, $p5 = $p2);
-select Unpickle(TypeOf(ToDict($lst)),$p1), Unpickle(TypeOf(ToDict($lst)),$p2);
+select ListSort(DictItems(Unpickle(TypeOf(ToDict($lst)),$p1))), ListSort(DictItems(Unpickle(TypeOf(ToDict($lst)),$p2)));
 
diff --git a/ydb/library/yql/tests/sql/suites/expr/to_hashed_dict_dict_key.sql b/ydb/library/yql/tests/sql/suites/expr/to_hashed_dict_dict_key.sql
index f33a0ad86b8d..0c74dc8dd132 100644
--- a/ydb/library/yql/tests/sql/suites/expr/to_hashed_dict_dict_key.sql
+++ b/ydb/library/yql/tests/sql/suites/expr/to_hashed_dict_dict_key.sql
@@ -13,21 +13,28 @@ $l = AsList(
 );
 
 $d = ToDict($l);
-select DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(ListFlatten(ListMap(DictItems($d), ($x) -> {return ListMap(DictItems($x.0), ($y) -> {return ($y, $x.1)})}))),
+    ListSort(ListFlatten(ListMap(DictKeys($d), ($x) -> {return DictItems($x)}))),
+    ListSort(DictPayloads($d));
 select DictLookup($d,$i), DictLookup($d,$k);
 select DictContains($d,$i), DictContains($d,$k);
 
 $d = ToMultiDict($l);
-select DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(ListFlatten(ListMap(DictItems($d), ($x) -> {return ListMap(DictItems($x.0), ($y) -> {return ($y, $x.1)})}))),
+    ListSort(ListFlatten(ListMap(DictKeys($d), ($x) -> {return DictItems($x)}))),
+    ListSort(DictPayloads($d));
 select DictLookup($d,$i), DictLookup($d,$k);
 select DictContains($d,$i), DictContains($d,$k);
 
 $d = Yql::ToDict($l,$first,$second,AsTuple(AsAtom("Compact"),AsAtom("Hashed"),AsAtom("One")));
-select DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(ListFlatten(ListMap(DictItems($d), ($x) -> {return ListMap(DictItems($x.0), ($y) -> {return ($y, $x.1)})}))),
+    ListSort(ListFlatten(ListMap(DictKeys($d), ($x) -> {return DictItems($x)}))),
+    ListSort(DictPayloads($d));
 select DictLookup($d,$i), DictLookup($d,$k);
 select DictContains($d,$i), DictContains($d,$k);
 
 $d = Yql::ToDict($l,$first,$second,AsTuple(AsAtom("Compact"),AsAtom("Hashed"),AsAtom("Many")));
-select DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(ListFlatten(ListMap(DictItems($d), ($x) -> {return ListMap(DictItems($x.0), ($y) -> {return ($y, $x.1)})}))),
+    ListSort(ListFlatten(ListMap(DictKeys($d), ($x) -> {return DictItems($x)}))),
+    ListSort(DictPayloads($d));
 select DictLookup($d,$i), DictLookup($d,$k);
-select DictContains($d,$i), DictContains($d,$k);
diff --git a/ydb/library/yql/tests/sql/suites/expr/to_hashed_set_dict_key.sql b/ydb/library/yql/tests/sql/suites/expr/to_hashed_set_dict_key.sql
index 3c96ad61c28e..7bd22f103d77 100644
--- a/ydb/library/yql/tests/sql/suites/expr/to_hashed_set_dict_key.sql
+++ b/ydb/library/yql/tests/sql/suites/expr/to_hashed_set_dict_key.sql
@@ -13,11 +13,16 @@ $l = AsList(
 );
 
 $d = ToDict($l);
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(ListFlatten(ListMap(DictItems($d), ($x) -> {return DictItems($x.0)}))),
+    ListSort(ListFlatten(ListMap(DictKeys($d), ($x) -> {return DictItems($x)}))),
+    DictPayloads($d);
 select DictLookup($d,$i), DictLookup($d,$k);
 select DictContains($d,$i), DictContains($d,$k);
 
 $d = Yql::ToDict($l,$first,$second,AsTuple(AsAtom("Compact"),AsAtom("Hashed"),AsAtom("One")));
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(ListFlatten(ListMap(DictItems($d), ($x) -> {return DictItems($x.0)}))),
+    ListSort(ListFlatten(ListMap(DictKeys($d), ($x) -> {return DictItems($x)}))),
+    DictPayloads($d);
 select DictLookup($d,$i), DictLookup($d,$k);
 select DictContains($d,$i), DictContains($d,$k);
+
diff --git a/ydb/library/yql/tests/sql/suites/expr/to_hashed_set_tuple_key.sql b/ydb/library/yql/tests/sql/suites/expr/to_hashed_set_tuple_key.sql
index 8f96778b9216..4d722ca48730 100644
--- a/ydb/library/yql/tests/sql/suites/expr/to_hashed_set_tuple_key.sql
+++ b/ydb/library/yql/tests/sql/suites/expr/to_hashed_set_tuple_key.sql
@@ -9,12 +9,12 @@ $l = AsList(
 );
 
 $d = ToDict($l);
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,AsTuple());
 select DictContains($d,AsTuple());
 
 $d = Yql::ToDict($l,$first,$second,AsTuple(AsAtom("Compact"),AsAtom("Hashed"),AsAtom("One")));
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,AsTuple());
 select DictContains($d,AsTuple());
 
@@ -25,12 +25,12 @@ $l = AsList(
 );
 
 $d = ToDict($l);
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,AsTuple(2)), DictLookup($d,AsTuple(3));
 select DictContains($d,AsTuple(2)), DictContains($d,AsTuple(3));
 
 $d = Yql::ToDict($l,$first,$second,AsTuple(AsAtom("Compact"),AsAtom("Hashed"),AsAtom("One")));
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,AsTuple(2)), DictLookup($d,AsTuple(3));
 select DictContains($d,AsTuple(2)), DictContains($d,AsTuple(3));
 
@@ -41,12 +41,12 @@ $l = AsList(
 );
 
 $d = ToDict($l);
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,AsTuple(1,2)), DictLookup($d,AsTuple(1,4));
 select DictContains($d,AsTuple(1,2)), DictContains($d,AsTuple(1,4));
 
 $d = Yql::ToDict($l,$first,$second,AsTuple(AsAtom("Compact"),AsAtom("Hashed"),AsAtom("One")));
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,AsTuple(1,2)), DictLookup($d,AsTuple(1,4));
 select DictContains($d,AsTuple(1,2)), DictContains($d,AsTuple(1,4));
 
diff --git a/ydb/library/yql/tests/sql/suites/expr/to_hashed_set_varstruct_key.sql b/ydb/library/yql/tests/sql/suites/expr/to_hashed_set_varstruct_key.sql
index a6360bec1596..9588c5719fa6 100644
--- a/ydb/library/yql/tests/sql/suites/expr/to_hashed_set_varstruct_key.sql
+++ b/ydb/library/yql/tests/sql/suites/expr/to_hashed_set_varstruct_key.sql
@@ -14,11 +14,11 @@ $l = AsList(
 );
 
 $d = ToDict($l);
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,$v1), DictLookup($d,$v3);
 select DictContains($d,$v1), DictContains($d,$v3);
 
 $d = Yql::ToDict($l,$first,$second,AsTuple(AsAtom("Compact"),AsAtom("Hashed"),AsAtom("One")));
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,$v1), DictLookup($d,$v3);
 select DictContains($d,$v1), DictContains($d,$v3);
diff --git a/ydb/library/yql/tests/sql/suites/expr/to_hashed_set_vartuple_key.sql b/ydb/library/yql/tests/sql/suites/expr/to_hashed_set_vartuple_key.sql
index 9835d685a2f1..e769b4f849f9 100644
--- a/ydb/library/yql/tests/sql/suites/expr/to_hashed_set_vartuple_key.sql
+++ b/ydb/library/yql/tests/sql/suites/expr/to_hashed_set_vartuple_key.sql
@@ -14,11 +14,11 @@ $l = AsList(
 );
 
 $d = ToDict($l);
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,$v1), DictLookup($d,$v3);
 select DictContains($d,$v1), DictContains($d,$v3);
 
 $d = Yql::ToDict($l,$first,$second,AsTuple(AsAtom("Compact"),AsAtom("Hashed"),AsAtom("One")));
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,$v1), DictLookup($d,$v3);
 select DictContains($d,$v1), DictContains($d,$v3);
diff --git a/ydb/library/yql/tests/sql/suites/expr/to_sorted_dict_list_key.sql b/ydb/library/yql/tests/sql/suites/expr/to_sorted_dict_list_key.sql
index 0089a3c39dc8..d1a477381f9f 100644
--- a/ydb/library/yql/tests/sql/suites/expr/to_sorted_dict_list_key.sql
+++ b/ydb/library/yql/tests/sql/suites/expr/to_sorted_dict_list_key.sql
@@ -6,11 +6,11 @@ $l = AsList(
 );
 
 $d = ToSortedDict($l);
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),DictKeys($d),DictPayloads($d);
 select DictLookup($d,AsList(1,2)), DictLookup($d,AsList(1,3));
 select DictContains($d,AsList(1,2)), DictContains($d,AsList(1,3));
 
 $d = ToSortedMultiDict($l);
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),DictKeys($d),DictPayloads($d);
 select DictLookup($d,AsList(1,2)), DictLookup($d,AsList(1,3));
 select DictContains($d,AsList(1,2)), DictContains($d,AsList(1,3));
diff --git a/ydb/library/yql/tests/sql/suites/expr/to_sorted_dict_tuple_key.sql b/ydb/library/yql/tests/sql/suites/expr/to_sorted_dict_tuple_key.sql
index 1b8dc806b3d4..c7ab81172ee3 100644
--- a/ydb/library/yql/tests/sql/suites/expr/to_sorted_dict_tuple_key.sql
+++ b/ydb/library/yql/tests/sql/suites/expr/to_sorted_dict_tuple_key.sql
@@ -7,12 +7,12 @@ $l = AsList(
 );
 
 $d = ToSortedDict($l);
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,AsTuple());
 select DictContains($d,AsTuple());
 
 $d = ToSortedMultiDict($l);
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,AsTuple());
 select DictContains($d,AsTuple());
 
@@ -23,12 +23,12 @@ $l = AsList(
 );
 
 $d = ToSortedDict($l);
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,AsTuple(2)), DictLookup($d,AsTuple(3));
 select DictContains($d,AsTuple(2)), DictContains($d,AsTuple(3));
 
 $d = ToSortedMultiDict($l);
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,AsTuple(2)), DictLookup($d,AsTuple(3));
 select DictContains($d,AsTuple(2)), DictContains($d,AsTuple(3));
 
@@ -39,12 +39,12 @@ $l = AsList(
 );
 
 $d = ToSortedDict($l);
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,AsTuple(1,2)), DictLookup($d,AsTuple(1,4));
 select DictContains($d,AsTuple(1,2)), DictContains($d,AsTuple(1,4));
 
 $d = ToSortedMultiDict($l);
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,AsTuple(1,2)), DictLookup($d,AsTuple(1,4));
 select DictContains($d,AsTuple(1,2)), DictContains($d,AsTuple(1,4));
 
diff --git a/ydb/library/yql/tests/sql/suites/expr/to_sorted_dict_vartuple_key.sql b/ydb/library/yql/tests/sql/suites/expr/to_sorted_dict_vartuple_key.sql
index 17dc4f28bac5..3581c0963d97 100644
--- a/ydb/library/yql/tests/sql/suites/expr/to_sorted_dict_vartuple_key.sql
+++ b/ydb/library/yql/tests/sql/suites/expr/to_sorted_dict_vartuple_key.sql
@@ -10,11 +10,11 @@ $l = AsList(
 );
 
 $d = ToSortedDict($l);
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,$v1), DictLookup($d,$v3);
 select DictContains($d,$v1), DictContains($d,$v3);
 
 $d = ToSortedMultiDict($l);
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,$v1), DictLookup($d,$v3);
 select DictContains($d,$v1), DictContains($d,$v3);
diff --git a/ydb/library/yql/tests/sql/suites/expr/to_sorted_set_list_key.sql b/ydb/library/yql/tests/sql/suites/expr/to_sorted_set_list_key.sql
index 17066cd730a1..323d74f550f0 100644
--- a/ydb/library/yql/tests/sql/suites/expr/to_sorted_set_list_key.sql
+++ b/ydb/library/yql/tests/sql/suites/expr/to_sorted_set_list_key.sql
@@ -7,6 +7,6 @@ $l = AsList(
 );
 
 $d = ToSortedDict($l);
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,AsList(1,2)), DictLookup($d,AsList(1,3));
 select DictContains($d,AsList(1,2)), DictContains($d,AsList(1,3));
diff --git a/ydb/library/yql/tests/sql/suites/expr/to_sorted_set_tuple_key.sql b/ydb/library/yql/tests/sql/suites/expr/to_sorted_set_tuple_key.sql
index 16bd2978457b..792ac7453359 100644
--- a/ydb/library/yql/tests/sql/suites/expr/to_sorted_set_tuple_key.sql
+++ b/ydb/library/yql/tests/sql/suites/expr/to_sorted_set_tuple_key.sql
@@ -7,7 +7,7 @@ $l = AsList(
 );
 
 $d = ToSortedDict($l);
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,AsTuple());
 select DictContains($d,AsTuple());
 
@@ -18,7 +18,7 @@ $l = AsList(
 );
 
 $d = ToSortedDict($l);
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,AsTuple(2)), DictLookup($d,AsTuple(3));
 select DictContains($d,AsTuple(2)), DictContains($d,AsTuple(3));
 
@@ -29,7 +29,7 @@ $l = AsList(
 );
 
 $d = ToSortedDict($l);
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,AsTuple(1,2)), DictLookup($d,AsTuple(1,4));
 select DictContains($d,AsTuple(1,2)), DictContains($d,AsTuple(1,4));
 
diff --git a/ydb/library/yql/tests/sql/suites/expr/to_sorted_set_vartuple_key.sql b/ydb/library/yql/tests/sql/suites/expr/to_sorted_set_vartuple_key.sql
index 136aed9d110f..04e42b7cd363 100644
--- a/ydb/library/yql/tests/sql/suites/expr/to_sorted_set_vartuple_key.sql
+++ b/ydb/library/yql/tests/sql/suites/expr/to_sorted_set_vartuple_key.sql
@@ -10,6 +10,6 @@ $l = AsList(
 );
 
 $d = ToSortedDict($l);
-select $d,DictKeys($d),DictPayloads($d),DictItems($d);
+select ListSort(DictItems($d)),ListSort(DictKeys($d)),ListSort(DictPayloads($d));
 select DictLookup($d,$v1), DictLookup($d,$v3);
 select DictContains($d,$v1), DictContains($d,$v3);
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part0/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part0/canondata/result.json
index b1e91ac0680f..af3aaf2278e4 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part0/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part0/canondata/result.json
@@ -721,9 +721,9 @@
     ],
     "test.test[expr-to_sorted_set_vartuple_key-default.txt-Debug]": [
         {
-            "checksum": "19305f45fbfb9f172538fef7db532a63",
-            "size": 1002,
-            "uri": "https://{canondata_backend}/1031349/89a622bf89351492624243ee51154509d15d9fb8/resource.tar.gz#test.test_expr-to_sorted_set_vartuple_key-default.txt-Debug_/opt.yql"
+            "checksum": "7fd22f6ab84033d96b0f0fb499c3640b",
+            "size": 1132,
+            "uri": "https://{canondata_backend}/1600758/35b0d7af98882cfe3cbc5c2970267ab83ff06161/resource.tar.gz#test.test_expr-to_sorted_set_vartuple_key-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[expr-to_sorted_set_vartuple_key-default.txt-Plan]": [
@@ -735,9 +735,9 @@
     ],
     "test.test[expr-to_sorted_set_vartuple_key-default.txt-Results]": [
         {
-            "checksum": "4418f9c41376aa850343ba3d37905f35",
-            "size": 8136,
-            "uri": "https://{canondata_backend}/1031349/89a622bf89351492624243ee51154509d15d9fb8/resource.tar.gz#test.test_expr-to_sorted_set_vartuple_key-default.txt-Results_/results.txt"
+            "checksum": "df40bdac2d54b8a0ee5051b82c5f3072",
+            "size": 6422,
+            "uri": "https://{canondata_backend}/1600758/35b0d7af98882cfe3cbc5c2970267ab83ff06161/resource.tar.gz#test.test_expr-to_sorted_set_vartuple_key-default.txt-Results_/results.txt"
         }
     ],
     "test.test[file-where_key_in_file_content--Debug]": [
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
index 711909603129..9f77b370ef38 100644
--- 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
@@ -809,9 +809,9 @@
     ],
     "test.test[expr-pickle-default.txt-Debug]": [
         {
-            "checksum": "0fe616b059efad35909b7a9c9cca43f8",
-            "size": 1247,
-            "uri": "https://{canondata_backend}/1924537/6033fa62c3628f7f8f85fe0b254eb896d2d9c2ce/resource.tar.gz#test.test_expr-pickle-default.txt-Debug_/opt.yql"
+            "checksum": "ba282c885adb32ac4045bf27c4330716",
+            "size": 1382,
+            "uri": "https://{canondata_backend}/1900335/85df7c14e90926d2a453f924a23e8bd12a5dbf9b/resource.tar.gz#test.test_expr-pickle-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[expr-pickle-default.txt-Plan]": [
@@ -823,9 +823,9 @@
     ],
     "test.test[expr-pickle-default.txt-Results]": [
         {
-            "checksum": "c9ee232789c814feb5c73cb9a186f086",
-            "size": 4695,
-            "uri": "https://{canondata_backend}/1924537/6033fa62c3628f7f8f85fe0b254eb896d2d9c2ce/resource.tar.gz#test.test_expr-pickle-default.txt-Results_/results.txt"
+            "checksum": "d8492618c26e6eb1ae841c1b5aaf679f",
+            "size": 5249,
+            "uri": "https://{canondata_backend}/1900335/85df7c14e90926d2a453f924a23e8bd12a5dbf9b/resource.tar.gz#test.test_expr-pickle-default.txt-Results_/results.txt"
         }
     ],
     "test.test[expr-struct_literal_bind-default.txt-Debug]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part13/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part13/canondata/result.json
index 92c1a172e9f3..27b019883bcb 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part13/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part13/canondata/result.json
@@ -780,9 +780,9 @@
     ],
     "test.test[expr-to_sorted_dict_tuple_key-default.txt-Debug]": [
         {
-            "checksum": "1089b27522625300e925d98092d5846f",
-            "size": 3848,
-            "uri": "https://{canondata_backend}/212715/e1bc1d6e31fa656365a738e65224a7c3f774bae6/resource.tar.gz#test.test_expr-to_sorted_dict_tuple_key-default.txt-Debug_/opt.yql"
+            "checksum": "5410d312f2543df52054a20f94ee5b65",
+            "size": 4530,
+            "uri": "https://{canondata_backend}/1936842/12d497d3f2a33817ae5521f6109cc83dceae16a3/resource.tar.gz#test.test_expr-to_sorted_dict_tuple_key-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[expr-to_sorted_dict_tuple_key-default.txt-Plan]": [
@@ -794,9 +794,9 @@
     ],
     "test.test[expr-to_sorted_dict_tuple_key-default.txt-Results]": [
         {
-            "checksum": "16940a998240cc99de603f459efcdbd9",
-            "size": 42667,
-            "uri": "https://{canondata_backend}/212715/e1bc1d6e31fa656365a738e65224a7c3f774bae6/resource.tar.gz#test.test_expr-to_sorted_dict_tuple_key-default.txt-Results_/results.txt"
+            "checksum": "bb21994782724ad4db64f18b8f5e5262",
+            "size": 34459,
+            "uri": "https://{canondata_backend}/1936842/12d497d3f2a33817ae5521f6109cc83dceae16a3/resource.tar.gz#test.test_expr-to_sorted_dict_tuple_key-default.txt-Results_/results.txt"
         }
     ],
     "test.test[flatten_by-flatten_expr_where--Debug]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part14/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part14/canondata/result.json
index bb2f8284f0bf..646cd26c30c6 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part14/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part14/canondata/result.json
@@ -943,30 +943,30 @@
     ],
     "test.test[expr-to_hashed_dict_dict_key-default.txt-Debug]": [
         {
-            "checksum": "eaf7ae5b48520c45192f828c66a7bae7",
-            "size": 2573,
-            "uri": "https://{canondata_backend}/1923547/5154c8bd8ef9ead4f609771f831f20c15e795571/resource.tar.gz#test.test_expr-to_hashed_dict_dict_key-default.txt-Debug_/opt.yql"
+            "checksum": "440b86f3823ca812575791c8ea33d195",
+            "size": 3384,
+            "uri": "https://{canondata_backend}/1937367/40af353047a2965dc4907c6a6b7a0b86a14045dd/resource.tar.gz#test.test_expr-to_hashed_dict_dict_key-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[expr-to_hashed_dict_dict_key-default.txt-Plan]": [
         {
-            "checksum": "8ddfa95f10135fbea51411372a704ae9",
-            "size": 5055,
-            "uri": "https://{canondata_backend}/1923547/5154c8bd8ef9ead4f609771f831f20c15e795571/resource.tar.gz#test.test_expr-to_hashed_dict_dict_key-default.txt-Plan_/plan.txt"
+            "checksum": "f74ec14f540b4bcfb6cbea8907195a7d",
+            "size": 4640,
+            "uri": "https://{canondata_backend}/1937367/40af353047a2965dc4907c6a6b7a0b86a14045dd/resource.tar.gz#test.test_expr-to_hashed_dict_dict_key-default.txt-Plan_/plan.txt"
         }
     ],
     "test.test[expr-to_hashed_dict_dict_key-default.txt-Results]": [
         {
-            "checksum": "ebf3cb7cfcfe4b8e5e7235643a990f78",
-            "size": 29856,
-            "uri": "https://{canondata_backend}/1923547/5154c8bd8ef9ead4f609771f831f20c15e795571/resource.tar.gz#test.test_expr-to_hashed_dict_dict_key-default.txt-Results_/results.txt"
+            "checksum": "eea455399faf39eb2953d85845e03aaf",
+            "size": 29527,
+            "uri": "https://{canondata_backend}/1937367/40af353047a2965dc4907c6a6b7a0b86a14045dd/resource.tar.gz#test.test_expr-to_hashed_dict_dict_key-default.txt-Results_/results.txt"
         }
     ],
     "test.test[expr-to_sorted_set_tuple_key-default.txt-Debug]": [
         {
-            "checksum": "4529be90e35ebe9a81b0a843a6a56c89",
-            "size": 2227,
-            "uri": "https://{canondata_backend}/1923547/5154c8bd8ef9ead4f609771f831f20c15e795571/resource.tar.gz#test.test_expr-to_sorted_set_tuple_key-default.txt-Debug_/opt.yql"
+            "checksum": "62336c2c5f951d195a06d02c7441b8b5",
+            "size": 2578,
+            "uri": "https://{canondata_backend}/1937367/40af353047a2965dc4907c6a6b7a0b86a14045dd/resource.tar.gz#test.test_expr-to_sorted_set_tuple_key-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[expr-to_sorted_set_tuple_key-default.txt-Plan]": [
@@ -978,9 +978,9 @@
     ],
     "test.test[expr-to_sorted_set_tuple_key-default.txt-Results]": [
         {
-            "checksum": "d9b93f67e10fddce84f884f91ef772fb",
-            "size": 18660,
-            "uri": "https://{canondata_backend}/1923547/5154c8bd8ef9ead4f609771f831f20c15e795571/resource.tar.gz#test.test_expr-to_sorted_set_tuple_key-default.txt-Results_/results.txt"
+            "checksum": "63e3dccb331faca65440260789f164a8",
+            "size": 15183,
+            "uri": "https://{canondata_backend}/1937367/40af353047a2965dc4907c6a6b7a0b86a14045dd/resource.tar.gz#test.test_expr-to_sorted_set_tuple_key-default.txt-Results_/results.txt"
         }
     ],
     "test.test[expr-variant_tuple_comp-default.txt-Debug]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part15/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part15/canondata/result.json
index d85357dc85e2..033d09bf70d1 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part15/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part15/canondata/result.json
@@ -904,9 +904,9 @@
     ],
     "test.test[expr-to_hashed_set_dict_key-default.txt-Debug]": [
         {
-            "checksum": "7627b4cf230304d6e027dd78bd404705",
-            "size": 1584,
-            "uri": "https://{canondata_backend}/1923547/61458c9c64b8429a1ff4c80acb29f295ac160173/resource.tar.gz#test.test_expr-to_hashed_set_dict_key-default.txt-Debug_/opt.yql"
+            "checksum": "b1d38285b636bbabd9862e6ac5670927",
+            "size": 1884,
+            "uri": "https://{canondata_backend}/1937367/6449e4c946f517b9d996537d215dcd352e568597/resource.tar.gz#test.test_expr-to_hashed_set_dict_key-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[expr-to_hashed_set_dict_key-default.txt-Plan]": [
@@ -918,9 +918,9 @@
     ],
     "test.test[expr-to_hashed_set_dict_key-default.txt-Results]": [
         {
-            "checksum": "56d79c0b8e2d1d2b849af9fd9b284747",
-            "size": 17294,
-            "uri": "https://{canondata_backend}/1923547/61458c9c64b8429a1ff4c80acb29f295ac160173/resource.tar.gz#test.test_expr-to_hashed_set_dict_key-default.txt-Results_/results.txt"
+            "checksum": "b24a5ce7bddc7efdf6369c763f2f6220",
+            "size": 11732,
+            "uri": "https://{canondata_backend}/1937367/6449e4c946f517b9d996537d215dcd352e568597/resource.tar.gz#test.test_expr-to_hashed_set_dict_key-default.txt-Results_/results.txt"
         }
     ],
     "test.test[hor_join-filters--Debug]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part16/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part16/canondata/result.json
index 36ec9563b837..a986362678e4 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part16/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part16/canondata/result.json
@@ -603,9 +603,9 @@
     ],
     "test.test[expr-as_dict_list_key-default.txt-Debug]": [
         {
-            "checksum": "1f12721ea5d1fa7fafdce8cad7096ad7",
-            "size": 888,
-            "uri": "https://{canondata_backend}/1924537/d66bfe69aa802f6a81aadbac897621b721f31b4b/resource.tar.gz#test.test_expr-as_dict_list_key-default.txt-Debug_/opt.yql"
+            "checksum": "fd72ffa72c4f1a72b0a302c7caa94aaf",
+            "size": 1008,
+            "uri": "https://{canondata_backend}/1931696/3a376675fd617866ad99bc01a5e0f89cf4a8b18e/resource.tar.gz#test.test_expr-as_dict_list_key-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[expr-as_dict_list_key-default.txt-Plan]": [
@@ -617,9 +617,9 @@
     ],
     "test.test[expr-as_dict_list_key-default.txt-Results]": [
         {
-            "checksum": "a696c4898bc2c31d972e221591e32327",
-            "size": 6952,
-            "uri": "https://{canondata_backend}/1924537/d66bfe69aa802f6a81aadbac897621b721f31b4b/resource.tar.gz#test.test_expr-as_dict_list_key-default.txt-Results_/results.txt"
+            "checksum": "7bc5849e1d7b365c855739671bd01887",
+            "size": 5643,
+            "uri": "https://{canondata_backend}/1931696/3a376675fd617866ad99bc01a5e0f89cf4a8b18e/resource.tar.gz#test.test_expr-as_dict_list_key-default.txt-Results_/results.txt"
         }
     ],
     "test.test[expr-as_struct_syntax-default.txt-Debug]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part17/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part17/canondata/result.json
index bf55549e6f73..3ce18585c7b7 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part17/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part17/canondata/result.json
@@ -732,9 +732,9 @@
     ],
     "test.test[expr-to_sorted_dict_vartuple_key-default.txt-Debug]": [
         {
-            "checksum": "4aed7f34b92d441d485c98f897444cba",
-            "size": 1575,
-            "uri": "https://{canondata_backend}/1923547/68f2fa8e051f31489bd496c183d28c4abddf9f68/resource.tar.gz#test.test_expr-to_sorted_dict_vartuple_key-default.txt-Debug_/opt.yql"
+            "checksum": "b46a5fdc21eb2347c94d341b2aeb1af6",
+            "size": 1816,
+            "uri": "https://{canondata_backend}/1936842/2f301e3e250e4bd26bd6321e9eb45d8338fa2a4d/resource.tar.gz#test.test_expr-to_sorted_dict_vartuple_key-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[expr-to_sorted_dict_vartuple_key-default.txt-Plan]": [
@@ -746,9 +746,9 @@
     ],
     "test.test[expr-to_sorted_dict_vartuple_key-default.txt-Results]": [
         {
-            "checksum": "71a3ce1a4faf4051e75c7c53a337a483",
-            "size": 17996,
-            "uri": "https://{canondata_backend}/1923547/68f2fa8e051f31489bd496c183d28c4abddf9f68/resource.tar.gz#test.test_expr-to_sorted_dict_vartuple_key-default.txt-Results_/results.txt"
+            "checksum": "ff79e74cf4373ccd70697f17ddce11f9",
+            "size": 14184,
+            "uri": "https://{canondata_backend}/1936842/2f301e3e250e4bd26bd6321e9eb45d8338fa2a4d/resource.tar.gz#test.test_expr-to_sorted_dict_vartuple_key-default.txt-Results_/results.txt"
         }
     ],
     "test.test[flatten_by-flatten_list_on_flatten_by--Debug]": [
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
index 6290c70720c2..d3b3585d7693 100644
--- 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
@@ -855,9 +855,9 @@
     ],
     "test.test[expr-to_sorted_dict_list_key-default.txt-Debug]": [
         {
-            "checksum": "424e637b0306b3e0612247c722171f3c",
-            "size": 1563,
-            "uri": "https://{canondata_backend}/1031349/e46c1cdc38f973a78ddcd90531a9166e543ef230/resource.tar.gz#test.test_expr-to_sorted_dict_list_key-default.txt-Debug_/opt.yql"
+            "checksum": "580b8455e3e6bbe213d173a6092a7088",
+            "size": 1629,
+            "uri": "https://{canondata_backend}/1931696/43f50b0909564fdb07507f478869930174e3c41f/resource.tar.gz#test.test_expr-to_sorted_dict_list_key-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[expr-to_sorted_dict_list_key-default.txt-Plan]": [
@@ -869,9 +869,9 @@
     ],
     "test.test[expr-to_sorted_dict_list_key-default.txt-Results]": [
         {
-            "checksum": "4870195250d775c401e59113f6252c37",
-            "size": 15290,
-            "uri": "https://{canondata_backend}/1031349/e46c1cdc38f973a78ddcd90531a9166e543ef230/resource.tar.gz#test.test_expr-to_sorted_dict_list_key-default.txt-Results_/results.txt"
+            "checksum": "f7739b4e39a2009d799b699b3f539b8b",
+            "size": 12341,
+            "uri": "https://{canondata_backend}/1931696/43f50b0909564fdb07507f478869930174e3c41f/resource.tar.gz#test.test_expr-to_sorted_dict_list_key-default.txt-Results_/results.txt"
         }
     ],
     "test.test[expr-type_as_key-default.txt-Debug]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part3/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part3/canondata/result.json
index e5b56045a85f..4ff84a7f8121 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part3/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part3/canondata/result.json
@@ -766,9 +766,9 @@
     ],
     "test.test[expr-to_sorted_set_list_key-default.txt-Debug]": [
         {
-            "checksum": "0db146c79a0b6c6283b671046ecfc614",
-            "size": 993,
-            "uri": "https://{canondata_backend}/1130705/5816433ac52c60be0011cd13d144ed294c18d9a3/resource.tar.gz#test.test_expr-to_sorted_set_list_key-default.txt-Debug_/opt.yql"
+            "checksum": "957fc7466428e30b11ab5918fcc37763",
+            "size": 1123,
+            "uri": "https://{canondata_backend}/1937027/07b136d21d62038e09177d6e3c596876643d6a60/resource.tar.gz#test.test_expr-to_sorted_set_list_key-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[expr-to_sorted_set_list_key-default.txt-Plan]": [
@@ -780,9 +780,9 @@
     ],
     "test.test[expr-to_sorted_set_list_key-default.txt-Results]": [
         {
-            "checksum": "23ccec9166b479e303e447d4f83ff36f",
-            "size": 6701,
-            "uri": "https://{canondata_backend}/1130705/5816433ac52c60be0011cd13d144ed294c18d9a3/resource.tar.gz#test.test_expr-to_sorted_set_list_key-default.txt-Results_/results.txt"
+            "checksum": "edf8455545916ca99fa4109dc9537aaa",
+            "size": 5440,
+            "uri": "https://{canondata_backend}/1937027/07b136d21d62038e09177d6e3c596876643d6a60/resource.tar.gz#test.test_expr-to_sorted_set_list_key-default.txt-Results_/results.txt"
         }
     ],
     "test.test[hor_join-out_max_outtables-default.txt-Debug]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part4/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part4/canondata/result.json
index 441418a53959..6aea59069759 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part4/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part4/canondata/result.json
@@ -572,9 +572,9 @@
     ],
     "test.test[expr-as_dict_dict_key-default.txt-Debug]": [
         {
-            "checksum": "f6cd31c0ca959e1c555b01731f3167ea",
-            "size": 1062,
-            "uri": "https://{canondata_backend}/1809005/8dae4199decf25c00a25547eb8826c81538765f7/resource.tar.gz#test.test_expr-as_dict_dict_key-default.txt-Debug_/opt.yql"
+            "checksum": "dc8624b870e8ad649525a0814703dee7",
+            "size": 1352,
+            "uri": "https://{canondata_backend}/1937367/d69732d9ae32e1051def08b389f427d0aa62f1ca/resource.tar.gz#test.test_expr-as_dict_dict_key-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[expr-as_dict_dict_key-default.txt-Plan]": [
@@ -586,9 +586,9 @@
     ],
     "test.test[expr-as_dict_dict_key-default.txt-Results]": [
         {
-            "checksum": "58442fab2b084f4187a5a29ea9371618",
-            "size": 11142,
-            "uri": "https://{canondata_backend}/1130705/3eb142a2d671fcd160f02e1d210330034d646c6c/resource.tar.gz#test.test_expr-as_dict_dict_key-default.txt-Results_/results.txt"
+            "checksum": "ca8881dc17c64fd4b63d7f49ad01045d",
+            "size": 8404,
+            "uri": "https://{canondata_backend}/1937367/d69732d9ae32e1051def08b389f427d0aa62f1ca/resource.tar.gz#test.test_expr-as_dict_dict_key-default.txt-Results_/results.txt"
         }
     ],
     "test.test[expr-int_literals_negative_typed-default.txt-Debug]": [
@@ -642,9 +642,9 @@
     ],
     "test.test[expr-to_hashed_set_vartuple_key-default.txt-Debug]": [
         {
-            "checksum": "692dff6aa0a5cad19a8aeaa8227383e2",
-            "size": 1599,
-            "uri": "https://{canondata_backend}/1871182/c50b95fdb7c8929b781a02f15a556360fd4cef36/resource.tar.gz#test.test_expr-to_hashed_set_vartuple_key-default.txt-Debug_/opt.yql"
+            "checksum": "0c292ee889fe4284f9de1414c45ce55f",
+            "size": 1840,
+            "uri": "https://{canondata_backend}/1937367/d69732d9ae32e1051def08b389f427d0aa62f1ca/resource.tar.gz#test.test_expr-to_hashed_set_vartuple_key-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[expr-to_hashed_set_vartuple_key-default.txt-Plan]": [
@@ -656,9 +656,9 @@
     ],
     "test.test[expr-to_hashed_set_vartuple_key-default.txt-Results]": [
         {
-            "checksum": "392cf8db9ab5ec2305e8ce7fd2858d75",
-            "size": 16270,
-            "uri": "https://{canondata_backend}/1130705/70a77fcde5e4e89982dbecb16c685f3e896fdbc7/resource.tar.gz#test.test_expr-to_hashed_set_vartuple_key-default.txt-Results_/results.txt"
+            "checksum": "9ac69cafc2075ac8c8f20e758039bb66",
+            "size": 12842,
+            "uri": "https://{canondata_backend}/1937367/d69732d9ae32e1051def08b389f427d0aa62f1ca/resource.tar.gz#test.test_expr-to_hashed_set_vartuple_key-default.txt-Results_/results.txt"
         }
     ],
     "test.test[expr-udaf_with_list_zip-default.txt-Debug]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part6/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part6/canondata/result.json
index 7f54a5a16a7e..a4d78e9530c5 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part6/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part6/canondata/result.json
@@ -891,9 +891,9 @@
     ],
     "test.test[expr-to_hashed_set_tuple_key-default.txt-Debug]": [
         {
-            "checksum": "29508fd84fa074cdca9208dbfdeae7f4",
-            "size": 3795,
-            "uri": "https://{canondata_backend}/1871182/c17881105dd4d4e6b769d0f5cd5d4b6d00c73e2b/resource.tar.gz#test.test_expr-to_hashed_set_tuple_key-default.txt-Debug_/opt.yql"
+            "checksum": "fbdb9ed202a30fecb087cf0d13935f9f",
+            "size": 4427,
+            "uri": "https://{canondata_backend}/1923547/c1b175f1aec3b244581734a7503d6e4a9043bfa7/resource.tar.gz#test.test_expr-to_hashed_set_tuple_key-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[expr-to_hashed_set_tuple_key-default.txt-Plan]": [
@@ -905,9 +905,9 @@
     ],
     "test.test[expr-to_hashed_set_tuple_key-default.txt-Results]": [
         {
-            "checksum": "1c13e784cdc3447ebcf45f87445dcb3e",
-            "size": 37318,
-            "uri": "https://{canondata_backend}/1936997/a879c594903fb53f2cbc586abd0c0e9fac5dd32a/resource.tar.gz#test.test_expr-to_hashed_set_tuple_key-default.txt-Results_/results.txt"
+            "checksum": "f8e50dcc3199993b7e1ec71d9ec9cdb7",
+            "size": 30364,
+            "uri": "https://{canondata_backend}/1923547/c1b175f1aec3b244581734a7503d6e4a9043bfa7/resource.tar.gz#test.test_expr-to_hashed_set_tuple_key-default.txt-Results_/results.txt"
         }
     ],
     "test.test[file-parse_file_in_select_as_int--Debug]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part7/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part7/canondata/result.json
index 7d60c59e7031..1d4ac287e650 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part7/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part7/canondata/result.json
@@ -635,9 +635,9 @@
     ],
     "test.test[expr-as_dict_tuple_key-default.txt-Debug]": [
         {
-            "checksum": "1339065c55eea48a9c8da1fd230f354b",
-            "size": 1815,
-            "uri": "https://{canondata_backend}/1946324/6707647cfa387ec829af2d598f1608a04da08a21/resource.tar.gz#test.test_expr-as_dict_tuple_key-default.txt-Debug_/opt.yql"
+            "checksum": "68dd66a916ad80ff15d61aca4656dc34",
+            "size": 2156,
+            "uri": "https://{canondata_backend}/1937367/8dcf37abebbe3b2cf709daaf794a15466fea6f6f/resource.tar.gz#test.test_expr-as_dict_tuple_key-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[expr-as_dict_tuple_key-default.txt-Plan]": [
@@ -649,9 +649,9 @@
     ],
     "test.test[expr-as_dict_tuple_key-default.txt-Results]": [
         {
-            "checksum": "1baefbf9ececcb7a85647799b7093789",
-            "size": 19366,
-            "uri": "https://{canondata_backend}/1946324/6707647cfa387ec829af2d598f1608a04da08a21/resource.tar.gz#test.test_expr-as_dict_tuple_key-default.txt-Results_/results.txt"
+            "checksum": "3ac88ed7d4ab5c5fd4940f5fcacb290e",
+            "size": 15744,
+            "uri": "https://{canondata_backend}/1937367/8dcf37abebbe3b2cf709daaf794a15466fea6f6f/resource.tar.gz#test.test_expr-as_dict_tuple_key-default.txt-Results_/results.txt"
         }
     ],
     "test.test[expr-common_type_for_resource_and_data--Debug]": [
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
index ada207e8d220..1e3f153cd49d 100644
--- 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
@@ -1039,9 +1039,9 @@
     ],
     "test.test[expr-to_hashed_set_varstruct_key-default.txt-Debug]": [
         {
-            "checksum": "3e7ed40fad76c78290b099f1a83fa95c",
-            "size": 1622,
-            "uri": "https://{canondata_backend}/212715/066a810564ce803f5d673538ddbbac01b99fce6a/resource.tar.gz#test.test_expr-to_hashed_set_varstruct_key-default.txt-Debug_/opt.yql"
+            "checksum": "3493a0af61fa93fef80fe43b490228cb",
+            "size": 1863,
+            "uri": "https://{canondata_backend}/1936842/18647e69ea072b03d2429bceb6900e1c03dbb5e6/resource.tar.gz#test.test_expr-to_hashed_set_varstruct_key-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[expr-to_hashed_set_varstruct_key-default.txt-Plan]": [
@@ -1053,9 +1053,9 @@
     ],
     "test.test[expr-to_hashed_set_varstruct_key-default.txt-Results]": [
         {
-            "checksum": "52f4ff7e947eb31b9389fc4f970f6744",
-            "size": 18448,
-            "uri": "https://{canondata_backend}/1900335/4871e48d29e4933514d3ed0c9c5d19de571eda1f/resource.tar.gz#test.test_expr-to_hashed_set_varstruct_key-default.txt-Results_/results.txt"
+            "checksum": "da16aaa7b994321bbed07136e352f4c2",
+            "size": 14326,
+            "uri": "https://{canondata_backend}/1936842/18647e69ea072b03d2429bceb6900e1c03dbb5e6/resource.tar.gz#test.test_expr-to_hashed_set_varstruct_key-default.txt-Results_/results.txt"
         }
     ],
     "test.test[expr-untag-default.txt-Debug]": [