Skip to content

branch-3.1: [bugfix](catalog) replace Math.abs with bitwise AND to ensure non-negative ID generation #55183 #55689

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

Merged
morrySnow merged 1 commit into from
Sep 5, 2025
Merged

branch-3.1: [bugfix](catalog) replace Math.abs with bitwise AND to ensure non-negative ID generation #55183 #55689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion fe/fe-core/src/main/java/org/apache/doris/common/util/Util.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,12 @@ public static long sha256long(String str) {
MessageDigest digest = MessageDigest.getInstance("SHA-256");
byte[] hash = digest.digest(str.getBytes(StandardCharsets.UTF_8));
ByteBuffer buffer = ByteBuffer.wrap(hash);
return buffer.getLong();
long result = buffer.getLong();
// Handle Long.MIN_VALUE case to ensure non-negative ID generation
if (result == Long.MIN_VALUE) {
return str.hashCode();
}
return result;
} catch (NoSuchAlgorithmException e) {
return str.hashCode();
}
Expand Down
12 changes: 12 additions & 0 deletions fe/fe-core/src/test/java/org/apache/doris/common/util/UtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,16 @@ public void sha256longEcoding() {
String str1 = "东方卫视";
Assertions.assertNotEquals(Util.sha256long(str), Util.sha256long(str1));
}

@Test
public void sha256longHandlesLongMinValue() {
String testStr = "test_long_min_value_case";
long result = Util.sha256long(testStr);

Assertions.assertNotEquals(Long.MIN_VALUE, result,
"sha256long should not return Long.MIN_VALUE");

Assertions.assertEquals(result, Util.sha256long(testStr),
"Same input should produce same output");
}
}