[SPARK-48364][SQL] Add AbstractMapType type casting and fix RaiseError parameter map to work with collated strings #46661
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
cloud-fan
approved these changes
May 20, 2024
uros-db
changed the title
uros-db
commented
May 21, 2024
cloud-fan
reviewed
May 22, 2024
| @@ -85,6 +85,11 @@ object CollationTypeCasts extends TypeCoercionRule { | |||
| private def extractStringType(dt: DataType): StringType = dt match { | |||
| case st: StringType => st | |||
| case ArrayType(et, _) => extractStringType(et) | |||
| case MapType(kt, vt, _) => if (hasStringType(kt)) { | |||
There was a problem hiding this comment.
this assumes the key value should be the same string type. I think it's fine, but we can revisit this later.
There was a problem hiding this comment.
yes, this might be a bit confusing - we'll keep it in mind for possible future revisit
|
thanks, merging to master! |
cloud-fan
pushed a commit
that referenced
this pull request
May 31, 2024
…d strings
### What changes were proposed in this pull request?
Following queries return unexpected results:
```
select collation(map('a', 'b' collate utf8_binary_lcase)['a']);
select collation(element_at(map('a', 'b' collate utf8_binary_lcase), 'a'));
```
Both return `UTF8_BINARY` instead of `UTF8_BINARY_LCASE`.
The error was introduced by changes in #46661 that tried to solve other problem with `RaiseError` expression (please refer to PR for details). Partially revert changes of mentioned PR and fix the `RaiseError` issue by explicitly setting `UTF8_BINARY` collation.
### Why are the changes needed?
To fix wrong results of mentioned queries.
### Does this PR introduce _any_ user-facing change?
Yes, it fixed explained error.
### How was this patch tested?
Added test to `CollationSQLExpressionsSuite`.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #46758 from nikolamand-db/SPARK-48430.
Authored-by: Nikola Mandic <nikola.mandic@databricks.com>
Signed-off-by: Wenchen Fan <wenchen@databricks.com>
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?
Following up on the introduction of AbstractMapType (#46458) and changes that introduce collation awareness for RaiseError expression (#46461), this PR should add the appropriate type casting rules for AbstractMapType.
Why are the changes needed?
Fix the CI failure for the
Support RaiseError misc expression with collationtest when ANSI is off.Does this PR introduce any user-facing change?
Yes, type casting is now allowed for map types with collated strings.
How was this patch tested?
Extended suite
CollationSQLExpressionsANSIOffSuitewith ANSI disabled.Was this patch authored or co-authored using generative AI tooling?
No.