This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 94966c06424 branch-3.1: [Fix] (catalog) Hive catalog query fails due
to partition ID conflicts #54135 (#55290)
94966c06424 is described below
commit 94966c064249ba7a5111a611605608a396ea9de9
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Aug 26 16:11:24 2025 +0800
branch-3.1: [Fix] (catalog) Hive catalog query fails due to partition ID
conflicts #54135 (#55290)
Cherry-picked from #54135
Co-authored-by: John Zhang <[email protected]>
---
fe/fe-core/src/main/java/org/apache/doris/common/util/Util.java | 3 ++-
.../src/test/java/org/apache/doris/common/util/UtilTest.java | 7 +++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/Util.java
b/fe/fe-core/src/main/java/org/apache/doris/common/util/Util.java
index c5a4c90b64c..296f76d1f79 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/util/Util.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/Util.java
@@ -46,6 +46,7 @@ import java.io.StringWriter;
import java.net.URL;
import java.net.URLConnection;
import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
@@ -711,7 +712,7 @@ public class Util {
public static long sha256long(String str) {
try {
MessageDigest digest = MessageDigest.getInstance("SHA-256");
- byte[] hash = digest.digest(str.getBytes());
+ byte[] hash = digest.digest(str.getBytes(StandardCharsets.UTF_8));
ByteBuffer buffer = ByteBuffer.wrap(hash);
return buffer.getLong();
} catch (NoSuchAlgorithmException e) {
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/common/util/UtilTest.java
b/fe/fe-core/src/test/java/org/apache/doris/common/util/UtilTest.java
index 1f88cf5a662..dc8419ddd1f 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/common/util/UtilTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/common/util/UtilTest.java
@@ -83,4 +83,11 @@ public class UtilTest {
"java.lang.Exception: Root cause message With
suppressed[0]:Suppressed message",
Util.getRootCauseWithSuppressedMessage(chainedException));
}
+
+ @Test
+ public void sha256longEcoding() {
+ String str = "东南卫视";
+ String str1 = "东方卫视";
+ Assertions.assertNotEquals(Util.sha256long(str),
Util.sha256long(str1));
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
