Skip to content

[SPARK-49204][SQL][FOLLOWUP] Fix IndexOutOfBoundsException when dealing with surrogate pairs #47871

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
stevomitric wants to merge 3 commits into from
Closed

[SPARK-49204][SQL][FOLLOWUP] Fix IndexOutOfBoundsException when dealing with surrogate pairs #47871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b106aa
fix out of bounds exception
stevomitric Aug 26, 2024
1a47f75
add empty substring tests
stevomitric Aug 26, 2024
76fef08
add empty string tests
stevomitric Aug 26, 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
5 changes: 5 additions & 0 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 @@ -671,6 +671,11 @@ public static int indexOf(final UTF8String target, final UTF8String pattern,
// Initialize the string search with respect to the specified ICU collation.
String targetStr = target.toValidString();
String patternStr = pattern.toValidString();
// Check if `start` is out of bounds. The provided offset `start` is given in number of
// codepoints, so a simple `targetStr.length` check is not sufficient here. This check is
Copy link
Member

@MaxGekk MaxGekk Aug 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the explanation.

// needed because `String.offsetByCodePoints` throws an `IndexOutOfBoundsException`
// exception when the offset is out of bounds.
if (targetStr.codePointCount(0, targetStr.length()) <= start) return MATCH_NOT_FOUND;
StringSearch stringSearch =
CollationFactory.getStringSearch(targetStr, patternStr, collationId);
stringSearch.setOverlapping(true);
Expand Down
21 changes: 21 additions & 0 deletions common/unsafe/src/test/java/org/apache/spark/unsafe/types/CollationSupportSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2329,6 +2329,27 @@ public void testStringLocate() throws SparkException {
assertStringLocate("b", "a🙃x🙃b", 4, "UTF8_LCASE", 5);
assertStringLocate("b", "a🙃x🙃b", 4, "UNICODE", 5);
assertStringLocate("b", "a🙃x🙃b", 4, "UNICODE_CI", 5);
// Out of bounds test cases.
assertStringLocate("a", "asd", 4, "UTF8_BINARY", 0);
assertStringLocate("a", "asd", 4, "UTF8_LCASE", 0);
assertStringLocate("a", "asd", 4, "UNICODE", 0);
assertStringLocate("a", "asd", 4, "UNICODE_CI", 0);
assertStringLocate("a", "asd", 100, "UTF8_BINARY", 0);
assertStringLocate("a", "asd", 100, "UTF8_LCASE", 0);
assertStringLocate("a", "asd", 100, "UNICODE", 0);
assertStringLocate("a", "asd", 100, "UNICODE_CI", 0);
assertStringLocate("a", "🙃🙃", 4, "UTF8_BINARY", 0);
assertStringLocate("a", "🙃🙃", 4, "UTF8_LCASE", 0);
assertStringLocate("a", "🙃🙃", 4, "UNICODE", 0);
assertStringLocate("a", "🙃🙃", 4, "UNICODE_CI", 0);
assertStringLocate("", "asd", 100, "UTF8_BINARY", 1);
assertStringLocate("", "asd", 100, "UTF8_LCASE", 1);
assertStringLocate("", "asd", 100, "UNICODE", 1);
assertStringLocate("", "asd", 100, "UNICODE_CI", 1);
assertStringLocate("asd", "", 100, "UTF8_BINARY", 0);
assertStringLocate("asd", "", 100, "UTF8_LCASE", 0);
assertStringLocate("asd", "", 100, "UNICODE", 0);
assertStringLocate("asd", "", 100, "UNICODE_CI", 0);
}

/**
Expand Down