[SPARK-24879][SQL] Fix NPE in Hive partition pruning filter pushdown #21832
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
|
ok to test |
gatorsmile
reviewed
Jul 20, 2018
| """stringcol = 'p1" and q="q1' and 'p2" and q="q2' = stringcol""") | ||
|
|
||
| filterTest("SPARK-24879 null literals should be ignored for IN constructs", | ||
| Seq(a("intcol", IntegerType) in (Literal(1), Literal(null))), |
Member
There was a problem hiding this comment.
Let us add more test cases for better test coverage
gatorsmile
reviewed
Jul 20, 2018
| object ExtractableLiterals { | ||
| def unapply(exprs: Seq[Expression]): Option[Seq[String]] = { | ||
| val extractables = exprs.map(ExtractableLiteral.unapply) | ||
| // SPARK-24879: The Hive filter parser does not support "null", but we still want to push |
Member
There was a problem hiding this comment.
-> Hive metastore filter parser
gatorsmile
reviewed
Jul 20, 2018
| val extractables = exprs.map(ExtractableLiteral.unapply) | ||
| // SPARK-24879: The Hive filter parser does not support "null", but we still want to push | ||
| // down as many predicates as we can while still maintaining correctness. "x in (a, b, | ||
| // null)" can be rewritten as "x in (a, b)" for the purposes of partition pruning, so we |
Member
There was a problem hiding this comment.
Maybe we should write down the rules here.
1 in (2, NULL) -> NULL
1 in (1, NULL) -> true
1 in (2) -> false
NULL is not equal to FALSE. Since all the pushed down predicates are NULL intolerant and connected by AND or OR, NULL can be treated as FALSE.
Member
|
Test this please |
Member
|
add to whitelist |
|
Test build #93369 has finished for PR 21832 at commit
|
Member
|
LGTM Thanks! Merged to master/2.3 |
asfgit
pushed a commit
that referenced
this pull request
Jul 21, 2018
## What changes were proposed in this pull request? We get a NPE when we have a filter on a partition column of the form `col in (x, null)`. This is due to the filter converter in HiveShim not handling `null`s correctly. This patch fixes this bug while still pushing down as much of the partition pruning predicates as possible, by filtering out `null`s from any `in` predicate. Since Hive only supports very simple partition pruning filters, this change should preserve correctness. ## How was this patch tested? Unit tests, manual tests Author: William Sheu <william.sheu@databricks.com> Closes #21832 from PenguinToast/partition-pruning-npe. (cherry picked from commit bbd6f0c) Signed-off-by: Xiao Li <gatorsmile@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
We get a NPE when we have a filter on a partition column of the form
col in (x, null). This is due to the filter converter in HiveShim not handlingnulls correctly. This patch fixes this bug while still pushing down as much of the partition pruning predicates as possible, by filtering outnulls from anyinpredicate. Since Hive only supports very simple partition pruning filters, this change should preserve correctness.How was this patch tested?
Unit tests, manual tests