Skip to content

[SPARK-29162][SQL] Simplify NOT(IsNull(x)) and NOT(IsNotNull(x)) #25878

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

[SPARK-29162][SQL] Simplify NOT(IsNull(x)) and NOT(IsNotNull(x)) #25878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fa8b240
Simplify NOT(isnull(x)) and NOT(isnotnull(x))
AngersZhuuuu Sep 21, 2019
a701dca
fix code style
AngersZhuuuu Sep 21, 2019
978a284
move optimize place
AngersZhuuuu Sep 21, 2019
f139558
change test method
AngersZhuuuu Sep 21, 2019
9bf2d7c
remove unused import
AngersZhuuuu Sep 21, 2019
a75c2ef
follow comment
AngersZhuuuu Sep 22, 2019
1fdea48
fix UT place
AngersZhuuuu Sep 22, 2019
cb9cef2
remove unused import
AngersZhuuuu Sep 22, 2019
9f5defa
follow comment
AngersZhuuuu Sep 22, 2019
f71698d
for better code style
AngersZhuuuu Sep 22, 2019
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
3 changes: 3 additions & 0 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/expressions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,9 @@ object BooleanSimplification extends Rule[LogicalPlan] with PredicateHelper {
case Not(a And b) => Or(Not(a), Not(b))

case Not(Not(e)) => e

case Not(IsNull(e)) => IsNotNull(e)
case Not(IsNotNull(e)) => IsNull(e)
}
}
}
Expand Down
5 changes: 5 additions & 0 deletions ...t/src/test/scala/org/apache/spark/sql/catalyst/optimizer/BooleanSimplificationSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,11 @@ class BooleanSimplificationSuite extends PlanTest with ExpressionEvalHelper with
checkCondition(!'f || 'e, testRelationWithData.where(!'f || 'e).analyze)
}

test("simplify NOT(IsNull(x)) and NOT(IsNotNull(x))") {
checkCondition(Not(IsNotNull('b)), IsNull('b))
checkCondition(Not(IsNull('b)), IsNotNull('b))
}
Copy link
Member

Choose a reason for hiding this comment

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

@AngersZhuuuu . Since you are active contribution, I'd like to recommend to use DSL as possible as you can. (Please refer the other tests.)

  test("simplify NOT(IsNull(x)) and NOT(IsNotNull(x))") {
    checkCondition(Not(IsNotNull('e)), IsNull('e))
    checkCondition(Not(IsNull('e)), IsNotNull('e))
  }

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@AngersZhuuuu . Since you are active contribution, I'd like to recommend to use DSL as possible as you can. (Please refer the other tests.)

First time use DSL, I will get to know DSL more


protected def assertEquivalent(e1: Expression, e2: Expression): Unit = {
val correctAnswer = Project(Alias(e2, "out")() :: Nil, OneRowRelation()).analyze
val actual = Optimize.execute(Project(Alias(e1, "out")() :: Nil, OneRowRelation()).analyze)
Expand Down