fix

zml1206 · Jan 6, 2025 · f6ad45c · f6ad45c
1 parent 54e760f
commit f6ad45c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala
@@ -176,7 +176,7 @@ abstract class Optimizer(catalogManager: CatalogManager)
     Batch("Finish Analysis", FixedPoint(1), FinishAnalysis),
     // We must run this batch after `ReplaceExpressions`, as `RuntimeReplaceable` expression
     // may produce `With` expressions that need to be rewritten.
-    Batch("Rewrite With expression", Once, RewriteWithExpression),
+    Batch("Rewrite With expression", FixedPoint(1), RewriteWithExpression),
     //////////////////////////////////////////////////////////////////////////////////////////
     // Optimizer rules start here
     //////////////////////////////////////////////////////////////////////////////////////////

diff --git a/...talyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/RewriteWithExpression.scala b/...talyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/RewriteWithExpression.scala
@@ -40,11 +40,14 @@ import org.apache.spark.util.Utils
  */
 object RewriteWithExpression extends Rule[LogicalPlan] with AliasHelper {
   override def apply(plan: LogicalPlan): LogicalPlan = {
+    if (!plan.containsPattern(WITH_EXPRESSION)) {
+      return plan
+    }
     var p = plan
     while (p.containsPattern(WITH_EXPRESSION)) {
-      p = applyOnce(p)
+      p = CollapseProject(applyOnce(p))
     }
-    rewriteAlias(CollapseProject.apply(p))
+    rewriteAlias(p)
   }
 
   // Expensive common expression will be evaluated twice: once in the Filter being pushed down,

diff --git a/...catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/FilterPushdownSuite.scala b/...catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/FilterPushdownSuite.scala
@@ -42,7 +42,8 @@ class FilterPushdownSuite extends PlanTest {
         PushPredicateThroughNonJoin,
         BooleanSimplification,
         PushPredicateThroughJoin,
-        RewriteWithExpression) ::
+        RewriteWithExpression,
+        CollapseProject) ::
       Batch("Push extra predicate through join", FixedPoint(10),
         PushExtraPredicateThroughJoin,
         PushDownPredicates,