cloud-fan commented on code in PR #44661:
URL: https://github.com/apache/spark/pull/44661#discussion_r1457415768


##########
sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/CoalesceShufflePartitions.scala:
##########
@@ -146,14 +147,17 @@ case class CoalesceShufflePartitions(session: 
SparkSession) extends AQEShuffleRe
       Seq(collectShuffleStageInfos(r))
     case unary: UnaryExecNode => collectCoalesceGroups(unary.child)
     case union: UnionExec => union.children.flatMap(collectCoalesceGroups)
-    // If not all leaf nodes are exchange query stages, it's not safe to 
reduce the number of
-    // shuffle partitions, because we may break the assumption that all 
children of a spark plan
-    // have same number of output partitions.
     // Note that, `BroadcastQueryStageExec` is a valid case:
     // If a join has been optimized from shuffled join to broadcast join, then 
the one side is
     // `BroadcastQueryStageExec` and other side is `ShuffleQueryStageExec`. It 
can coalesce the
     // shuffle side as we do not expect broadcast exchange has same partition 
number.
-    case p if p.collectLeaves().forall(_.isInstanceOf[ExchangeQueryStageExec]) 
=>
+    case join: BroadcastHashJoinExec => 
join.children.flatMap(collectCoalesceGroups)
+    case join: BroadcastNestedLoopJoinExec => 
join.children.flatMap(collectCoalesceGroups)
+    // If not all leaf nodes are exchange query stages, it's not safe to 
reduce the number of
+    // shuffle partitions, because we may break the assumption that all 
children of a spark plan
+    // have same number of output partitions.
+    case p
+        if p.collectLeaves().forall(_.isInstanceOf[ShuffleQueryStageExec]) && 
!containsUnion(p) =>

Review Comment:
   I disagree with this change. It's hacky to say that the shuffles are 
compatible if there is no Union. We should have a more general solution, like 
checking the shuffle partitions.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to