canonize

Author: MrLolthe1st

ydb/library/yql/core/common_opt/yql_co_pgselect.cpp

@@ -924,8 +924,10 @@ TUsedColumns GatherUsedColumns(const TExprNode::TPtr& result, const TExprNode::T
         for (ui32 i = 0; i < groupTuple->ChildrenSize(); ++i) {
             auto join = groupTuple->Child(i);
             auto joinType = join->Child(0)->Content();
-            if (join->ChildrenSize() > 1 && join->Child(1)->Content() == "using") {
-
+            if (join->ChildrenSize() > 2) {
+                Y_ENSURE(join->Child(1)->ChildrenSize() > 3, "Excepted at least 4 args there");
+                Y_ENSURE(join->Child(1)->IsAtom(), "Supported only USING clause there");
+                Y_ENSURE(join->Child(1)->Content() == "using", "Supported only USING clause there");
                 for (ui32 col = 0; col < join->Child(3)->ChildrenSize(); ++col) {
                     auto lr = join->Child(3)->Child(col);
                     if (lr->Child(0)->IsAtom()) {

ydb/library/yql/tests/sql/dq_file/part17/canondata/result.json

@@ -1814,9 +1814,9 @@
     ],
     "test.test[pg-join_using_multiple3-default.txt-Debug]": [
         {
-            "checksum": "8a18698324c9c2a368f32c2e486ca5d0",
+            "checksum": "fd424f40c99a62b019a227477d543007",
             "size": 1848,
-            "uri": "https://{canondata_backend}/1942671/5a994316452c786807f2de3ed136ba6ab54f260c/resource.tar.gz#test.test_pg-join_using_multiple3-default.txt-Debug_/opt.yql_patched"
+            "uri": "https://{canondata_backend}/212715/e1c6310e5432ce15fd0e5d6b22fa3eaf8b376b0a/resource.tar.gz#test.test_pg-join_using_multiple3-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-join_using_multiple3-default.txt-Plan]": [

ydb/library/yql/tests/sql/hybrid_file/part2/canondata/result.json

@@ -1807,9 +1807,9 @@
     ],
     "test.test[pg-join_using_multiple3-default.txt-Debug]": [
         {
-            "checksum": "bad0f75c2206d203dd5a13618fa78783",
+            "checksum": "c53fecf9a8b589160e292093e768dca1",
             "size": 1847,
-            "uri": "https://{canondata_backend}/1937429/f07b84667ac042b441b980139436c1568397aded/resource.tar.gz#test.test_pg-join_using_multiple3-default.txt-Debug_/opt.yql_patched"
+            "uri": "https://{canondata_backend}/1924537/128c9eb1b162d25b4eaf5b1176e04a6c047771a1/resource.tar.gz#test.test_pg-join_using_multiple3-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[pg-join_using_multiple3-default.txt-Plan]": [

ydb/library/yql/tests/sql/sql2yql/canondata/result.json

@@ -11082,9 +11082,9 @@
     ],
     "test_sql2yql.test[pg-join_tree_order]": [
         {
-            "checksum": "83d0aebd9d5b71d098db88d330b00061",
+            "checksum": "d0a5d75f3f6bf70f0d9eee0888877e46",
             "size": 1191,
-            "uri": "https://{canondata_backend}/1937429/8a51c76061fab32bb68a19b366be595a0261047d/resource.tar.gz#test_sql2yql.test_pg-join_tree_order_/sql.yql"
+            "uri": "https://{canondata_backend}/1773845/1e14bb28bf037804400522ae3a3a8cf11cdca7e4/resource.tar.gz#test_sql2yql.test_pg-join_tree_order_/sql.yql"
         }
     ],
     "test_sql2yql.test[pg-join_using1]": [
@@ -11180,9 +11180,9 @@
     ],
     "test_sql2yql.test[pg-join_using_multiple3]": [
         {
-            "checksum": "a380a3ba6e228bbf4814d20d8870a43b",
+            "checksum": "022b2f8053270fa452c96f67cdb983e0",
             "size": 1531,
-            "uri": "https://{canondata_backend}/1942671/2c99ceb374ef296593e4b1aec119c77277cf9af9/resource.tar.gz#test_sql2yql.test_pg-join_using_multiple3_/sql.yql"
+            "uri": "https://{canondata_backend}/1773845/1e14bb28bf037804400522ae3a3a8cf11cdca7e4/resource.tar.gz#test_sql2yql.test_pg-join_using_multiple3_/sql.yql"
         }
     ],
     "test_sql2yql.test[pg-join_using_tables1]": [

ydb/library/yql/tests/sql/yt_native_file/part17/canondata/result.json

@@ -1487,9 +1487,9 @@
     ],
     "test.test[pg-join_using_multiple3-default.txt-Debug]": [
         {
-            "checksum": "4cee9c909773239f443e6476430bbaff",
+            "checksum": "060e6c46f8d9b6b962159c140b9e7544",
             "size": 1788,
-            "uri": "https://{canondata_backend}/1937429/42667143e88bae865e242e4d60685da0ecb49c03/resource.tar.gz#test.test_pg-join_using_multiple3-default.txt-Debug_/opt.yql"
+            "uri": "https://{canondata_backend}/1924537/3d9e624e7c2a771b2a2c11064f1d7a13ed1d94c6/resource.tar.gz#test.test_pg-join_using_multiple3-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[pg-join_using_multiple3-default.txt-Plan]": [