[SPARK-47476][SQL] Support REPLACE function to work with collated strings #45704
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
|
Hi, @miland-db and @cloud-fan . I saw a series of |
|
SQL tag is sufficient, but I don't mind people adding more grouping if the number of PRs is large enough. |
mihailom-db
reviewed
Mar 25, 2024
sql/core/src/test/scala/org/apache/spark/sql/CollationStringExpressionsSuite.scala
Outdated
Show resolved
Hide resolved
dongjoon-hyun
changed the title
Thank you, @cloud-fan . Then, let's not use this. I don't think this is a permanent grouping. |
MaxGekk
reviewed
Mar 25, 2024
miland-db
changed the title
cloud-fan
reviewed
Mar 26, 2024
common/unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java
Outdated
Show resolved
Hide resolved
uros-db
reviewed
Apr 1, 2024
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringExpressions.scala
Outdated
Show resolved
Hide resolved
uros-db
reviewed
Apr 1, 2024
common/unsafe/src/main/java/org/apache/spark/sql/catalyst/util/CollationFactory.java
Outdated
Show resolved
Hide resolved
uros-db
reviewed
Apr 1, 2024
common/unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java
Outdated
Show resolved
Hide resolved
|
heads up: we’ve done some major code restructuring in #45978, so please sync these changes before moving on @miland-db you’ll likely need to rewrite the code in this PR, so please follow the guidelines outlined in https://issues.apache.org/jira/browse/SPARK-47410 |
# Conflicts: # common/unsafe/src/main/java/org/apache/spark/sql/catalyst/util/CollationFactory.java # sql/core/src/test/scala/org/apache/spark/sql/CollationStringExpressionsSuite.scala
# Conflicts: # sql/core/src/test/scala/org/apache/spark/sql/CollationStringExpressionsSuite.scala
# Conflicts: # sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CollationTypeCasts.scala
# Conflicts: # common/unsafe/src/main/java/org/apache/spark/sql/catalyst/util/CollationSupport.java
# Conflicts: # sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CollationTypeCasts.scala
uros-db
suggested changes
Apr 22, 2024
# Conflicts: # common/unsafe/src/main/java/org/apache/spark/sql/catalyst/util/CollationSupport.java # common/unsafe/src/test/java/org/apache/spark/unsafe/types/CollationSupportSuite.java # sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CollationTypeCasts.scala
# Conflicts: # sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CollationTypeCasts.scala
# Conflicts: # sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CollationTypeCasts.scala
uros-db
approved these changes
Apr 25, 2024
cloud-fan
approved these changes
Apr 26, 2024
|
the Spark Connect test failure is flaky and unrelated here, I'm merging it to master, thanks! |
JacobZheng0927
pushed a commit
to JacobZheng0927/spark
that referenced
this pull request
May 11, 2024
…ings ### What changes were proposed in this pull request? Extend built-in string functions to support non-binary, non-lowercase collation for: replace. ### Why are the changes needed? Update collation support for built-in string functions in Spark. ### Does this PR introduce _any_ user-facing change? Yes, users should now be able to use COLLATE within arguments for built-in string function REPLACE in Spark SQL queries, using non-binary collations such as UNICODE_CI. ### How was this patch tested? Unit tests for queries using StringReplace (`CollationStringExpressionsSuite.scala`). ### Was this patch authored or co-authored using generative AI tooling? No ### Algorithm explanation - StringSearch.next() returns position of the first character of `search` string in the `source` source. We need to convert this position to position in bytes so we can perform replace operation correctly. - For UTF8_BINARY_LCASE collation there is no corresponding collator so we have to implement custom logic (`lowercaseReplace`). It is done by performing matching on **lowercase strings** (`source & search`) and using that information to do operations on the **original** `source` string. String building is performed in the same way as for other non-binary collations. Similar logic can be found in existing `int find(UTF8String str, int start)` & `int indexOf(UTF8String v, int start)` methods. Closes apache#45704 from miland-db/miland-db/string-replace. Lead-authored-by: Milan Dankovic <milan.dankovic@databricks.com> Co-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?
Extend built-in string functions to support non-binary, non-lowercase collation for: replace.
Why are the changes needed?
Update collation support for built-in string functions in Spark.
Does this PR introduce any user-facing change?
Yes, users should now be able to use COLLATE within arguments for built-in string function REPLACE in Spark SQL queries, using non-binary collations such as UNICODE_CI.
How was this patch tested?
Unit tests for queries using StringReplace (
CollationStringExpressionsSuite.scala).Was this patch authored or co-authored using generative AI tooling?
No
Algorithm explanation
searchstring in thesourcesource. We need to convert this position to position in bytes so we can perform replace operation correctly.lowercaseReplace). It is done by performing matching on lowercase strings (source & search) and using that information to do operations on the originalsourcestring. String building is performed in the same way as for other non-binary collations.Similar logic can be found in existing
int find(UTF8String str, int start)&int indexOf(UTF8String v, int start)methods.