Skip to content

[SPARK-37592][SQL] Improve performance of JoinSelection #34844

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
beliefer wants to merge 4 commits into from
Closed

[SPARK-37592][SQL] Improve performance of JoinSelection #34844

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa49f15
[SPARK-37592][SQL] Improve performance of `JoinSelection`
beliefer Dec 9, 2021
56919dc
Update code
beliefer Dec 10, 2021
0e82c06
Update sql/core/src/main/scala/org/apache/spark/sql/execution/Columna…
beliefer Dec 13, 2021
3ce77ee
Update sql/core/src/main/scala/org/apache/spark/sql/execution/Columna…
beliefer Dec 13, 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: 2 additions & 0 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/hints.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ case class ResolvedHint(child: LogicalPlan, hints: HintInfo = HintInfo())
*/
case class JoinHint(leftHint: Option[HintInfo], rightHint: Option[HintInfo]) {

def isEmpty: Boolean = leftHint.isEmpty && rightHint.isEmpty

override def toString: String = {
Seq(
leftHint.map("leftHint=" + _),
Expand Down
6 changes: 2 additions & 4 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/Columnar.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,11 +548,9 @@ case class ApplyColumnarRulesAndInsertTransitions(

def apply(plan: SparkPlan): SparkPlan = {
var preInsertPlan: SparkPlan = plan
columnarRules.foreach((r : ColumnarRule) =>
preInsertPlan = r.preColumnarTransitions(preInsertPlan))
columnarRules.foreach( r => preInsertPlan = r.preColumnarTransitions(preInsertPlan))
Copy link
Contributor

@cloud-fan cloud-fan Dec 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how is this related to JoinSelection?

Copy link
Contributor Author

@beliefer beliefer Dec 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just simplify the code.

var postInsertPlan = insertTransitions(preInsertPlan, outputsColumnar)
columnarRules.reverse.foreach((r : ColumnarRule) =>
postInsertPlan = r.postColumnarTransitions(postInsertPlan))
columnarRules.reverse.foreach( r => postInsertPlan = r.postColumnarTransitions(postInsertPlan))
postInsertPlan
}
}
25 changes: 16 additions & 9 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/SparkStrategies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,11 +266,15 @@ abstract class SparkStrategies extends QueryPlanner[SparkPlan] {
}
}

createBroadcastHashJoin(true)
.orElse { if (hintToSortMergeJoin(hint)) createSortMergeJoin() else None }
.orElse(createShuffleHashJoin(true))
.orElse { if (hintToShuffleReplicateNL(hint)) createCartesianProduct() else None }
.getOrElse(createJoinWithoutHint())
if (hint.isEmpty) {
createJoinWithoutHint()
Copy link
Contributor

@cloud-fan cloud-fan Dec 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this change LGTM

Copy link
Contributor

@cloud-fan cloud-fan Dec 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we do this in case logical.Join(left, right, joinType, condition, hint) ... as well?

Copy link
Contributor Author

@beliefer beliefer Dec 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK

} else {
createBroadcastHashJoin(true)
.orElse { if (hintToSortMergeJoin(hint)) createSortMergeJoin() else None }
.orElse(createShuffleHashJoin(true))
.orElse { if (hintToShuffleReplicateNL(hint)) createCartesianProduct() else None }
.getOrElse(createJoinWithoutHint())
}

case j @ ExtractSingleColumnNullAwareAntiJoin(leftKeys, rightKeys) =>
Seq(joins.BroadcastHashJoinExec(leftKeys, rightKeys, LeftAnti, BuildRight,
Expand Down Expand Up @@ -339,10 +343,13 @@ abstract class SparkStrategies extends QueryPlanner[SparkPlan] {
}
}

createBroadcastNLJoin(hintToBroadcastLeft(hint), hintToBroadcastRight(hint))
.orElse { if (hintToShuffleReplicateNL(hint)) createCartesianProduct() else None }
.getOrElse(createJoinWithoutHint())

if (hint.isEmpty) {
createJoinWithoutHint()
} else {
createBroadcastNLJoin(hintToBroadcastLeft(hint), hintToBroadcastRight(hint))
.orElse { if (hintToShuffleReplicateNL(hint)) createCartesianProduct() else None }
.getOrElse(createJoinWithoutHint())
}

// --- Cases where this strategy does not apply ---------------------------------------------
case _ => Nil
Expand Down