Skip to content

[SPARK-16991][SQL] Fix EliminateOuterJoin optimizer to check all outer columns except join columns #14580

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

[SPARK-16991][SQL] Fix EliminateOuterJoin optimizer to check all outer columns except join columns #14580

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
7db83bc
[SPARK-16991][SQL] Fix `EliminateOuterJoin` optimizer to check output…
dongjoon-hyun Aug 10, 2016
af189d6
Address comments.
dongjoon-hyun Aug 15, 2016
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
7 changes: 5 additions & 2 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1334,12 +1334,15 @@ object EliminateOuterJoin extends Rule[LogicalPlan] with PredicateHelper {
val rightConditions = splitConjunctiveConditions
.filter(_.references.subsetOf(join.right.outputSet))

val joinAttributeSet = join.condition.map(_.references).getOrElse(AttributeSet.empty)
val leftOuterAttributeSet = join.left.outputSet -- joinAttributeSet
val rightOuterAttributeSet = join.right.outputSet -- joinAttributeSet
val leftHasNonNullPredicate = leftConditions.exists(canFilterOutNull) ||
filter.constraints.filter(_.isInstanceOf[IsNotNull])
.exists(expr => join.left.outputSet.intersect(expr.references).nonEmpty)
.exists(expr => leftOuterAttributeSet.intersect(expr.references).nonEmpty)
val rightHasNonNullPredicate = rightConditions.exists(canFilterOutNull) ||
filter.constraints.filter(_.isInstanceOf[IsNotNull])
.exists(expr => join.right.outputSet.intersect(expr.references).nonEmpty)
.exists(expr => rightOuterAttributeSet.intersect(expr.references).nonEmpty)

join.joinType match {
case RightOuter if leftHasNonNullPredicate => Inner
Expand Down
8 changes: 8 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2602,6 +2602,14 @@ class SQLQuerySuite extends QueryTest with SharedSQLContext {
Row(s"$expected") :: Nil)
}

test("SPARK-16991: Full outer join followed by inner join produces wrong results") {
val a = Seq((1, 2), (2, 3)).toDF("a", "b")
val b = Seq((2, 5), (3, 4)).toDF("a", "c")
val c = Seq((3, 1)).toDF("a", "d")
val ab = a.join(b, Seq("a"), "fullouter")
checkAnswer(ab.join(c, "a"), Row(3, null, 4, 1) :: Nil)
}

test("SPARK-15752 optimize metadata only query for datasource table") {
withSQLConf(SQLConf.OPTIMIZER_METADATA_ONLY.key -> "true") {
withTable("srcpart_15752") {
Expand Down