This is an automated email from the ASF dual-hosted git repository.

wenchen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git


The following commit(s) were added to refs/heads/master by this push:
     new 4cf54508fd23 [SPARK-48699][SQL][FOLLOWUP] Refine collation API
4cf54508fd23 is described below

commit 4cf54508fd23ed5acd45a2d428241f080ac5bc9c
Author: Uros Bojanic <[email protected]>
AuthorDate: Wed Jun 26 16:17:20 2024 +0800

    [SPARK-48699][SQL][FOLLOWUP] Refine collation API
    
    ### What changes were proposed in this pull request?
    Following up on https://github.com/apache/spark/pull/47014, a small fix.
    
    ### Why are the changes needed?
    CI is broken to due a conflict after merge.
    
    ### Does this PR introduce _any_ user-facing change?
    No.
    
    ### How was this patch tested?
    Existing tests.
    
    ### Was this patch authored or co-authored using generative AI tooling?
    No.
    
    Closes #47098 from uros-db/fix-spec.
    
    Authored-by: Uros Bojanic <[email protected]>
    Signed-off-by: Wenchen Fan <[email protected]>
---
 .../java/org/apache/spark/sql/catalyst/util/CollationFactory.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/common/unsafe/src/main/java/org/apache/spark/sql/catalyst/util/CollationFactory.java
 
b/common/unsafe/src/main/java/org/apache/spark/sql/catalyst/util/CollationFactory.java
index 50b218431c0c..f13f66e384e0 100644
--- 
a/common/unsafe/src/main/java/org/apache/spark/sql/catalyst/util/CollationFactory.java
+++ 
b/common/unsafe/src/main/java/org/apache/spark/sql/catalyst/util/CollationFactory.java
@@ -845,8 +845,8 @@ public final class CollationFactory {
     String[] validModifiers;
     if (collationName.startsWith("UTF8_")) {
       validRootNames = new String[]{
-        Collation.CollationSpecUTF8Binary.UTF8_BINARY_COLLATION.collationName,
-        Collation.CollationSpecUTF8Binary.UTF8_LCASE_COLLATION.collationName
+        Collation.CollationSpecUTF8.UTF8_BINARY_COLLATION.collationName,
+        Collation.CollationSpecUTF8.UTF8_LCASE_COLLATION.collationName
       };
       validModifiers = new String[0];
     } else {


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to