[yql] Fix result diff in dq_file tests

ydb-platform · Dec 22, 2023 · c78e4c1 · c78e4c1
1 parent d56b8b1
commit c78e4c1
Show file tree

Hide file tree

Showing 18 changed files with 4,680 additions and 4,723 deletions.
diff --git a/ydb/library/yql/tests/sql/dq_file.py b/ydb/library/yql/tests/sql/dq_file.py
@@ -52,6 +52,7 @@ def normalize_res(res, sort):
                     for data in r['Write']:
                         if sort and 'Data' in data:
                             data['Data'] = sorted(data['Data'])
+                return res
 
             program_sql = os.path.join(DATA_PATH, suite, '%s.sql' % case)
             with codecs.open(program_sql, encoding='utf-8') as program_file_descr:

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
@@ -1769,9 +1769,9 @@
     ],
     "test.test[order_by-order_by_tablepath_column--Debug]": [
         {
-            "checksum": "6986a47582b749ee30bf6c8ca8a17ce6",
-            "size": 1555,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_order_by-order_by_tablepath_column--Debug_/opt.yql_patched"
+            "checksum": "85e66dd125538450bc9970d07640ad6d",
+            "size": 1618,
+            "uri": "https://{canondata_backend}/1784826/14d74cf07b9bc3ef5bc3a0c5040b886c7cc0007e/resource.tar.gz#test.test_order_by-order_by_tablepath_column--Debug_/opt.yql_patched"
         }
     ],
     "test.test[order_by-order_by_tablepath_column--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
@@ -2484,9 +2484,9 @@
     ],
     "test.test[udf-complex_return_type--Debug]": [
         {
-            "checksum": "1057e9ab3344746aee042bb79e066de7",
-            "size": 480,
-            "uri": "https://{canondata_backend}/1130705/9004be6a07264a5bf29a5f00e7ff1eb4e47458ad/resource.tar.gz#test.test_udf-complex_return_type--Debug_/opt.yql_patched"
+            "checksum": "8afe31edeb0c122b5d1e2f22f2a84d2f",
+            "size": 542,
+            "uri": "https://{canondata_backend}/1777230/22d31ba85fc7908217757b0d470ed661ae03bff1/resource.tar.gz#test.test_udf-complex_return_type--Debug_/opt.yql_patched"
         }
     ],
     "test.test[udf-complex_return_type--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
@@ -2550,9 +2550,9 @@
     ],
     "test.test[produce-reduce_with_assume_in_subquery--Debug]": [
         {
-            "checksum": "9e4f9fc6370f5c170b123655017d9bf0",
-            "size": 2156,
-            "uri": "https://{canondata_backend}/1942278/4753a3574c7d4c4cc4a6ef5262a4559e7e493c80/resource.tar.gz#test.test_produce-reduce_with_assume_in_subquery--Debug_/opt.yql_patched"
+            "checksum": "eab3242a5bc79ff73f2d44fc7fa24ac4",
+            "size": 2246,
+            "uri": "https://{canondata_backend}/1814674/3660a2396e26152d8c8f050da9f28116b76739a2/resource.tar.gz#test.test_produce-reduce_with_assume_in_subquery--Debug_/opt.yql_patched"
         }
     ],
     "test.test[produce-reduce_with_assume_in_subquery--Plan]": [

diff --git a/ydb/library/yql/tests/sql/dq_file/part9/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part9/canondata/result.json
@@ -976,35 +976,6 @@
         }
     ],
     "test.test[flatten_by-flatten_columns_non_struct-default.txt-Results]": [],
-    "test.test[hor_join-yql-12610_old_table_props-default.txt-Analyze]": [
-        {
-            "checksum": "4c3e60b81eebec9cef6181a11c3b5b95",
-            "size": 5047,
-            "uri": "https://{canondata_backend}/1936947/4e75efdf8bb6c4502b7bcfedc52bbdf182bdb39c/resource.tar.gz#test.test_hor_join-yql-12610_old_table_props-default.txt-Analyze_/plan.txt"
-        },
-        {
-            "uri": "file://test.test_hor_join-yql-12610_old_table_props-default.txt-Analyze_/extracted"
-        }
-    ],
-    "test.test[hor_join-yql-12610_old_table_props-default.txt-Debug]": [
-        {
-            "checksum": "93e53f7287e451e31d0820e71f80c62b",
-            "size": 2195,
-            "uri": "https://{canondata_backend}/1936947/4e75efdf8bb6c4502b7bcfedc52bbdf182bdb39c/resource.tar.gz#test.test_hor_join-yql-12610_old_table_props-default.txt-Debug_/opt.yql_patched"
-        }
-    ],
-    "test.test[hor_join-yql-12610_old_table_props-default.txt-Plan]": [
-        {
-            "checksum": "4c3e60b81eebec9cef6181a11c3b5b95",
-            "size": 5047,
-            "uri": "https://{canondata_backend}/1936947/4e75efdf8bb6c4502b7bcfedc52bbdf182bdb39c/resource.tar.gz#test.test_hor_join-yql-12610_old_table_props-default.txt-Plan_/plan.txt"
-        }
-    ],
-    "test.test[hor_join-yql-12610_old_table_props-default.txt-Results]": [
-        {
-            "uri": "file://test.test_hor_join-yql-12610_old_table_props-default.txt-Results_/extracted"
-        }
-    ],
     "test.test[in-in_immediate_subquery-default.txt-Analyze]": [
         {
             "checksum": "ea302e583757db140046cc7ae0a64e41",

diff --git a/...rt9/canondata/test.test_hor_join-yql-12610_old_table_props-default.txt-Analyze_/extracted b/...rt9/canondata/test.test_hor_join-yql-12610_old_table_props-default.txt-Analyze_/extracted
@@ -1,8 +0,0 @@
-<tmp_path>/program.sql:<main>: Warning: Optimization
-
-    <tmp_path>/program.sql:<main>:9:17: Warning: TableRecord will be empty
-    	    select key, TableRecordIndex() as record, TablePath() as path from Input
-	                ^
-    <tmp_path>/program.sql:<main>:9:47: Warning: TablePath will be empty
-    	    select key, TableRecordIndex() as record, TablePath() as path from Input
-	                                              ^

diff --git a/...rt9/canondata/test.test_hor_join-yql-12610_old_table_props-default.txt-Results_/extracted b/...rt9/canondata/test.test_hor_join-yql-12610_old_table_props-default.txt-Results_/extracted
@@ -1,8 +0,0 @@
-<tmp_path>/program.sql:<main>: Warning: Optimization
-
-    <tmp_path>/program.sql:<main>:9:17: Warning: TableRecord will be empty
-    	    select key, TableRecordIndex() as record, TablePath() as path from Input
-	                ^
-    <tmp_path>/program.sql:<main>:9:47: Warning: TablePath will be empty
-    	    select key, TableRecordIndex() as record, TablePath() as path from Input
-	                                              ^