Canonized tests

ydb-platform · Jun 20, 2024 · 11464c9 · 11464c9
1 parent 1efd064
commit 11464c9
Show file tree

Hide file tree

Showing 2 changed files with 109 additions and 45 deletions.
diff --git a/...s/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_2.plan b/...s/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_2.plan
@@ -30,25 +30,10 @@
                                 "Plans": [
                                     {
                                         "CTE Name": "precompute_0_0",
-                                        "Node Type": "Limit-CrossJoin-InnerJoin (MapJoin)-ConstantExpr-Filter-TableFullScan-ConstantExpr",
+                                        "Node Type": "Limit-Filter-CrossJoin-TableFullScan-ConstantExpr-ConstantExpr-InnerJoin (JoinDict)-ConstantExpr-ConstantExpr-InnerJoin (JoinDict)-ConstantExpr",
                                         "Operators": [
                                             {
                                                 "Inputs": [
-                                                    {
-                                                        "InternalOperatorId": 1
-                                                    },
-                                                    {
-                                                        "InternalOperatorId": 1
-                                                    },
-                                                    {
-                                                        "InternalOperatorId": 1
-                                                    },
-                                                    {
-                                                        "InternalOperatorId": 1
-                                                    },
-                                                    {
-                                                        "InternalOperatorId": 1
-                                                    },
                                                     {
                                                         "InternalOperatorId": 1
                                                     },
@@ -69,38 +54,24 @@
                                                 "Inputs": [
                                                     {
                                                         "InternalOperatorId": 2
-                                                    },
-                                                    {
-                                                        "InternalOperatorId": 6
                                                     }
                                                 ],
-                                                "Name": "CrossJoin"
+                                                "Name": "Filter",
+                                                "Predicate": "item.b.Sum0 == item.t.thousand And item.a.f1 + item.b.Sum0 + 999 == item.t.tenthous"
                                             },
                                             {
-                                                "Condition": "thousand = Sum0",
                                                 "Inputs": [
                                                     {
-                                                        "InternalOperatorId": 4
+                                                        "InternalOperatorId": 3
                                                     },
                                                     {
-                                                        "InternalOperatorId": 3
-                                                    }
-                                                ],
-                                                "Name": "InnerJoin (MapJoin)"
-                                            },
-                                            {
-                                                "Inputs": [],
-                                                "Name": "ToFlow",
-                                                "ToFlow": "precompute_0_0"
-                                            },
-                                            {
-                                                "Inputs": [
+                                                        "InternalOperatorId": 9
+                                                    },
                                                     {
-                                                        "InternalOperatorId": 5
+                                                        "InternalOperatorId": 9
                                                     }
                                                 ],
-                                                "Name": "Filter",
-                                                "Predicate": "Exist(item.thousand)"
+                                                "Name": "CrossJoin"
                                             },
                                             {
                                                 "Inputs": [],
@@ -116,6 +87,52 @@
                                                 "Scan": "Parallel",
                                                 "Table": "postgres_jointest/join0.test_plan/tenk1"
                                             },
+                                            {
+                                                "Inputs": [
+                                                    {
+                                                        "InternalOperatorId": 5
+                                                    }
+                                                ],
+                                                "Name": "ToFlow",
+                                                "ToFlow": "precompute_0_0"
+                                            },
+                                            {
+                                                "Inputs": [],
+                                                "Member": "precompute_0_0",
+                                                "Name": "Member"
+                                            },
+                                            {
+                                                "Inputs": [
+                                                    {
+                                                        "InternalOperatorId": 8
+                                                    },
+                                                    {
+                                                        "InternalOperatorId": 10
+                                                    }
+                                                ],
+                                                "Name": "InnerJoin (JoinDict)"
+                                            },
+                                            {
+                                                "Inputs": [],
+                                                "Name": "ToFlow",
+                                                "ToFlow": "precompute_0_0"
+                                            },
+                                            {
+                                                "Inputs": [],
+                                                "Name": "ToFlow",
+                                                "ToFlow": "precompute_0_0"
+                                            },
+                                            {
+                                                "Inputs": [
+                                                    {
+                                                        "InternalOperatorId": 8
+                                                    },
+                                                    {
+                                                        "InternalOperatorId": 10
+                                                    }
+                                                ],
+                                                "Name": "InnerJoin (JoinDict)"
+                                            },
                                             {
                                                 "Inputs": [],
                                                 "Name": "ToFlow",

diff --git a/...te_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_12.plan b/...te_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_12.plan
@@ -29,10 +29,61 @@
                                 "PlanNodeType": "Connection",
                                 "Plans": [
                                     {
-                                        "Node Type": "Limit-InnerJoin (MapJoin)-Filter-TableFullScan",
+                                        "Node Type": "Limit-Filter-CrossJoin-TableFullScan",
                                         "Operators": [
                                             {
                                                 "Inputs": [
+                                                    {
+                                                        "InternalOperatorId": 1
+                                                    },
+                                                    {
+                                                        "InternalOperatorId": 1
+                                                    },
+                                                    {
+                                                        "InternalOperatorId": 1
+                                                    },
+                                                    {
+                                                        "InternalOperatorId": 1
+                                                    },
+                                                    {
+                                                        "InternalOperatorId": 1
+                                                    },
+                                                    {
+                                                        "InternalOperatorId": 1
+                                                    },
+                                                    {
+                                                        "InternalOperatorId": 1
+                                                    },
+                                                    {
+                                                        "InternalOperatorId": 1
+                                                    },
+                                                    {
+                                                        "InternalOperatorId": 1
+                                                    },
+                                                    {
+                                                        "InternalOperatorId": 1
+                                                    },
+                                                    {
+                                                        "InternalOperatorId": 1
+                                                    },
+                                                    {
+                                                        "InternalOperatorId": 1
+                                                    },
+                                                    {
+                                                        "InternalOperatorId": 1
+                                                    },
+                                                    {
+                                                        "InternalOperatorId": 1
+                                                    },
+                                                    {
+                                                        "InternalOperatorId": 1
+                                                    },
+                                                    {
+                                                        "InternalOperatorId": 1
+                                                    },
+                                                    {
+                                                        "InternalOperatorId": 1
+                                                    },
                                                     {
                                                         "InternalOperatorId": 1
                                                     }
@@ -41,25 +92,21 @@
                                                 "Name": "Limit"
                                             },
                                             {
-                                                "Condition": "unique1,stringu1 = i,j",
                                                 "Inputs": [
                                                     {
                                                         "InternalOperatorId": 2
-                                                    },
-                                                    {
-                                                        "Other": "ConstantExpression"
                                                     }
                                                 ],
-                                                "Name": "InnerJoin (MapJoin)"
+                                                "Name": "Filter",
+                                                "Predicate": "item.onek.unique1 == item.v.i And item.onek.stringu1 == item.v.j"
                                             },
                                             {
                                                 "Inputs": [
                                                     {
                                                         "InternalOperatorId": 3
                                                     }
                                                 ],
-                                                "Name": "Filter",
-                                                "Predicate": "Exist(item.stringu1) And Exist(item.unique1)"
+                                                "Name": "CrossJoin"
                                             },
                                             {
                                                 "Inputs": [],