Skip to content

[SPARK-58443][SQL] Fix wrong results/exception in instr and substring_index for an Integer.MIN_VALUE position or count #57648

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

Open
jiwen624 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[SPARK-58443][SQL] Fix wrong results/exception in instr and substring_index for an Integer.MIN_VALUE position or count #57648

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
af3091b
[SPARK-58443][SQL] Fix instr returning a wrong position for Int.MinVa…
jiwen624 Jul 30, 2026
6ecd81c
[SPARK-58443][SQL] Extend the Int.MinValue overflow fix to substring_…
jiwen624 Jul 31, 2026
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
12 changes: 7 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 @@ -979,7 +979,7 @@ private static int findIndex(final StringSearch stringSearch, int count) {
return index;
}

private static int findIndexReverse(final StringSearch stringSearch, int count) {
private static int findIndexReverse(final StringSearch stringSearch, long count) {
assert(count >= 0);
int index = 0;
while (count > 0) {
Expand Down Expand Up @@ -1026,7 +1026,8 @@ public static UTF8String subStringIndex(final UTF8String string, final UTF8Strin
}
} else {
// If the count is negative, we search for the count-th delimiter from the right.
int searchIndex = findIndexReverse(stringSearch, -count);
// The count is widened to a long because negating it overflows for Integer.MIN_VALUE.
int searchIndex = findIndexReverse(stringSearch, -(long) count);
if (searchIndex == MATCH_NOT_FOUND) {
return string;
} else if (searchIndex == str.length()) {
Expand Down Expand Up @@ -1057,10 +1058,11 @@ public static UTF8String lowercaseSubStringIndex(final UTF8String string,
} else {
// Search right to left (note: the end code point is exclusive).
int matchLength = string.numChars() + 1;
count = -count;
while (count > 0) {
// `remaining` is a long because negating `count` overflows for Integer.MIN_VALUE.
long remaining = -(long) count;
while (remaining > 0) {
matchLength = lowercaseRFind(string, lowercaseDelimiter, matchLength - 1);
if (matchLength > MATCH_NOT_FOUND) --count; // Found a delimiter.
if (matchLength > MATCH_NOT_FOUND) --remaining; // Found a delimiter.
else return string; // Cannot find enough delimiters in the string.
}
return string.substring(matchLength, string.numChars());
Expand Down
13 changes: 8 additions & 5 deletions common/unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1289,7 +1289,9 @@ public int indexOf(UTF8String pattern, int start, int occurrence) {
}

int charCount = 0;
int charsToSkip, byteIdx;
int byteIdx;
// `charsToSkip` is a long because negating `start` overflows for Integer.MIN_VALUE.
long charsToSkip;
if (start > 0) {
byteIdx = 0; // position in byte
charsToSkip = start - 1; // skip character count
Expand All @@ -1300,7 +1302,7 @@ public int indexOf(UTF8String pattern, int start, int occurrence) {
} else {
// For negative start, skip |start| characters from the end to position
// byteIdx at the starting byte of the first character to compare.
charsToSkip = -start;
charsToSkip = -(long) start;
byteIdx = numBytes;
while (byteIdx > 0 && charCount < charsToSkip) {
byteIdx = prevCharStart(byteIdx);
Expand Down Expand Up @@ -1452,11 +1454,12 @@ public UTF8String subStringIndex(UTF8String delim, int count) {

} else {
int idx = numBytes - delim.numBytes + 1;
count = -count;
while (count > 0) {
// `remaining` is a long because negating `count` overflows for Integer.MIN_VALUE.
long remaining = -(long) count;
while (remaining > 0) {
idx = rfind(delim, idx - 1);
if (idx >= 0) {
count --;
remaining --;
} else {
// can not find enough delim
return this;
Expand Down
12 changes: 12 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 @@ -2737,6 +2737,10 @@ public void testSubstringIndex() throws SparkException {
assertSubstringIndex("a🙃b🙃c", "d", -1, UTF8_LCASE, "a🙃b🙃c");
assertSubstringIndex("a🙃b🙃c", "d", -1, UNICODE, "a🙃b🙃c");
assertSubstringIndex("a🙃b🙃c", "d", -1, UNICODE_CI, "a🙃b🙃c");
assertSubstringIndex("a.b.c", ".", Integer.MIN_VALUE, UTF8_BINARY, "a.b.c");
assertSubstringIndex("a.b.c", ".", Integer.MIN_VALUE, UTF8_LCASE, "a.b.c");
assertSubstringIndex("a.b.c", ".", Integer.MIN_VALUE, UNICODE, "a.b.c");
assertSubstringIndex("a.b.c", ".", Integer.MIN_VALUE, UNICODE_CI, "a.b.c");
}

/**
Expand Down Expand Up @@ -4192,6 +4196,14 @@ public void testStringInstrWithOccurrence() throws SparkException {
// Boundary: start out of range (forward/backward)
assertStringInstrWithOccurrence("İoi\u0307oİo", "İo", 10, 1, UTF8_LCASE, 0);
assertStringInstrWithOccurrence("İoi\u0307oİo", "İo", -10, 1, UNICODE_CI, 0);
assertStringInstrWithOccurrence("abcabc", "abc", Integer.MIN_VALUE, 1, UTF8_BINARY, 0);
assertStringInstrWithOccurrence("abcabc", "abc", Integer.MIN_VALUE, 1, UTF8_LCASE, 0);
assertStringInstrWithOccurrence("abcabc", "abc", Integer.MIN_VALUE, 1, UNICODE, 0);
assertStringInstrWithOccurrence("abcabc", "abc", Integer.MIN_VALUE, 1, UNICODE_CI, 0);
assertStringInstrWithOccurrence("İoi\u0307oİo", "İo", Integer.MIN_VALUE, 1, UTF8_BINARY, 0);
assertStringInstrWithOccurrence("İoi\u0307oİo", "İo", Integer.MIN_VALUE, 1, UTF8_LCASE, 0);
assertStringInstrWithOccurrence("İoi\u0307oİo", "İo", Integer.MIN_VALUE, 1, UNICODE, 0);
assertStringInstrWithOccurrence("İoi\u0307oİo", "İo", Integer.MIN_VALUE, 1, UNICODE_CI, 0);
String sigmaStr = "σΣςσΣς"; // 1:σ, 2:Σ, 3:ς, 4:σ, 5:Σ, 6:ς
// UTF8_BINARY: all sigma forms are distinct, only exact byte matches succeed
assertStringInstrWithOccurrence("σΣςσΣς", "Σ", 1, 2, UTF8_BINARY, 5);
Expand Down
6 changes: 6 additions & 0 deletions common/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,8 @@ public void indexOf() {
assertEquals(-1, fromString("hello").indexOf(fromString("o"), 6, 1));
assertEquals(0, fromString("hello").indexOf(fromString("h"), -5, 1));
assertEquals(-1, fromString("hello").indexOf(fromString("h"), -6, 1));
assertEquals(-1, fromString("abcabc").indexOf(fromString("abc"), Integer.MIN_VALUE, 1));
assertEquals(-1, fromString("abcabc").indexOf(fromString("abc"), Integer.MIN_VALUE + 1, 1));

// Target larger than string
assertEquals(-1, fromString("ab").indexOf(fromString("abc"), 1, 1));
Expand Down Expand Up @@ -381,6 +383,10 @@ public void substring_index() {
// overlapped delim
assertEquals(fromString("||"), fromString("||||||").subStringIndex(fromString("|||"), 3));
assertEquals(fromString("|||"), fromString("||||||").subStringIndex(fromString("|||"), -4));
assertEquals(fromString("www.apache.org"),
fromString("www.apache.org").subStringIndex(fromString("."), Integer.MIN_VALUE));
assertEquals(fromString("www.apache.org"),
fromString("www.apache.org").subStringIndex(fromString("."), Integer.MIN_VALUE + 1));
}

@Test
Expand Down
14 changes: 14 additions & 0 deletions ...yst/src/test/scala/org/apache/spark/sql/catalyst/expressions/StringExpressionsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,14 @@ class StringExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
SubstringIndex(Literal("www.apache.org"), Literal("."), Literal(-2)), "apache.org")
checkEvaluation(
SubstringIndex(Literal("www.apache.org"), Literal("."), Literal(-1)), "org")
// SPARK-58443: negating a count of Integer.MIN_VALUE overflows back to Integer.MIN_VALUE;
// such a count is always out of range, so the whole string is returned.
checkEvaluation(
SubstringIndex(Literal("www.apache.org"), Literal("."), Literal(Int.MinValue)),
"www.apache.org")
checkEvaluation(
SubstringIndex(Literal("www.apache.org"), Literal("."), Literal(Int.MinValue + 1)),
"www.apache.org")
checkEvaluation(
SubstringIndex(Literal(""), Literal("."), Literal(-2)), "")
checkEvaluation(
Expand Down Expand Up @@ -1064,6 +1072,12 @@ class StringExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
Literal("abcabc"), Literal("ab"), Literal(-2), Literal(3)), 0)
checkEvaluation(StringInstrWithOccurrence(
Literal("abcabc"), Literal("ab"), Literal(-3), Literal(3)), 0)
// SPARK-58443: negating a start of Integer.MIN_VALUE overflows back to Integer.MIN_VALUE;
// such a start is always out of range, so no match is reported.
checkEvaluation(StringInstrWithOccurrence(
Literal("abcabc"), Literal("abc"), Literal(Int.MinValue), Literal(1)), 0)
checkEvaluation(StringInstrWithOccurrence(
Literal("abcabc"), Literal("abc"), Literal(Int.MinValue + 1), Literal(1)), 0)
checkEvaluation(StringInstrWithOccurrence(
Literal("abc"), Literal("b"), Literal(0), Literal(1)), 0)
checkEvaluation(StringInstrWithOccurrence(
Expand Down