database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Revert "[Improvement](auditlog) add column catalog for audit log and audit log table (#26403)" (#28177)

Browse Source 
This reverts commit daea751a986823bf5858704663d58f49fd5dfb39.
This commit is contained in:
zhiqiang
2023-12-08 18:46:59 +08:00
committed by GitHub
parent 75b55f8f2f
commit 0931eb536c
7 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fe/fe-core/src/main/java/org/apache/doris/plugin/AuditEvent.java
View File

@ -56,8 +56,6 @@ public class AuditEvent {
public String clientIp = "";
@AuditField(value = "User")
public String user = "";
@AuditField(value = "Catalog")
public String catalog = "";
@AuditField(value = "Db")
public String db = "";
@AuditField(value = "State")
@ -133,11 +131,6 @@ public class AuditEvent {
return this;
}
public AuditEventBuilder setCatalog(String catalog) {
auditEvent.catalog = catalog;
return this;
}
public AuditEventBuilder setDb(String db) {
auditEvent.db = db;
return this;

5
fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java
View File

@ -57,11 +57,6 @@ public class AuditLogHelper {
.setWorkloadGroup(ctx.getWorkloadGroupName())
.setFuzzyVariables(!printFuzzyVariables ? "" : ctx.getSessionVariable().printFuzzyVariables());
// when doric fe is booting, current catalog may not be set
if (ctx.getCurrentCatalog() != null) {
ctx.getAuditEventBuilder().setCatalog(ctx.getCurrentCatalog().getName());
}
if (ctx.getState().isQuery()) {
MetricRepo.COUNTER_QUERY_ALL.increase(1L);
MetricRepo.USER_COUNTER_QUERY_ALL.getOrAdd(ctx.getQualifiedUser()).increase(1L);