[fix](Nereids) join order is not right after sql parsing (apache#28721)

for sql ``` t1, t2 join t3 ``` we should generate plan like: ``` t1 join (t2 join t3) ``` but we generate: ``` (t1 join t2) join t3 ``` to follow legancy planner.
HappenLee · Jan 12, 2024 · 8ccc765 · 8ccc765
1 parent b75323a
commit 8ccc765
Show file tree

Hide file tree

Showing 5 changed files with 572 additions and 29 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
@@ -2808,7 +2808,7 @@ private LogicalPlan withRelations(LogicalPlan inputPlan, List<RelationContext> r
         LogicalPlan left = inputPlan;
         for (RelationContext relation : relations) {
             // build left deep join tree
-            LogicalPlan right = visitRelation(relation);
+            LogicalPlan right = withJoinRelations(visitRelation(relation), relation);
             left = (left == null) ? right :
                     new LogicalJoin<>(
                             JoinType.CROSS_JOIN,
@@ -2818,7 +2818,6 @@ private LogicalPlan withRelations(LogicalPlan inputPlan, List<RelationContext> r
                             Optional.empty(),
                             left,
                             right);
-            left = withJoinRelations(left, relation);
             // TODO: pivot and lateral view
         }
         return left;

diff --git a/...e-core/src/test/java/org/apache/doris/nereids/trees/plans/DeleteFromUsingCommandTest.java b/...e-core/src/test/java/org/apache/doris/nereids/trees/plans/DeleteFromUsingCommandTest.java
@@ -73,7 +73,7 @@ protected void runBeforeAll() throws Exception {
     public void testFromClauseDelete() throws AnalysisException {
         String sql = "delete from t1 a using src join t2 on src.k1 = t2.k1 where t2.k1 = a.k1";
         LogicalPlan parsed = new NereidsParser().parseSingle(sql);
-        Assertions.assertTrue(parsed instanceof DeleteFromUsingCommand);
+        Assertions.assertInstanceOf(DeleteFromUsingCommand.class, parsed);
         DeleteFromUsingCommand command = ((DeleteFromUsingCommand) parsed);
         LogicalPlan plan = command.completeQueryPlan(connectContext, command.getLogicalQuery());
         PlanChecker.from(connectContext, plan)
@@ -83,19 +83,22 @@ public void testFromClauseDelete() throws AnalysisException {
                         logicalOlapTableSink(
                                 logicalProject(
                                         logicalJoin(
-                                                logicalJoin(
-                                                        logicalProject(
-                                                                logicalFilter(
-                                                                        logicalOlapScan()
+                                                logicalProject(
+                                                        logicalJoin(
+                                                                logicalProject(
+                                                                        logicalFilter(
+                                                                                logicalOlapScan()
+                                                                        )
+                                                                ),
+                                                                logicalProject(
+                                                                        logicalFilter(
+                                                                                logicalOlapScan()
+                                                                        )
                                                                 )
-                                                        ),
-                                                        logicalProject(
-                                                                logicalOlapScan())
+                                                        )
                                                 ),
                                                 logicalProject(
-                                                        logicalFilter(
-                                                                logicalOlapScan()
-                                                        )
+                                                        logicalOlapScan()
                                                 )
                                         )
                                 )

diff --git a/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/plans/UpdateCommandTest.java b/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/plans/UpdateCommandTest.java
@@ -98,24 +98,18 @@ public void testFromClauseUpdate() {
         LogicalPlan plan = command.completeQueryPlan(connectContext, command.getLogicalQuery());
         PlanChecker.from(connectContext, plan)
                 .analyze(plan)
-                .rewrite()
                 .matches(
-                        logicalOlapTableSink(
-                                logicalProject(
+                        logicalFilter(
+                                logicalJoin(
+                                        logicalSubQueryAlias(
+                                                logicalFilter(
+                                                        logicalOlapScan()
+                                                )
+                                        ),
                                         logicalJoin(
-                                                logicalJoin(
-                                                        logicalProject(
-                                                                logicalFilter(
-                                                                        logicalOlapScan()
-                                                                )
-                                                        ),
-                                                        logicalProject(
-                                                                logicalOlapScan())
-                                                ),
-                                                logicalProject(
-                                                        logicalFilter(
-                                                                logicalOlapScan()
-                                                        )
+                                                logicalOlapScan(),
+                                                logicalFilter(
+                                                        logicalOlapScan()
                                                 )
                                         )
                                 )