Skip to content

fix(audit): Correct column separator for audit log stream load #53873

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

Closed
wanlce wants to merge 1 commit into from
Closed

fix(audit): Correct column separator for audit log stream load #53873

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
56 changes: 28 additions & 28 deletions fe/fe-core/src/main/java/org/apache/doris/plugin/audit/AuditLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,34 +147,34 @@ private void assembleAudit(AuditEvent event) {

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()) {
Expand Down