Skip to content

[SPARK-35911][SQL] Update exprId for IN subquery in DPP #33110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Swinky wants to merge 6 commits into from
Closed

[SPARK-35911][SQL] Update exprId for IN subquery in DPP #33110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3dfbde6
use existing exprId for subquery
Swinky Jun 27, 2021
4888724
scalastyle check
Swinky Jun 27, 2021
f823015
Merge branch 'master' into swmann/dpp-subquery-exprid
Swinky Jul 12, 2021
307b922
use existing exprId for subquery
Swinky Jun 27, 2021
c4b0f8c
scalastyle check
Swinky Jun 27, 2021
1e8eb51
Merge branch 'swmann/dpp-subquery-exprid' of https://github.com/Swink…
Swinky Jul 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../main/scala/org/apache/spark/sql/execution/dynamicpruning/PlanDynamicPruningFilters.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ case class PlanDynamicPruningFilters(sparkSession: SparkSession)
val alias = Alias(buildKeys(broadcastKeyIndex), buildKeys(broadcastKeyIndex).toString)()
val aggregate = Aggregate(Seq(alias), Seq(alias), buildPlan)
DynamicPruningExpression(expressions.InSubquery(
Seq(value), ListQuery(aggregate, childOutputs = aggregate.output)))
Seq(value), ListQuery(aggregate, exprId = exprId, childOutputs = aggregate.output)))
}
}
}
Expand Down
25 changes: 24 additions & 1 deletion sql/core/src/test/scala/org/apache/spark/sql/DynamicPartitionPruningSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ package org.apache.spark.sql

import org.scalatest.GivenWhenThen

import org.apache.spark.sql.catalyst.expressions.{DynamicPruningExpression, Expression}
import org.apache.spark.sql.catalyst.expressions.{DynamicPruningExpression, DynamicPruningSubquery, Expression}
import org.apache.spark.sql.catalyst.expressions.CodegenObjectFactoryMode._
import org.apache.spark.sql.catalyst.plans.ExistenceJoin
import org.apache.spark.sql.catalyst.plans.logical.Filter
import org.apache.spark.sql.connector.catalog.InMemoryTableCatalog
import org.apache.spark.sql.execution._
import org.apache.spark.sql.execution.adaptive._
Expand Down Expand Up @@ -230,6 +231,10 @@ abstract class DynamicPartitionPruningSuiteBase
}
assert(subquery.find(_.isInstanceOf[AdaptiveSparkPlanExec]).isDefined == isMainQueryAdaptive)
}

if(withSubquery || withBroadcast) {
checkExprIdsForPruningExpressions(df, dpExprs)
}
}

/**
Expand Down Expand Up @@ -274,6 +279,24 @@ abstract class DynamicPartitionPruningSuiteBase
}.isDefined
}

/**
* Checks if the dynamic pruning expression id in optimized plan and executed plan match.
*/
def checkExprIdsForPruningExpressions(df: DataFrame, dpExprs: Seq[Expression]): Unit = {
val dpExprIdsInOptimizedPlan = df.queryExecution.optimizedPlan.flatMap {
case f: Filter =>
splitConjunctivePredicates(f.condition).collect {
case s: DynamicPruningSubquery => s.exprId
}
case _ => Nil
}

val dpExprIdsInExecutedPlan = dpExprs.collect {
case i: InSubqueryExec => i.exprId
}
dpExprIdsInExecutedPlan.foreach{ e => assert(dpExprIdsInOptimizedPlan.contains(e))}
}

/**
* Test the result of a simple join on mock-up tables
*/
Expand Down