Skip to content

[SPARK-56737][SQL] Avoid binary-incompatible mode method on BroadcastExchangeLike #55702

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
viirya wants to merge 1 commit into from
Closed

[SPARK-56737][SQL] Avoid binary-incompatible mode method on BroadcastExchangeLike #55702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions ...re/src/main/scala/org/apache/spark/sql/execution/adaptive/LogicalQueryStageStrategy.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import org.apache.spark.sql.catalyst.optimizer.{BuildLeft, BuildRight}
import org.apache.spark.sql.catalyst.planning.{ExtractEquiJoinKeys, ExtractSingleColumnNullAwareAntiJoin}
import org.apache.spark.sql.catalyst.plans.LeftAnti
import org.apache.spark.sql.catalyst.plans.logical.{Join, LogicalPlan}
import org.apache.spark.sql.catalyst.plans.physical.IdentityBroadcastMode
import org.apache.spark.sql.catalyst.plans.physical.{BroadcastPartitioning, IdentityBroadcastMode}
import org.apache.spark.sql.classic.Strategy
import org.apache.spark.sql.execution.{joins, SparkPlan}
import org.apache.spark.sql.execution.joins.{BroadcastHashJoinExec, BroadcastNestedLoopJoinExec, HashedRelationBroadcastMode}
Expand All @@ -41,8 +41,8 @@ object LogicalQueryStageStrategy extends Strategy {
plan: LogicalPlan,
isNullAware: Boolean): Boolean = plan match {
case LogicalQueryStage(_, bqs: BroadcastQueryStageExec) =>
bqs.broadcast.mode match {
case HashedRelationBroadcastMode(_, stageIsNullAware) =>
bqs.broadcast.outputPartitioning match {
case BroadcastPartitioning(HashedRelationBroadcastMode(_, stageIsNullAware)) =>
stageIsNullAware == isNullAware
case _ => false
}
Expand All @@ -51,8 +51,8 @@ object LogicalQueryStageStrategy extends Strategy {

private def isBroadcastStageWithIdentityBroadcastMode(plan: LogicalPlan): Boolean = plan match {
case LogicalQueryStage(_, bqs: BroadcastQueryStageExec) =>
bqs.broadcast.mode match {
case IdentityBroadcastMode => true
bqs.broadcast.outputPartitioning match {
case BroadcastPartitioning(IdentityBroadcastMode) => true
case _ => false
}
case _ => false
Expand Down
2 changes: 0 additions & 2 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/exchange/BroadcastExchangeExec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ import org.apache.spark.util.{SparkFatalException, ThreadUtils}
*/
trait BroadcastExchangeLike extends Exchange {

def mode: BroadcastMode

/**
* The broadcast run ID in job tag
*/
Expand Down
3 changes: 1 addition & 2 deletions sql/core/src/test/scala/org/apache/spark/sql/SparkSessionExtensionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import org.apache.spark.sql.catalyst.expressions.aggregate.{AggregateExpression,
import org.apache.spark.sql.catalyst.parser.{CatalystSqlParser, ParserInterface}
import org.apache.spark.sql.catalyst.plans.{PlanTest, SQLHelper}
import org.apache.spark.sql.catalyst.plans.logical.{Aggregate, AggregateHint, ColumnStat, Limit, LocalRelation, LogicalPlan, Project, Range, Sort, SortHint, Statistics, UnresolvedHint}
import org.apache.spark.sql.catalyst.plans.physical.{BroadcastMode, Partitioning, SinglePartition}
import org.apache.spark.sql.catalyst.plans.physical.{Partitioning, SinglePartition}
import org.apache.spark.sql.catalyst.rules.Rule
import org.apache.spark.sql.catalyst.trees.TreeNodeTag
import org.apache.spark.sql.classic.ClassicConversions._
Expand Down Expand Up @@ -1175,7 +1175,6 @@ case class MyShuffleExchangeExec(delegate: ShuffleExchangeExec) extends ShuffleE
* whether AQE is enabled.
*/
case class MyBroadcastExchangeExec(delegate: BroadcastExchangeExec) extends BroadcastExchangeLike {
override def mode: BroadcastMode = delegate.mode
override val runId: UUID = delegate.runId
override def relationFuture: java.util.concurrent.Future[Broadcast[Any]] =
delegate.relationFuture
Expand Down