Skip to content

[SPARK-33798][SQL] Add new rule to push down the foldable expressions through CaseWhen/If #30790

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 12 commits into from
Closed

[SPARK-33798][SQL] Add new rule to push down the foldable expressions through CaseWhen/If #30790

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
19b0a83
Simplify EqualTo(CaseWhen/If, Literal) always false
wangyum Dec 16, 2020
831bf66
Address comments
wangyum Dec 16, 2020
859893d
Null value should be handled by NullPropagation.
wangyum Dec 16, 2020
db584ef
Handle Null values
wangyum Dec 16, 2020
55f4528
address comments
wangyum Dec 16, 2020
0a48048
address comments
wangyum Dec 17, 2020
f9f622f
Push down EqualTo through CaseWhen/If
wangyum Dec 17, 2020
21ef0c3
Push down EqualTo through CaseWhen/If
wangyum Dec 17, 2020
d5135ec
Fix
wangyum Dec 17, 2020
8ccc3c1
fix
wangyum Dec 17, 2020
45b56fc
fix
wangyum Dec 18, 2020
cfac0e8
fix
wangyum Dec 18, 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
Prev Previous commit
Next Next commit
address comments
  • Loading branch information
@wangyum
wangyum committed Dec 16, 2020
commit 55f4528e7e61629e2194adb055f3ba52ae4a875b
26 changes: 13 additions & 13 deletions ...yst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SimplifyConditionalSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,16 +203,17 @@ class SimplifyConditionalSuite extends PlanTest with ExpressionEvalHelper with P
test("SPARK-33798: simplify EqualTo(If, Literal) always false") {
val a = EqualTo(UnresolvedAttribute("a"), Literal(100))
val b = UnresolvedAttribute("b")
val ifExp = If(a === Literal(1), Literal(2), Literal(3))
val ifExp = If(a, Literal(2), Literal(3))

assertEquivalent(EqualTo(ifExp, Literal(4)), FalseLiteral)
assertEquivalent(EqualTo(ifExp, Literal(3)), EqualTo(ifExp, Literal(3)))
assertEquivalent(EqualTo(ifExp, Literal("4")), FalseLiteral)
Copy link
Contributor

@cloud-fan cloud-fan Dec 16, 2020

Choose a reason for hiding this comment

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

ditto, let's don't test invalid expressions, ifExp.dataType is int, not string.

assertEquivalent(EqualTo(ifExp, Literal("3")), EqualTo(ifExp, Literal(3)))

// Do not simplify if it contains non foldable expressions.
assertEquivalent(EqualTo(If(a === Literal(1), b, Literal(2)), Literal(3)),
EqualTo(If(a === Literal(1), b, Literal(2)), Literal(3)))
assertEquivalent(
EqualTo(If(a, b, Literal(2)), Literal(3)),
EqualTo(If(a, b, Literal(2)), Literal(3)))
val nonFoldable = If(NonFoldableLiteral(true), Literal(1), Literal(2))
Copy link
Contributor

@cloud-fan cloud-fan Dec 16, 2020

Choose a reason for hiding this comment

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

NonFoldableLiteral is nothing special comparing to 'a == 100, as they are both non-foldable. I think we don't need to test with NonFoldableLiteral

assertEquivalent(EqualTo(nonFoldable, Literal(1)), EqualTo(nonFoldable, Literal(1)))

Expand All @@ -223,20 +224,19 @@ class SimplifyConditionalSuite extends PlanTest with ExpressionEvalHelper with P

// Should not handle Null values.
assertEquivalent(
EqualTo(If(a === Literal(1), Literal(null, IntegerType), Literal(1)), Literal(2)),
EqualTo(If(a === Literal(1), Literal(null, IntegerType), Literal(1)), Literal(2)))
EqualTo(If(a, Literal(null, IntegerType), Literal(1)), Literal(2)),
EqualTo(If(a, Literal(null, IntegerType), Literal(1)), Literal(2)))
assertEquivalent(
EqualTo(If(a =!= Literal(1), Literal(1), Literal(2)), Literal(null, IntegerType)),
EqualTo(If(a =!= Literal(1), Literal(1), Literal(2)), Literal(null, IntegerType)))
EqualTo(If(!a, Literal(1), Literal(2)), Literal(null, IntegerType)),
Copy link
Contributor

@cloud-fan cloud-fan Dec 16, 2020

Choose a reason for hiding this comment

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

as a unit test, we know that we only care if the condition is foldable or not. I think we don't need to test !a as it doesn't improve test coverage.

EqualTo(If(!a, Literal(1), Literal(2)), Literal(null, IntegerType)))
assertEquivalent(
EqualTo(If(a === Literal(1), Literal(null, IntegerType), Literal(1)), Literal(1)),
EqualTo(If(a === Literal(1), Literal(null, IntegerType), Literal(1)), Literal(1)))
EqualTo(If(a, Literal(null, IntegerType), Literal(1)), Literal(1)),
EqualTo(If(a, Literal(null, IntegerType), Literal(1)), Literal(1)))
assertEquivalent(
EqualTo(If(a =!= Literal(1), Literal(null, IntegerType), Literal(1)), Literal(1)),
EqualTo(If(a =!= Literal(1), Literal(null, IntegerType), Literal(1)), Literal(1)))
EqualTo(If(!a, Literal(null, IntegerType), Literal(1)), Literal(1)),
EqualTo(If(!a, Literal(null, IntegerType), Literal(1)), Literal(1)))
assertEquivalent(
EqualTo(If(a =!= Literal(1), Literal(null, IntegerType), Literal(null, IntegerType)),
Literal(1)),
EqualTo(If(!a, Literal(null, IntegerType), Literal(null, IntegerType)), Literal(1)),
Literal(null, BooleanType))
}

Expand Down