[SPARK-39914][SQL] Add DS V2 Filter to V1 Filter conversion #37332
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
Contributor
Author
|
The GA failure doesn't seem relevant. |
Contributor
Author
|
@cloud-fan Could you please take a look when you have time? Thanks! |
LuciferYang
reviewed
Jul 29, 2022
| Some(In(attribute, Array.empty[Any])) | ||
| } | ||
|
|
||
| case "=" | "<=>" | ">" | "<" | ">=" | "<=" if predicate.children().length == 2 && |
Contributor
There was a problem hiding this comment.
Both case "=" | "<=>" | ">" | "<" | ">=" | "<=" and "STARTS_WITH" | "ENDS_WITH" | "CONTAINS" use condition
if predicate.children().length == 2 &&
predicate.children()(0).isInstanceOf[NamedReference] &&
predicate.children()(1).isInstanceOf[LiteralValue[_]]
Is it necessary to extract a function?
This reverts commit a167e61.
cloud-fan
reviewed
Jul 29, 2022
|
|
||
| case "AND" => | ||
| val and = predicate.asInstanceOf[V2And] | ||
| Some(And(toV1(and.left()).get, toV1(and.right()).get)) |
Contributor
There was a problem hiding this comment.
I think we should return None if any of the children can't be converted to v1.
cloud-fan
reviewed
Aug 1, 2022
| case "=" | "<=>" | ">" | "<" | ">=" | "<=" if isValidBinaryPredicate => | ||
| val attribute = predicate.children()(0).toString | ||
| val value = predicate.children()(1).asInstanceOf[LiteralValue[_]] | ||
| predicate.name() match { |
Contributor
There was a problem hiding this comment.
nit:
val v1Value = CatalystTypeConverters.convertToScala(value.value, value.dataType)
val v1Filter = predicate.name() match {
case "=" =>EqualTo(attribute, v1Value)
...
}
Some(v1Filter)
cloud-fan
reviewed
Aug 1, 2022
|
|
||
| case "NOT" => | ||
| val not = predicate.asInstanceOf[V2Not] | ||
| Some(Not(toV1(not.child()).get)) |
Contributor
There was a problem hiding this comment.
toV1(not.child()) may not always return Some
cloud-fan
approved these changes
Aug 1, 2022
Contributor
Author
|
Thanks for reviewing! Merged to master. |
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?
Add util methods to convert DS V2 Filter to V1 Filter.
Why are the changes needed?
Provide convenient methods to convert V2 to V1 Filters. These methods can be used by
SupportsRuntimeFilteringand later be used bySupportsDeleteDoes this PR introduce any user-facing change?
No. These are intended for internal use only
How was this patch tested?
new tests