This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 4113c11c739 [Improve](auditlog) audit log print real sql in prepared
statement (#44588)
4113c11c739 is described below
commit 4113c11c739de983c7250506ba2fc919abc77110
Author: lihangyu <[email protected]>
AuthorDate: Tue Nov 26 19:30:36 2024 +0800
[Improve](auditlog) audit log print real sql in prepared statement (#44588)
cherry-pick from #43038
Co-authored-by: He xueyu <[email protected]>
---
fe/fe-core/src/main/java/org/apache/doris/plugin/AuditEvent.java | 7 +++++++
fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java | 7 ++++++-
.../src/main/java/org/apache/doris/qe/MysqlConnectProcessor.java | 1 +
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/plugin/AuditEvent.java
b/fe/fe-core/src/main/java/org/apache/doris/plugin/AuditEvent.java
index 5fc735a0bb8..7d64b600d8a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/plugin/AuditEvent.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/plugin/AuditEvent.java
@@ -60,6 +60,8 @@ public class AuditEvent {
public String ctl = "";
@AuditField(value = "Db")
public String db = "";
+ @AuditField(value = "CommandType")
+ public String commandType = "";
@AuditField(value = "State")
public String state = "";
@AuditField(value = "ErrorCode")
@@ -242,6 +244,11 @@ public class AuditEvent {
return this;
}
+ public AuditEventBuilder setCommandType(String commandType) {
+ auditEvent.commandType = commandType;
+ return this;
+ }
+
public AuditEvent build() {
return this.auditEvent;
}
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 02a66a5f6e1..d10e1bbfbb8 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
@@ -30,6 +30,7 @@ import org.apache.doris.common.util.DebugUtil;
import org.apache.doris.datasource.CatalogIf;
import org.apache.doris.datasource.InternalCatalog;
import org.apache.doris.metric.MetricRepo;
+import org.apache.doris.mysql.MysqlCommand;
import org.apache.doris.nereids.analyzer.UnboundOneRowRelation;
import org.apache.doris.nereids.analyzer.UnboundTableSink;
import org.apache.doris.nereids.glue.LogicalPlanAdapter;
@@ -197,7 +198,8 @@ public class AuditLogHelper {
.setStmtId(ctx.getStmtId())
.setQueryId(ctx.queryId() == null ? "NaN" :
DebugUtil.printId(ctx.queryId()))
.setWorkloadGroup(ctx.getWorkloadGroupName())
- .setFuzzyVariables(!printFuzzyVariables ? "" :
ctx.getSessionVariable().printFuzzyVariables());
+ .setFuzzyVariables(!printFuzzyVariables ? "" :
ctx.getSessionVariable().printFuzzyVariables())
+ .setCommandType(ctx.getCommand().toString());
if (ctx.getState().isQuery()) {
if (!ctx.getSessionVariable().internalSession) {
@@ -248,6 +250,9 @@ public class AuditLogHelper {
}
}
}
+ if (ctx.getCommand() == MysqlCommand.COM_STMT_PREPARE &&
ctx.getState().getErrorCode() == null) {
+ auditEventBuilder.setState(String.valueOf(MysqlStateType.OK));
+ }
Env.getCurrentEnv().getWorkloadRuntimeStatusMgr().submitFinishQueryToAudit(auditEventBuilder.build());
}
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/qe/MysqlConnectProcessor.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/MysqlConnectProcessor.java
index 138f4202ab2..931dc3d4717 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/MysqlConnectProcessor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/MysqlConnectProcessor.java
@@ -221,6 +221,7 @@ public class MysqlConnectProcessor extends ConnectProcessor
{
executor.execute();
if (ctx.getSessionVariable().isEnablePreparedStmtAuditLog()) {
stmtStr = executeStmt.toSql();
+ stmtStr = stmtStr + " /*originalSql = " +
prepareCommand.getOriginalStmt().originStmt + "*/";
}
} catch (Throwable e) {
// Catch all throwable.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]