This is an automated email from the ASF dual-hosted git repository.
lijibing 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 9d04d18c947 [improvement](statistics)Write audit log while doing drop
stats. (#34433) (#35526)
9d04d18c947 is described below
commit 9d04d18c94798ab53f51911d78400bda00d9a5c1
Author: Jibing-Li <[email protected]>
AuthorDate: Tue May 28 16:46:27 2024 +0800
[improvement](statistics)Write audit log while doing drop stats. (#34433)
(#35526)
backport https://github.com/apache/doris/pull/34433
<!--Describe your changes.-->
## Further comments
If this is a relatively large or complex change, kick off the discussion
at [[email protected]](mailto:[email protected]) by explaining why
you chose the solution you did and what alternatives you considered,
etc...
---
.../org/apache/doris/statistics/util/StatisticsUtil.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/statistics/util/StatisticsUtil.java
b/fe/fe-core/src/main/java/org/apache/doris/statistics/util/StatisticsUtil.java
index bd01de0f34e..374d6f7d985 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/statistics/util/StatisticsUtil.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/statistics/util/StatisticsUtil.java
@@ -58,6 +58,7 @@ import org.apache.doris.datasource.InternalCatalog;
import org.apache.doris.datasource.hive.HMSExternalTable;
import org.apache.doris.nereids.trees.expressions.literal.DateTimeLiteral;
import org.apache.doris.nereids.trees.expressions.literal.VarcharLiteral;
+import org.apache.doris.qe.AuditLogHelper;
import org.apache.doris.qe.AutoCloseConnectContext;
import org.apache.doris.qe.ConnectContext;
import org.apache.doris.qe.QueryState;
@@ -141,9 +142,11 @@ public class StatisticsUtil {
}
public static QueryState execUpdate(String sql) throws Exception {
- try (AutoCloseConnectContext r = StatisticsUtil.buildConnectContext())
{
+ StmtExecutor stmtExecutor = null;
+ AutoCloseConnectContext r = StatisticsUtil.buildConnectContext();
+ try {
r.connectContext.getSessionVariable().disableNereidsPlannerOnce();
- StmtExecutor stmtExecutor = new StmtExecutor(r.connectContext,
sql);
+ stmtExecutor = new StmtExecutor(r.connectContext, sql);
r.connectContext.setExecutor(stmtExecutor);
stmtExecutor.execute();
QueryState state = r.connectContext.getState();
@@ -151,6 +154,12 @@ public class StatisticsUtil {
throw new Exception(state.getErrorMessage());
}
return state;
+ } finally {
+ r.close();
+ if (stmtExecutor != null) {
+ AuditLogHelper.logAuditLog(r.connectContext,
stmtExecutor.getOriginStmt().originStmt,
+ stmtExecutor.getParsedStmt(),
stmtExecutor.getQueryStatisticsForAuditLog(), true);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]