Skip to content

[SPARK-30768][SQL] Constraints inferred from inequality attributes #27518

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

[SPARK-30768][SQL] Constraints inferred from inequality attributes #27518

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b59a810
Constraints should be inferred from inequality attributes
wangyum Feb 10, 2020
999126c
Constraints should be inferred from inequality constraints
wangyum Feb 12, 2020
8843d45
Merge remote-tracking branch 'upstream/master' into SPARK-30768
wangyum Feb 14, 2020
d4eb2d7
fix test errors in TPCH
wangyum Feb 14, 2020
df679e6
Add more tests
wangyum Feb 16, 2020
3c9968a
Merge remote-tracking branch 'upstream/master' into SPARK-30768
wangyum Feb 17, 2020
f9a90aa
Remove semanticEquals Expression
wangyum Feb 17, 2020
bfa6039
fix
wangyum Feb 26, 2020
248e3cc
Add support another real case
wangyum Mar 7, 2020
af55a08
Only infer foldable constraints
wangyum Jun 8, 2020
5c76b9d
Simplify
wangyum Jun 12, 2020
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
6 changes: 5 additions & 1 deletion ...yst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/QueryPlanConstraints.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ trait ConstraintHelper {
val candidateConstraints = constraints - eq
inferredConstraints ++= replaceConstraints(candidateConstraints, l, r)
inferredConstraints ++= replaceConstraints(candidateConstraints, r, l)
case eq @ EqualTo(l: Attribute, r : Literal) =>
inferredConstraints ++= replaceConstraints(constraints - eq, l, r)
case eq @ EqualTo(l : Literal, r: Attribute) =>
inferredConstraints ++= replaceConstraints(constraints - eq, r, l)
case _ => // No inference
}
inferredConstraints -- constraints
Expand All @@ -75,7 +79,7 @@ trait ConstraintHelper {
private def replaceConstraints(
constraints: Set[Expression],
source: Expression,
destination: Attribute): Set[Expression] = constraints.map(_ transform {
destination: Expression): Set[Expression] = constraints.map(_ transform {
case e: Expression if e.semanticEquals(source) => destination
})

Expand Down
12 changes: 12 additions & 0 deletions ...test/scala/org/apache/spark/sql/catalyst/optimizer/InferFiltersFromConstraintsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,4 +263,16 @@ class InferFiltersFromConstraintsSuite extends PlanTest {
val y = testRelation.subquery('y)
testConstraintsAfterJoin(x, y, x.where(IsNotNull('a)), y, RightOuter)
}

test("SPARK-30768: Constraints should be inferred from inequality attributes") {
val condition = Some("x.a".attr > "y.a".attr)
val optimizedLeft = testRelation.where(IsNotNull('a) && 'a === 1).as("x")
val optimizedRight = testRelation.where(Literal(1) > 'a && IsNotNull('a) ).as("y")
val correct = optimizedLeft.join(optimizedRight, Inner, condition)

Seq(Literal(1) === 'a, 'a === Literal(1)).foreach { filter =>
val original = testRelation.where(filter).as("x").join(testRelation.as("y"), Inner, condition)
comparePlans(Optimize.execute(original.analyze), correct.analyze)
}
}
}