This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.1 by this push:
new ec3bb14ca66 branch-4.1: [fix](auditlog) fix AuditLoaderPlugin
occasional occurrence garbled Chinese characters in audit logs #61902 (#62264)
ec3bb14ca66 is described below
commit ec3bb14ca661f3666729641825235188ab9a0077
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Apr 9 15:11:54 2026 +0800
branch-4.1: [fix](auditlog) fix AuditLoaderPlugin occasional occurrence
garbled Chinese characters in audit logs #61902 (#62264)
Cherry-picked from #61902
Co-authored-by: Guangming Lu <[email protected]>
---
fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java | 2 +-
.../java/org/apache/doris/plugin/audit/custom/AuditLoaderPlugin.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java
index 08f2f880a01..58f7921c911 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java
@@ -146,7 +146,7 @@ public class AuditLogHelper {
}
Charset utf8Charset = Charset.forName("UTF-8");
CharsetDecoder decoder = utf8Charset.newDecoder();
- byte[] sb = str.getBytes();
+ byte[] sb = str.getBytes(utf8Charset);
ByteBuffer buffer = ByteBuffer.wrap(sb, 0, maxLen);
CharBuffer charBuffer = CharBuffer.allocate(maxLen);
decoder.onMalformedInput(CodingErrorAction.IGNORE);
diff --git
a/fe_plugins/auditloader/src/main/java/org/apache/doris/plugin/audit/custom/AuditLoaderPlugin.java
b/fe_plugins/auditloader/src/main/java/org/apache/doris/plugin/audit/custom/AuditLoaderPlugin.java
index 4d873b57fe8..a3c850c654a 100755
---
a/fe_plugins/auditloader/src/main/java/org/apache/doris/plugin/audit/custom/AuditLoaderPlugin.java
+++
b/fe_plugins/auditloader/src/main/java/org/apache/doris/plugin/audit/custom/AuditLoaderPlugin.java
@@ -199,7 +199,7 @@ public class AuditLoaderPlugin extends Plugin implements
AuditPlugin {
}
Charset utf8Charset = Charset.forName("UTF-8");
CharsetDecoder decoder = utf8Charset.newDecoder();
- byte[] sb = str.getBytes();
+ byte[] sb = str.getBytes(utf8Charset);
ByteBuffer buffer = ByteBuffer.wrap(sb, 0, maxLen);
CharBuffer charBuffer = CharBuffer.allocate(maxLen);
decoder.onMalformedInput(CodingErrorAction.IGNORE);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
