This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new daa97ed5452 branch-3.0: [fix](audit) fix wrong column separator of
audit log (#53966)
daa97ed5452 is described below
commit daa97ed54526e0b42cc75bee1f964c4f7f297256
Author: Mingyu Chen (Rayner) <[email protected]>
AuthorDate: Mon Jul 28 20:30:15 2025 -0700
branch-3.0: [fix](audit) fix wrong column separator of audit log (#53966)
wrong pick, typo error
---
.../org/apache/doris/plugin/audit/AuditLoader.java | 56 +++++++++++-----------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/AuditLoader.java
b/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/AuditLoader.java
index c1047bec1b1..89b6e58f7a1 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/AuditLoader.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/AuditLoader.java
@@ -147,34 +147,34 @@ public class AuditLoader extends Plugin implements
AuditPlugin {
private void fillLogBuffer(AuditEvent event, StringBuilder logBuffer) {
// should be same order as InternalSchema.AUDIT_SCHEMA
- logBuffer.append(event.queryId).append("AUDIT_TABLE_COL_SEPARATOR");
-
logBuffer.append(TimeUtils.longToTimeStringWithms(event.timestamp)).append("AUDIT_TABLE_COL_SEPARATOR");
- logBuffer.append(event.clientIp).append("AUDIT_TABLE_COL_SEPARATOR");
- logBuffer.append(event.user).append("AUDIT_TABLE_COL_SEPARATOR");
- logBuffer.append(event.ctl).append("AUDIT_TABLE_COL_SEPARATOR");
- logBuffer.append(event.db).append("AUDIT_TABLE_COL_SEPARATOR");
- logBuffer.append(event.state).append("AUDIT_TABLE_COL_SEPARATOR");
- logBuffer.append(event.errorCode).append("AUDIT_TABLE_COL_SEPARATOR");
-
logBuffer.append(event.errorMessage).append("AUDIT_TABLE_COL_SEPARATOR");
- logBuffer.append(event.queryTime).append("AUDIT_TABLE_COL_SEPARATOR");
- logBuffer.append(event.scanBytes).append("AUDIT_TABLE_COL_SEPARATOR");
- logBuffer.append(event.scanRows).append("AUDIT_TABLE_COL_SEPARATOR");
- logBuffer.append(event.returnRows).append("AUDIT_TABLE_COL_SEPARATOR");
-
logBuffer.append(event.shuffleSendRows).append("AUDIT_TABLE_COL_SEPARATOR");
-
logBuffer.append(event.shuffleSendBytes).append("AUDIT_TABLE_COL_SEPARATOR");
-
logBuffer.append(event.scanBytesFromLocalStorage).append("AUDIT_TABLE_COL_SEPARATOR");
-
logBuffer.append(event.scanBytesFromRemoteStorage).append("AUDIT_TABLE_COL_SEPARATOR");
- logBuffer.append(event.stmtId).append("AUDIT_TABLE_COL_SEPARATOR");
- logBuffer.append(event.stmtType).append("AUDIT_TABLE_COL_SEPARATOR");
- logBuffer.append(event.isQuery ? 1 :
0).append("AUDIT_TABLE_COL_SEPARATOR");
- logBuffer.append(event.isNereids ? 1 :
0).append("AUDIT_TABLE_COL_SEPARATOR");
- logBuffer.append(event.feIp).append("AUDIT_TABLE_COL_SEPARATOR");
- logBuffer.append(event.cpuTimeMs).append("AUDIT_TABLE_COL_SEPARATOR");
- logBuffer.append(event.sqlHash).append("AUDIT_TABLE_COL_SEPARATOR");
- logBuffer.append(event.sqlDigest).append("AUDIT_TABLE_COL_SEPARATOR");
-
logBuffer.append(event.peakMemoryBytes).append("AUDIT_TABLE_COL_SEPARATOR");
-
logBuffer.append(event.workloadGroup).append("AUDIT_TABLE_COL_SEPARATOR");
-
logBuffer.append(event.cloudClusterName).append("AUDIT_TABLE_COL_SEPARATOR");
+ logBuffer.append(event.queryId).append(AUDIT_TABLE_COL_SEPARATOR);
+
logBuffer.append(TimeUtils.longToTimeStringWithms(event.timestamp)).append(AUDIT_TABLE_COL_SEPARATOR);
+ logBuffer.append(event.clientIp).append(AUDIT_TABLE_COL_SEPARATOR);
+ logBuffer.append(event.user).append(AUDIT_TABLE_COL_SEPARATOR);
+ logBuffer.append(event.ctl).append(AUDIT_TABLE_COL_SEPARATOR);
+ logBuffer.append(event.db).append(AUDIT_TABLE_COL_SEPARATOR);
+ logBuffer.append(event.state).append(AUDIT_TABLE_COL_SEPARATOR);
+ logBuffer.append(event.errorCode).append(AUDIT_TABLE_COL_SEPARATOR);
+ logBuffer.append(event.errorMessage).append(AUDIT_TABLE_COL_SEPARATOR);
+ logBuffer.append(event.queryTime).append(AUDIT_TABLE_COL_SEPARATOR);
+ logBuffer.append(event.scanBytes).append(AUDIT_TABLE_COL_SEPARATOR);
+ logBuffer.append(event.scanRows).append(AUDIT_TABLE_COL_SEPARATOR);
+ logBuffer.append(event.returnRows).append(AUDIT_TABLE_COL_SEPARATOR);
+
logBuffer.append(event.shuffleSendRows).append(AUDIT_TABLE_COL_SEPARATOR);
+
logBuffer.append(event.shuffleSendBytes).append(AUDIT_TABLE_COL_SEPARATOR);
+
logBuffer.append(event.scanBytesFromLocalStorage).append(AUDIT_TABLE_COL_SEPARATOR);
+
logBuffer.append(event.scanBytesFromRemoteStorage).append(AUDIT_TABLE_COL_SEPARATOR);
+ logBuffer.append(event.stmtId).append(AUDIT_TABLE_COL_SEPARATOR);
+ logBuffer.append(event.stmtType).append(AUDIT_TABLE_COL_SEPARATOR);
+ logBuffer.append(event.isQuery ? 1 :
0).append(AUDIT_TABLE_COL_SEPARATOR);
+ logBuffer.append(event.isNereids ? 1 :
0).append(AUDIT_TABLE_COL_SEPARATOR);
+ logBuffer.append(event.feIp).append(AUDIT_TABLE_COL_SEPARATOR);
+ logBuffer.append(event.cpuTimeMs).append(AUDIT_TABLE_COL_SEPARATOR);
+ logBuffer.append(event.sqlHash).append(AUDIT_TABLE_COL_SEPARATOR);
+ logBuffer.append(event.sqlDigest).append(AUDIT_TABLE_COL_SEPARATOR);
+
logBuffer.append(event.peakMemoryBytes).append(AUDIT_TABLE_COL_SEPARATOR);
+
logBuffer.append(event.workloadGroup).append(AUDIT_TABLE_COL_SEPARATOR);
+
logBuffer.append(event.cloudClusterName).append(AUDIT_TABLE_COL_SEPARATOR);
// already trim the query in
org.apache.doris.qe.AuditLogHelper#logAuditLog
String stmt = event.stmt;
if (LOG.isDebugEnabled()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
