[fix](Nereids): add whole tree rewriter when root is not CTEAnchor (#…

…33591) (#35269) pick from master ##33591
apache · May 24, 2024 · 4cb9350 · 4cb9350
1 parent f463643
commit 4cb9350
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/rewrite/CostBasedRewriteJob.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/rewrite/CostBasedRewriteJob.java
@@ -91,17 +91,13 @@ private Optional<Pair<Cost, GroupExpression>> getCost(CascadesContext currentCtx
             // set subtree rewrite cache
             currentCtx.getStatementContext().getRewrittenCteProducer()
                     .put(currentCtx.getCurrentTree().orElse(null), (LogicalPlan) cboCtx.getRewritePlan());
-            // Do Whole tree rewrite
-            CascadesContext rootCtxCopy = CascadesContext.newCurrentTreeContext(rootCtx);
-            Rewriter.getWholeTreeRewriterWithoutCostBasedJobs(rootCtxCopy).execute();
-            // Do optimize
-            new Optimizer(rootCtxCopy).execute();
-            return rootCtxCopy.getMemo().getRoot().getLowestCostPlan(
-                    rootCtxCopy.getCurrentJobContext().getRequiredProperties());
-        } else {
-            new Optimizer(cboCtx).execute();
-            return cboCtx.getMemo().getRoot().getLowestCostPlan(
-                    cboCtx.getCurrentJobContext().getRequiredProperties());
         }
+        // Do post tree rewrite
+        CascadesContext rootCtxCopy = CascadesContext.newCurrentTreeContext(rootCtx);
+        Rewriter.getWholeTreeRewriterWithoutCostBasedJobs(rootCtxCopy).execute();
+        // Do optimize
+        new Optimizer(rootCtxCopy).execute();
+        return rootCtxCopy.getMemo().getRoot().getLowestCostPlan(
+                rootCtxCopy.getCurrentJobContext().getRequiredProperties());
     }
 }