You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by GitBox <gi...@apache.org> on 2020/09/01 00:52:32 UTC

[GitHub] [spark] sunchao opened a new pull request #29603: [SPARK-32721][SQL][FOLLOWUP] Simplify if clauses with null and boolean

sunchao opened a new pull request #29603:
URL: https://github.com/apache/spark/pull/29603


   <!--
   Thanks for sending a pull request!  Here are some tips for you:
     1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
     2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
     3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
     4. Be sure to keep the PR description updated to reflect all changes.
     5. Please write your PR title to summarize what this PR proposes.
     6. If possible, provide a concise example to reproduce the issue for a faster review.
     7. If you want to add a new configuration, please read the guideline first for naming configurations in
        'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
   -->
   
   ### What changes were proposed in this pull request?
   <!--
   Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue. 
   If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
     1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
     2. If you fix some SQL features, you can provide some references of other DBMSes.
     3. If there is design documentation, please add the link.
     4. If there is a discussion in the mailing list, please add the link.
   -->
   
   This is a follow-up on SPARK-32721 and PR #29567. In the previous PR we missed two more cases that can be optimized:
   ```
   if(p, false, null) ==> and(not(p), null)
   if(p, true, null) ==> or(p, null)
   ```
   
   ### Why are the changes needed?
   <!--
   Please clarify why the changes are needed. For instance,
     1. If you propose a new API, clarify the use case for a new API.
     2. If you fix a bug, you can clarify why it is a bug.
   -->
   
   By transforming if to boolean conjunctions or disjunctions, we can enable more filter pushdown to datasources.
   
   ### Does this PR introduce _any_ user-facing change?
   <!--
   Note that it means *any* user-facing change including all aspects such as the documentation fix.
   If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
   If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
   If no, write 'No'.
   -->
   
   No
   
   ### How was this patch tested?
   <!--
   If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
   If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
   If tests were not added, please describe why they were not added and/or why it was difficult to add.
   -->
   
   Added unit tests.


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org

[GitHub] [spark] SparkQA removed a comment on pull request #29603: [SPARK-32721][SQL][FOLLOWUP] Simplify if clauses with null and boolean

Posted by GitBox <gi...@apache.org>.
SparkQA removed a comment on pull request #29603:
URL: https://github.com/apache/spark/pull/29603#issuecomment-684127528


   **[Test build #128124 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/128124/testReport)** for PR 29603 at commit [`978bad9`](https://github.com/apache/spark/commit/978bad9a870ee45d72e2bbe532c031660f80c12a).


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org

[GitHub] [spark] SparkQA removed a comment on pull request #29603: [SPARK-32721][SQL][FOLLOWUP] Simplify if clauses with null and boolean

Posted by GitBox <gi...@apache.org>.
SparkQA removed a comment on pull request #29603:
URL: https://github.com/apache/spark/pull/29603#issuecomment-684386343


   **[Test build #128136 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/128136/testReport)** for PR 29603 at commit [`34e3d38`](https://github.com/apache/spark/commit/34e3d38fd0fb9158acdfae119ad796e33aa928ec).


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org

[GitHub] [spark] sunchao commented on a change in pull request #29603: [SPARK-32721][SQL][FOLLOWUP] Simplify if clauses with null and boolean

Posted by GitBox <gi...@apache.org>.
sunchao commented on a change in pull request #29603:
URL: https://github.com/apache/spark/pull/29603#discussion_r480846770



##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/expressions.scala
##########
@@ -465,6 +465,8 @@ object SimplifyConditionals extends Rule[LogicalPlan] with PredicateHelper {
         if cond.deterministic && trueValue.semanticEquals(falseValue) => trueValue
       case If(cond, l @ Literal(null, _), FalseLiteral) if !cond.nullable => And(cond, l)
       case If(cond, l @ Literal(null, _), TrueLiteral) if !cond.nullable => Or(Not(cond), l)
+      case If(cond, FalseLiteral, l @ Literal(null, _)) if !cond.nullable => And(Not(cond), l)
+      case If(cond, TrueLiteral, l @ Literal(null, _)) if !cond.nullable => Or(cond, l)

Review comment:
       Hmm that will break each of these into two lines which may affect readability, also I think given these are already `Literal(null, _)`, naming the variable to `nullLiteral` doesn't add much value maybe? 

##########
File path: sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SimplifyConditionalSuite.scala
##########
@@ -166,29 +166,37 @@ class SimplifyConditionalSuite extends PlanTest with ExpressionEvalHelper with P
     )
   }
 
-  test("simplify if when then clause is null and else clause is boolean") {
+  test("simplify if when one clause is null and another is boolean") {
     val p = IsNull('a)
     val nullLiteral = Literal(null, BooleanType)
     assertEquivalent(If(p, nullLiteral, FalseLiteral), And(p, nullLiteral))
     assertEquivalent(If(p, nullLiteral, TrueLiteral), Or(IsNotNull('a), nullLiteral))
+    assertEquivalent(If(p, FalseLiteral, nullLiteral), And(IsNotNull('a), nullLiteral))
+    assertEquivalent(If(p, TrueLiteral, nullLiteral), Or(IsNull('a), nullLiteral))

Review comment:
       Will do.




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org

[GitHub] [spark] AmplabJenkins commented on pull request #29603: [SPARK-32721][SQL][FOLLOWUP] Simplify if clauses with null and boolean

Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #29603:
URL: https://github.com/apache/spark/pull/29603#issuecomment-684388347






----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org

[GitHub] [spark] AmplabJenkins removed a comment on pull request #29603: [SPARK-32721][SQL][FOLLOWUP] Simplify if clauses with null and boolean

Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #29603:
URL: https://github.com/apache/spark/pull/29603#issuecomment-684388347






----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org

[GitHub] [spark] sunchao commented on pull request #29603: [SPARK-32721][SQL][FOLLOWUP] Simplify if clauses with null and boolean

Posted by GitBox <gi...@apache.org>.
sunchao commented on pull request #29603:
URL: https://github.com/apache/spark/pull/29603#issuecomment-684143641


   cc @dbtsai 


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org

[GitHub] [spark] SparkQA commented on pull request #29603: [SPARK-32721][SQL][FOLLOWUP] Simplify if clauses with null and boolean

Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #29603:
URL: https://github.com/apache/spark/pull/29603#issuecomment-684386343


   **[Test build #128136 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/128136/testReport)** for PR 29603 at commit [`34e3d38`](https://github.com/apache/spark/commit/34e3d38fd0fb9158acdfae119ad796e33aa928ec).


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org

[GitHub] [spark] AmplabJenkins commented on pull request #29603: [SPARK-32721][SQL][FOLLOWUP] Simplify if clauses with null and boolean

Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #29603:
URL: https://github.com/apache/spark/pull/29603#issuecomment-684127875






----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org

[GitHub] [spark] AmplabJenkins commented on pull request #29603: [SPARK-32721][SQL][FOLLOWUP] Simplify if clauses with null and boolean

Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #29603:
URL: https://github.com/apache/spark/pull/29603#issuecomment-684799010






----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org

[GitHub] [spark] dbtsai commented on pull request #29603: [SPARK-32721][SQL][FOLLOWUP] Simplify if clauses with null and boolean

Posted by GitBox <gi...@apache.org>.
dbtsai commented on pull request #29603:
URL: https://github.com/apache/spark/pull/29603#issuecomment-684404680


   Merged into master. Thanks @sunchao @cloud-fan @viirya 


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org

[GitHub] [spark] AmplabJenkins removed a comment on pull request #29603: [SPARK-32721][SQL][FOLLOWUP] Simplify if clauses with null and boolean

Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #29603:
URL: https://github.com/apache/spark/pull/29603#issuecomment-684367170






----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org

[GitHub] [spark] SparkQA commented on pull request #29603: [SPARK-32721][SQL][FOLLOWUP] Simplify if clauses with null and boolean

Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #29603:
URL: https://github.com/apache/spark/pull/29603#issuecomment-684360847


   **[Test build #128124 has finished](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/128124/testReport)** for PR 29603 at commit [`978bad9`](https://github.com/apache/spark/commit/978bad9a870ee45d72e2bbe532c031660f80c12a).
    * This patch passes all tests.
    * This patch merges cleanly.
    * This patch adds no public classes.


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org

[GitHub] [spark] SparkQA commented on pull request #29603: [SPARK-32721][SQL][FOLLOWUP] Simplify if clauses with null and boolean

Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #29603:
URL: https://github.com/apache/spark/pull/29603#issuecomment-684797718


   **[Test build #128136 has finished](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/128136/testReport)** for PR 29603 at commit [`34e3d38`](https://github.com/apache/spark/commit/34e3d38fd0fb9158acdfae119ad796e33aa928ec).
    * This patch passes all tests.
    * This patch merges cleanly.
    * This patch adds no public classes.


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org

[GitHub] [spark] AmplabJenkins removed a comment on pull request #29603: [SPARK-32721][SQL][FOLLOWUP] Simplify if clauses with null and boolean

Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #29603:
URL: https://github.com/apache/spark/pull/29603#issuecomment-684127875






----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org

[GitHub] [spark] dbtsai commented on a change in pull request #29603: [SPARK-32721][SQL][FOLLOWUP] Simplify if clauses with null and boolean

Posted by GitBox <gi...@apache.org>.
dbtsai commented on a change in pull request #29603:
URL: https://github.com/apache/spark/pull/29603#discussion_r480779334



##########
File path: sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SimplifyConditionalSuite.scala
##########
@@ -166,29 +166,37 @@ class SimplifyConditionalSuite extends PlanTest with ExpressionEvalHelper with P
     )
   }
 
-  test("simplify if when then clause is null and else clause is boolean") {
+  test("simplify if when one clause is null and another is boolean") {
     val p = IsNull('a)
     val nullLiteral = Literal(null, BooleanType)
     assertEquivalent(If(p, nullLiteral, FalseLiteral), And(p, nullLiteral))
     assertEquivalent(If(p, nullLiteral, TrueLiteral), Or(IsNotNull('a), nullLiteral))
+    assertEquivalent(If(p, FalseLiteral, nullLiteral), And(IsNotNull('a), nullLiteral))
+    assertEquivalent(If(p, TrueLiteral, nullLiteral), Or(IsNull('a), nullLiteral))

Review comment:
       minor, make it consistent with the first test. Either we use `p` for `IsNull('a)` or in first test, we use `IsNull('a)`.




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org

[GitHub] [spark] dbtsai commented on a change in pull request #29603: [SPARK-32721][SQL][FOLLOWUP] Simplify if clauses with null and boolean

Posted by GitBox <gi...@apache.org>.
dbtsai commented on a change in pull request #29603:
URL: https://github.com/apache/spark/pull/29603#discussion_r480777332



##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/expressions.scala
##########
@@ -465,6 +465,8 @@ object SimplifyConditionals extends Rule[LogicalPlan] with PredicateHelper {
         if cond.deterministic && trueValue.semanticEquals(falseValue) => trueValue
       case If(cond, l @ Literal(null, _), FalseLiteral) if !cond.nullable => And(cond, l)
       case If(cond, l @ Literal(null, _), TrueLiteral) if !cond.nullable => Or(Not(cond), l)
+      case If(cond, FalseLiteral, l @ Literal(null, _)) if !cond.nullable => And(Not(cond), l)
+      case If(cond, TrueLiteral, l @ Literal(null, _)) if !cond.nullable => Or(cond, l)

Review comment:
       minor, can we call `l` as `nullLiteral`?
   
   ```
         case If(cond, nullLiteral @ Literal(null, _), FalseLiteral) if !cond.nullable => And(cond, nullLiteral)
         case If(cond, nullLiteral @ Literal(null, _), TrueLiteral) if !cond.nullable => Or(Not(cond), nullLiteral)
         case If(cond, FalseLiteral, nullLiteral @ Literal(null, _)) if !cond.nullable => And(Not(cond), nullLiteral)
         case If(cond, TrueLiteral, nullLiteral @ Literal(null, _)) if !cond.nullable => Or(cond, nullLiteral)
   ```




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org

[GitHub] [spark] dbtsai closed pull request #29603: [SPARK-32721][SQL][FOLLOWUP] Simplify if clauses with null and boolean

Posted by GitBox <gi...@apache.org>.
dbtsai closed pull request #29603:
URL: https://github.com/apache/spark/pull/29603


   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org

[GitHub] [spark] AmplabJenkins removed a comment on pull request #29603: [SPARK-32721][SQL][FOLLOWUP] Simplify if clauses with null and boolean

Posted by GitBox <gi...@apache.org>.
AmplabJenkins removed a comment on pull request #29603:
URL: https://github.com/apache/spark/pull/29603#issuecomment-684799010






----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org

[GitHub] [spark] SparkQA commented on pull request #29603: [SPARK-32721][SQL][FOLLOWUP] Simplify if clauses with null and boolean

Posted by GitBox <gi...@apache.org>.
SparkQA commented on pull request #29603:
URL: https://github.com/apache/spark/pull/29603#issuecomment-684127528


   **[Test build #128124 has started](https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/128124/testReport)** for PR 29603 at commit [`978bad9`](https://github.com/apache/spark/commit/978bad9a870ee45d72e2bbe532c031660f80c12a).


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org

[GitHub] [spark] AmplabJenkins commented on pull request #29603: [SPARK-32721][SQL][FOLLOWUP] Simplify if clauses with null and boolean

Posted by GitBox <gi...@apache.org>.
AmplabJenkins commented on pull request #29603:
URL: https://github.com/apache/spark/pull/29603#issuecomment-684367170






----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org