Skip to content

[SPARK-42136] Refactor BroadcastHashJoinExec output partitioning calculation #38038

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
peter-toth wants to merge 2 commits into from
Closed

[SPARK-42136] Refactor BroadcastHashJoinExec output partitioning calculation #38038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89065f6
[SPARK-42136][SQL] Refactor BroadcastHashJoinExec output partitioning…
peter-toth Sep 28, 2022
208d1a0
Merge commit '93d169db31991c354cb46c3bacc0de4f0517d819' into SPARK-42…
peter-toth Jan 31, 2023
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
27 changes: 5 additions & 22 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/joins/BroadcastHashJoinExec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,28 +112,11 @@ case class BroadcastHashJoinExec(
// Seq("a", "b", "c"), Seq("a", "b", "y"), Seq("a", "x", "c"), Seq("a", "x", "y").
// The expanded expressions are returned as PartitioningCollection.
private def expandOutputPartitioning(partitioning: HashPartitioning): PartitioningCollection = {
val maxNumCombinations = conf.broadcastHashJoinOutputPartitioningExpandLimit
var currentNumCombinations = 0

def generateExprCombinations(
current: Seq[Expression],
accumulated: Seq[Expression]): Seq[Seq[Expression]] = {
if (currentNumCombinations >= maxNumCombinations) {
Nil
} else if (current.isEmpty) {
currentNumCombinations += 1
Seq(accumulated)
} else {
val buildKeysOpt = streamedKeyToBuildKeyMapping.get(current.head.canonicalized)
generateExprCombinations(current.tail, accumulated :+ current.head) ++
buildKeysOpt.map(_.flatMap(b => generateExprCombinations(current.tail, accumulated :+ b)))
.getOrElse(Nil)
}
}

PartitioningCollection(
generateExprCombinations(partitioning.expressions, Nil)
.map(HashPartitioning(_, partitioning.numPartitions)))
PartitioningCollection(partitioning.multiTransformDown {
case e: Expression if streamedKeyToBuildKeyMapping.contains(e.canonicalized) =>
e +: streamedKeyToBuildKeyMapping(e.canonicalized)
}.asInstanceOf[Stream[HashPartitioning]]
.take(conf.broadcastHashJoinOutputPartitioningExpandLimit))
}

protected override def doExecute(): RDD[InternalRow] = {
Expand Down
6 changes: 3 additions & 3 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/joins/BroadcastJoinSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,8 +554,8 @@ abstract class BroadcastJoinSuiteBase extends QueryTest with SQLTestUtils
right = DummySparkPlan())
var expected = PartitioningCollection(Seq(
HashPartitioning(Seq(l1, l2, l3), 1),
HashPartitioning(Seq(l1, l2, r2), 1),
HashPartitioning(Seq(l1, r1, l3), 1),
HashPartitioning(Seq(l1, l2, r2), 1),
HashPartitioning(Seq(l1, r1, r2), 1)))
assert(bhj.outputPartitioning === expected)

Expand All @@ -571,8 +571,8 @@ abstract class BroadcastJoinSuiteBase extends QueryTest with SQLTestUtils
right = DummySparkPlan())
expected = PartitioningCollection(Seq(
HashPartitioning(Seq(l1, l2), 1),
HashPartitioning(Seq(l1, r2), 1),
HashPartitioning(Seq(r1, l2), 1),
HashPartitioning(Seq(l1, r2), 1),
HashPartitioning(Seq(r1, r2), 1),
HashPartitioning(Seq(l3), 1),
HashPartitioning(Seq(r3), 1)))
Expand Down Expand Up @@ -623,8 +623,8 @@ abstract class BroadcastJoinSuiteBase extends QueryTest with SQLTestUtils

val expected = Seq(
HashPartitioning(Seq(l1, l2), 1),
HashPartitioning(Seq(l1, r2), 1),
HashPartitioning(Seq(r1, l2), 1),
HashPartitioning(Seq(l1, r2), 1),
HashPartitioning(Seq(r1, r2), 1))

Seq(1, 2, 3, 4).foreach { limit =>
Expand Down