[SPARK-31563][SQL] Fix failure of InSet.sql for collections of Catalyst's internal types #28343
Conversation
This file contains 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
srowen
reviewed
Apr 25, 2020
|
Test build #121802 has finished for PR 28343 at commit
|
dongjoon-hyun
pushed a commit
that referenced
this pull request
Apr 25, 2020
…st's internal types ### What changes were proposed in this pull request? In the PR, I propose to fix the `InSet.sql` method for the cases when input collection contains values of internal Catalyst's types, for instance `UTF8String`. Elements of the input set `hset` are converted to Scala types, and wrapped by `Literal` to properly form SQL view of the input collection. ### Why are the changes needed? The changes fixed the bug in `InSet.sql` that makes wrong assumption about types of collection elements. See more details in SPARK-31563. ### Does this PR introduce any user-facing change? Highly likely, not. ### How was this patch tested? Added a test to `ColumnExpressionSuite` Closes #28343 from MaxGekk/fix-InSet-sql. Authored-by: Max Gekk <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]> (cherry picked from commit 7d8216a) Signed-off-by: Dongjoon Hyun <[email protected]>
dongjoon-hyun
pushed a commit
that referenced
this pull request
Apr 25, 2020
…st's internal types In the PR, I propose to fix the `InSet.sql` method for the cases when input collection contains values of internal Catalyst's types, for instance `UTF8String`. Elements of the input set `hset` are converted to Scala types, and wrapped by `Literal` to properly form SQL view of the input collection. The changes fixed the bug in `InSet.sql` that makes wrong assumption about types of collection elements. See more details in SPARK-31563. Highly likely, not. Added a test to `ColumnExpressionSuite` Closes #28343 from MaxGekk/fix-InSet-sql. Authored-by: Max Gekk <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]> (cherry picked from commit 7d8216a) Signed-off-by: Dongjoon Hyun <[email protected]>
|
cc @holdenk since she is the release manager for 2.4.6. |
|
Thanks everyone :) |
cloud-fan
reviewed
Apr 28, 2020
| @@ -519,7 +520,9 @@ case class InSet(child: Expression, hset: Set[Any]) extends UnaryExpression with | |||
|
|
|||
| override def sql: String = { | |||
| val valueSQL = child.sql | |||
| val listSQL = hset.toSeq.map(Literal(_).sql).mkString(", ") | |||
| val listSQL = hset.toSeq | |||
| .map(elem => Literal(convertToScala(elem, child.dataType)).sql) | |||
There was a problem hiding this comment.
this converts the internal value to external value, and then Literal.apply converts external value to internal value.
Can we just do Literal(elem, child.dataType).sql?
There was a problem hiding this comment.
@cloud-fan No, Literal fails on UTF8String value, see #28328 (comment)
There was a problem hiding this comment.
Another problem is #28328 (comment)
There was a problem hiding this comment.
So, the problem is Literal requires external types but elem has internal Catalyst's type
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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?
In the PR, I propose to fix the
InSet.sqlmethod for the cases when input collection contains values of internal Catalyst's types, for instanceUTF8String. Elements of the input sethsetare converted to Scala types, and wrapped byLiteralto properly form SQL view of the input collection.Why are the changes needed?
The changes fixed the bug in
InSet.sqlthat makes wrong assumption about types of collection elements. See more details in SPARK-31563.Does this PR introduce any user-facing change?
Highly likely, not.
How was this patch tested?
Added a test to
ColumnExpressionSuite