wangyum commented on a change in pull request #26409: [SPARK-29655][SQL] Enable 
adaptive execution should not add more ShuffleExchange
URL: https://github.com/apache/spark/pull/26409#discussion_r345262534
 
 

 ##########
 File path: 
sql/core/src/main/scala/org/apache/spark/sql/execution/exchange/EnsureRequirements.scala
 ##########
 @@ -83,7 +83,25 @@ case class EnsureRequirements(conf: SQLConf) extends 
Rule[SparkPlan] {
         numPartitionsSet.headOption
       }
 
-      val targetNumPartitions = 
requiredNumPartitions.getOrElse(childrenNumPartitions.max)
+      // maxNumPostShufflePartitions is usually larger than 
numShufflePartitions,
+      // which causes some bucket map join lose efficacy after enabling 
adaptive execution.
+      // Please see SPARK-29655 for more details.
+      val expectedChildrenNumPartitions = if (conf.adaptiveExecutionEnabled) {
+        val withoutShuffleChildrenNumPartitions =
+          
childrenIndexes.filterNot(children(_).isInstanceOf[ShuffleExchangeExec])
+            .map(children(_).outputPartitioning.numPartitions).toSet
+        if (withoutShuffleChildrenNumPartitions.nonEmpty &&
+          conf.maxNumPostShufflePartitions > conf.numShufflePartitions) {
+          math.min(math.max(withoutShuffleChildrenNumPartitions.max, 
conf.numShufflePartitions),
+            conf.maxNumPostShufflePartitions)
 
 Review comment:
   Sorry for late reply @viirya. Yes. you are right.

----------------------------------------------------------------
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.
 
For queries about this service, please contact Infrastructure at:
[email protected]


With regards,
Apache Git Services

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

Reply via email to