Skip to content

[SPARK-1880] [SQL] Eliminate unnecessary job executions. #825

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

[SPARK-1880] [SQL] Eliminate unnecessary job executions. #825

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bff4d9
Move preparing of rightOuterMatches to after checking joinType not to…
ueshin May 19, 2014
63cacbf
Use fold instead of count and then reduce to eliminate unnecessary jo…
ueshin May 19, 2014
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
38 changes: 17 additions & 21 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/joins.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,28 +211,24 @@ case class BroadcastNestedLoopJoin(
Iterator((matchedRows, includedBroadcastTuples))
}

val includedBroadcastTuples = streamedPlusMatches.map(_._2)
val allIncludedBroadcastTuples =
if (includedBroadcastTuples.count == 0) {
new scala.collection.mutable.BitSet(broadcastedRelation.value.size)
} else {
streamedPlusMatches.map(_._2).reduce(_ ++ _)
}

val rightOuterMatches: Seq[Row] =
if (joinType == RightOuter || joinType == FullOuter) {
broadcastedRelation.value.zipWithIndex.filter {
case (row, i) => !allIncludedBroadcastTuples.contains(i)
}.map {
// TODO: Use projection.
case (row, _) => buildRow(Vector.fill(left.output.size)(null) ++ row)
if (joinType == RightOuter || joinType == FullOuter) {
val includedBroadcastTuples = streamedPlusMatches.map(_._2)
val allIncludedBroadcastTuples =
includedBroadcastTuples.fold(
new scala.collection.mutable.BitSet(broadcastedRelation.value.size))(_ ++ _)

val rightOuterMatches: Seq[Row] =
broadcastedRelation.value.zipWithIndex.collect {
case (row, i) if !allIncludedBroadcastTuples.contains(i) =>
// TODO: Use projection.
buildRow(Vector.fill(left.output.size)(null) ++ row)
}
} else {
Vector()
}

// TODO: Breaks lineage.
sc.union(
streamedPlusMatches.flatMap(_._1), sc.makeRDD(rightOuterMatches))
// TODO: Breaks lineage.
sc.union(
streamedPlusMatches.flatMap(_._1), sc.makeRDD(rightOuterMatches))
} else {
streamedPlusMatches.flatMap(_._1)
}
}
}