Skip to content

[SPARK-49204][SQL] Fix surrogate pair handling in StringInstr and StringLocate #47711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
uros-db wants to merge 2 commits into from
Closed

[SPARK-49204][SQL] Fix surrogate pair handling in StringInstr and StringLocate #47711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca4695e
StringInstr and StringLocate
uros-db Aug 12, 2024
cec2830
Scalastyle fix
uros-db Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions common/unsafe/src/main/java/org/apache/spark/sql/catalyst/util/CollationAwareUTF8String.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,11 +703,26 @@ public static int indexOf(final UTF8String target, final UTF8String pattern,
final int start, final int collationId) {
if (pattern.numBytes() == 0) return target.indexOfEmpty(start);
if (target.numBytes() == 0) return MATCH_NOT_FOUND;

StringSearch stringSearch = CollationFactory.getStringSearch(target, pattern, collationId);
stringSearch.setIndex(start);

return stringSearch.next();
// Initialize the string search with respect to the specified ICU collation.
String targetStr = target.toValidString();
String patternStr = pattern.toValidString();
StringSearch stringSearch =
CollationFactory.getStringSearch(targetStr, patternStr, collationId);
stringSearch.setOverlapping(true);
// Start the search from `start`-th code point (NOT necessarily from the `start`-th character).
int startIndex = targetStr.offsetByCodePoints(0, start);
stringSearch.setIndex(startIndex);
// Perform the search and return the next result, starting from the specified position.
int searchIndex = stringSearch.next();
if (searchIndex == StringSearch.DONE) {
return MATCH_NOT_FOUND;
}
// Convert the search index from character count to code point count.
int indexOf = targetStr.codePointCount(0, searchIndex);
if (indexOf < start) {
return MATCH_NOT_FOUND;
}
return indexOf;
}

private static int find(UTF8String target, UTF8String pattern, int start,
Expand Down
Loading