[SPARK-48750][SQL] AQEPropagateEmptyRelation convert broadcast query …

…stage plan to empty relation causing error
AngersZhuuuu · Jul 1, 2024 · 0430322 · 0430322
1 parent f49418b
commit 0430322
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/AdaptiveSparkPlanExec.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/AdaptiveSparkPlanExec.scala
@@ -386,7 +386,16 @@ case class AdaptiveSparkPlanExec(
               sideBySide(currentPhysicalPlan.treeString, newPhysicalPlan.treeString).mkString("\n")
             logOnLevel(log"Plan changed:\n${MDC(QUERY_PLAN, plans)}")
             cleanUpTempTags(newPhysicalPlan)
-            currentPhysicalPlan = newPhysicalPlan
+            currentPhysicalPlan = currentPhysicalPlan match {
+              case broadcast: BroadcastQueryStageExec =>
+                broadcast.plan match {
+                  case b: BroadcastExchangeExec =>
+                    broadcast.copy(plan = b.copy(child = newPhysicalPlan))
+                  case ReusedExchangeExec(_, b: BroadcastExchangeExec) =>
+                    broadcast.copy(plan = b.copy(child = newPhysicalPlan))
+                }
+              case p => p
+            }
             currentLogicalPlan = newLogicalPlan
             stagesToReplace = Seq.empty[QueryStageExec]
           }