[SPARK-48162][SQL] Add collation support for MISC expressions #46461
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
uros-db
changed the title
uros-db
changed the title
|
Could you take a look at the UT failures? |
uros-db
commented
May 13, 2024
| @@ -84,7 +85,7 @@ case class RaiseError(errorClass: Expression, errorParms: Expression, dataType: | |||
| override def foldable: Boolean = false | |||
| override def nullable: Boolean = true | |||
| override def inputTypes: Seq[AbstractDataType] = | |||
| Seq(StringType, MapType(StringType, StringType)) | |||
| Seq(StringTypeAnyCollation, MapType(StringType, StringType)) | |||
There was a problem hiding this comment.
Note here: this particular expression cannot be used with the second parameter (MapType(StringType, StringType)), as it specifically doesn't allow passing that expression when constructing RaiseError
as per the current Spark expression API, user can only specify the first parameter, while the second one is only reserved for internal Spark use (where it's always passed as Literal with StringType(0))
hence, there's no need to use something like AbstractMapType(StringTypeAnyCollation, StringTypeAnyCollation) here
cloud-fan
approved these changes
May 15, 2024
|
thanks, merging to master! |
cloud-fan
pushed a commit
that referenced
this pull request
May 22, 2024
…r parameter map to work with collated strings ### 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 collation` test 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 `CollationSQLExpressionsANSIOffSuite` with ANSI disabled. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #46661 from uros-db/fix-abstract-map. Authored-by: Uros Bojanic <157381213+uros-db@users.noreply.github.com> Signed-off-by: Wenchen Fan <wenchen@databricks.com>
a0x8o
added a commit
to a0x8o/spark
that referenced
this pull request
May 22, 2024
…r parameter map to work with collated strings ### What changes were proposed in this pull request? Following up on the introduction of AbstractMapType (apache/spark#46458) and changes that introduce collation awareness for RaiseError expression (apache/spark#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 collation` test 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 `CollationSQLExpressionsANSIOffSuite` with ANSI disabled. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #46661 from uros-db/fix-abstract-map. Authored-by: Uros Bojanic <157381213+uros-db@users.noreply.github.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?
Introduce collation awareness for misc expressions: raise_error, uuid, version, typeof, aes_encrypt, aes_decrypt.
Why are the changes needed?
Add collation support for misc expressions in Spark.
Does this PR introduce any user-facing change?
Yes, users should now be able to use collated strings within arguments for misc functions: raise_error, uuid, version, typeof, aes_encrypt, aes_decrypt.
How was this patch tested?
E2e sql tests.
Was this patch authored or co-authored using generative AI tooling?
No.