cloud-fan commented on a change in pull request #26813: [SPARK-30188][SQL][WIP]
Resolve the failed unit tests when enable AQE
URL: https://github.com/apache/spark/pull/26813#discussion_r364587258
##########
File path:
sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/InsertAdaptiveSparkPlan.scala
##########
@@ -39,11 +41,27 @@ case class InsertAdaptiveSparkPlan(
private val conf = adaptiveExecutionContext.session.sessionState.conf
+ def containShuffle(plan: SparkPlan): Boolean = {
+ plan.find {
+ case plan: SparkPlan => !plan.requiredChildDistribution.forall(_ ==
UnspecifiedDistribution)
+ case _: Exchange => true
+ case _ => false
+ }.isDefined
+ }
+
+ def containSubQuery(plan: SparkPlan): Boolean = {
+ plan.find(_.expressions.exists(_.find {
+ case _: SubqueryExpression => true
+ case _ => false
+ }.isDefined)).isDefined
+ }
+
override def apply(plan: SparkPlan): SparkPlan = applyInternal(plan, false)
private def applyInternal(plan: SparkPlan, isSubquery: Boolean): SparkPlan =
plan match {
case _: ExecutedCommandExec => plan
- case _ if conf.adaptiveExecutionEnabled && supportAdaptive(plan) =>
+ case _ if conf.adaptiveExecutionEnabled && supportAdaptive(plan)
+ && (containSubQuery(plan) || containShuffle(plan) || isSubquery) =>
Review comment:
nit: we should put `isSubquery` at the beginning to save the checking time
for subqueries.
----------------------------------------------------------------
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]
