From 6a84af973cfb45d29d7366e16bcdf7ff1ec9a362 Mon Sep 17 00:00:00 2001
From: Roman Udovichenko <rvu@ydb.tech>
Date: Tue, 9 Jan 2024 08:38:42 +0000
Subject: [PATCH] [yql] Fix test result diff (YQL-17489)

---
 .../sql/dq_file/part19/canondata/result.json   | 18 +++++++++---------
 .../tests/sql/sql2yql/canondata/result.json    | 12 ++++++------
 .../suites/optimizers/yql-17413-topsort.sql    |  3 ++-
 .../part19/canondata/result.json               | 16 ++++++++--------
 4 files changed, 25 insertions(+), 24 deletions(-)

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
index ae6b7e66a9db..a763b1479fb6 100644
--- a/ydb/library/yql/tests/sql/dq_file/part19/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part19/canondata/result.json
@@ -1715,23 +1715,23 @@
     "test.test[optimizers-unused_columns_group_one_of_multi--Results]": [],
     "test.test[optimizers-yql-17413-topsort--Analyze]": [
         {
-            "checksum": "7e96e5445456cbfd2e3622966d474857",
-            "size": 8796,
-            "uri": "https://{canondata_backend}/1903885/35226bfda385a540a941f0d8ba61073fa4188835/resource.tar.gz#test.test_optimizers-yql-17413-topsort--Analyze_/plan.txt"
+            "checksum": "4281300ce50616e7914c605b015fff89",
+            "size": 9394,
+            "uri": "https://{canondata_backend}/1936842/9a35ead5b9e859efd416e87982485153dd2ce155/resource.tar.gz#test.test_optimizers-yql-17413-topsort--Analyze_/plan.txt"
         }
     ],
     "test.test[optimizers-yql-17413-topsort--Debug]": [
         {
-            "checksum": "8958442943f25fd8531144117a7279ba",
-            "size": 3948,
-            "uri": "https://{canondata_backend}/1903885/35226bfda385a540a941f0d8ba61073fa4188835/resource.tar.gz#test.test_optimizers-yql-17413-topsort--Debug_/opt.yql_patched"
+            "checksum": "8bf7c49a718b33a352edfb6baaf7da18",
+            "size": 4074,
+            "uri": "https://{canondata_backend}/1936842/9a35ead5b9e859efd416e87982485153dd2ce155/resource.tar.gz#test.test_optimizers-yql-17413-topsort--Debug_/opt.yql_patched"
         }
     ],
     "test.test[optimizers-yql-17413-topsort--Plan]": [
         {
-            "checksum": "7e96e5445456cbfd2e3622966d474857",
-            "size": 8796,
-            "uri": "https://{canondata_backend}/1903885/35226bfda385a540a941f0d8ba61073fa4188835/resource.tar.gz#test.test_optimizers-yql-17413-topsort--Plan_/plan.txt"
+            "checksum": "4281300ce50616e7914c605b015fff89",
+            "size": 9394,
+            "uri": "https://{canondata_backend}/1936842/9a35ead5b9e859efd416e87982485153dd2ce155/resource.tar.gz#test.test_optimizers-yql-17413-topsort--Plan_/plan.txt"
         }
     ],
     "test.test[optimizers-yql-17413-topsort--Results]": [],
diff --git a/ydb/library/yql/tests/sql/sql2yql/canondata/result.json b/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
index 5be9cbf81736..40dd8aba07cc 100644
--- a/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
+++ b/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
@@ -9990,9 +9990,9 @@
     ],
     "test_sql2yql.test[optimizers-yql-17413-topsort]": [
         {
-            "checksum": "aa2443a9da120b817151ed97e57ee43c",
-            "size": 3527,
-            "uri": "https://{canondata_backend}/1781765/7c17af1b33d2fbf006a6d558af8cb8ec9ef4e4a9/resource.tar.gz#test_sql2yql.test_optimizers-yql-17413-topsort_/sql.yql"
+            "checksum": "c7bb6eb6663804fd17a4d5e5244edc68",
+            "size": 3594,
+            "uri": "https://{canondata_backend}/995452/54c61b947dc9448707d2846976eec313612f5c1d/resource.tar.gz#test_sql2yql.test_optimizers-yql-17413-topsort_/sql.yql"
         }
     ],
     "test_sql2yql.test[optimizers-yql-2171_aggregate_desc_sort_and_extract]": [
@@ -27280,9 +27280,9 @@
     ],
     "test_sql_format.test[optimizers-yql-17413-topsort]": [
         {
-            "checksum": "ecd0eaf6cba2da258637dba1c3c1ccec",
-            "size": 326,
-            "uri": "https://{canondata_backend}/1931696/e0f966d90e1f131295800c00caf45bfec971964e/resource.tar.gz#test_sql_format.test_optimizers-yql-17413-topsort_/formatted.sql"
+            "checksum": "b136f068ec7da5fc23e5a46f670a83a6",
+            "size": 346,
+            "uri": "https://{canondata_backend}/995452/54c61b947dc9448707d2846976eec313612f5c1d/resource.tar.gz#test_sql_format.test_optimizers-yql-17413-topsort_/formatted.sql"
         }
     ],
     "test_sql_format.test[optimizers-yql-2171_aggregate_desc_sort_and_extract]": [
diff --git a/ydb/library/yql/tests/sql/suites/optimizers/yql-17413-topsort.sql b/ydb/library/yql/tests/sql/suites/optimizers/yql-17413-topsort.sql
index 3e291d25195c..be61624023b6 100644
--- a/ydb/library/yql/tests/sql/suites/optimizers/yql-17413-topsort.sql
+++ b/ydb/library/yql/tests/sql/suites/optimizers/yql-17413-topsort.sql
@@ -4,6 +4,7 @@ USE plato;
 $filtered = select * from Input where value != "xxx";
 
 select distinct(subkey) as subkey
-from (select * from $filtered order by key desc limit 3);
+from (select * from $filtered order by key desc limit 3)
+order by subkey;
 
 select sum(cast(subkey as int32)) as c from $filtered;
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part19/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part19/canondata/result.json
index 7313733a29c8..13e1cf4a28f0 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part19/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part19/canondata/result.json
@@ -1492,23 +1492,23 @@
     ],
     "test.test[optimizers-yql-17413-topsort--Debug]": [
         {
-            "checksum": "a6b253a26321a218f3e46aa86dbe4c50",
-            "size": 5712,
-            "uri": "https://{canondata_backend}/1784117/b3e9aeb7a41a8fdbf9c6bfb4a2025eafe94d4a19/resource.tar.gz#test.test_optimizers-yql-17413-topsort--Debug_/opt.yql"
+            "checksum": "7fa737818b8df75326a9c0fd7b16777a",
+            "size": 6121,
+            "uri": "https://{canondata_backend}/1936273/e78ae4626ad61ceb9dc8c75ea8acc44636094cbe/resource.tar.gz#test.test_optimizers-yql-17413-topsort--Debug_/opt.yql"
         }
     ],
     "test.test[optimizers-yql-17413-topsort--Plan]": [
         {
-            "checksum": "0372943ac566f8ee02229da75bd4c1d2",
-            "size": 10305,
-            "uri": "https://{canondata_backend}/1784117/b3e9aeb7a41a8fdbf9c6bfb4a2025eafe94d4a19/resource.tar.gz#test.test_optimizers-yql-17413-topsort--Plan_/plan.txt"
+            "checksum": "40627d74271e212ffe751cb525ac3eae",
+            "size": 11268,
+            "uri": "https://{canondata_backend}/1936273/e78ae4626ad61ceb9dc8c75ea8acc44636094cbe/resource.tar.gz#test.test_optimizers-yql-17413-topsort--Plan_/plan.txt"
         }
     ],
     "test.test[optimizers-yql-17413-topsort--Results]": [
         {
-            "checksum": "d800fdb51897877b5908555f9f9499db",
+            "checksum": "7e771950dd7e01685889187f46612ba2",
             "size": 1661,
-            "uri": "https://{canondata_backend}/1784117/b3e9aeb7a41a8fdbf9c6bfb4a2025eafe94d4a19/resource.tar.gz#test.test_optimizers-yql-17413-topsort--Results_/results.txt"
+            "uri": "https://{canondata_backend}/1936273/e78ae4626ad61ceb9dc8c75ea8acc44636094cbe/resource.tar.gz#test.test_optimizers-yql-17413-topsort--Results_/results.txt"
         }
     ],
     "test.test[optimizers-yql-9297_publish_ytcopy--Debug]": [