[SPARK-48282][SQL][FOLLOWUP] Fix FindInSet code generation

uros-db · cloud-fan · commit d410e0631fbf · 2024-07-03T15:54:26.000+08:00
### What changes were proposed in this pull request? Fix codeGen path for FindInSet. ### Why are the changes needed? Error in original PR (#46682), caught by: #46801. ### 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 #47179 from uros-db/fix-findinset. Authored-by: Uros Bojanic <157381213+uros-db@users.noreply.github.com> Signed-off-by: Wenchen Fan <wenchen@databricks.com>
diff --git a/common/unsafe/src/main/java/org/apache/spark/sql/catalyst/util/CollationSupport.java b/common/unsafe/src/main/java/org/apache/spark/sql/catalyst/util/CollationSupport.java
@@ -332,7 +332,7 @@ public static String genCode(final String word, final String set, final int coll
       if (collation.supportsBinaryEquality) {
         return String.format(expr + "Binary(%s, %s)", word, set);
       } else {
-        return String.format(expr + "execCollationAware(%s, %s, %d)", word, set, collationId);
+        return String.format(expr + "CollationAware(%s, %s, %d)", word, set, collationId);
       }
     }
     public static int execBinary(final UTF8String word, final UTF8String set) {

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ public static String genCode(final String word, final String set, final int coll`
`332`	`332`	`if (collation.supportsBinaryEquality) {`
`333`	`333`	`return String.format(expr + "Binary(%s, %s)", word, set);`
`334`	`334`	`} else {`
`335`		`- return String.format(expr + "execCollationAware(%s, %s, %d)", word, set, collationId);`
	`335`	`+ return String.format(expr + "CollationAware(%s, %s, %d)", word, set, collationId);`
`336`	`336`	`}`
`337`	`337`	`}`
`338`	`338`	`public static int execBinary(final UTF8String word, final UTF8String set) {`