This is an automated email from the ASF dual-hosted git repository.
caiconghui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new baefde940f1 [fix](audit_loader) fix that old external audit loader
plugin not work because of incompatibility with new audit plugin (#40565)
baefde940f1 is described below
commit baefde940f13f63c141bf58d414f0a0ab8717621
Author: caiconghui <[email protected]>
AuthorDate: Tue Sep 10 16:00:34 2024 +0800
[fix](audit_loader) fix that old external audit loader plugin not work
because of incompatibility with new audit plugin (#40565)
1、rename org.apache.doris.plugin.audit.AuditLoaderPlugin to
org.apache.doris.plugin.audit.AuditLoader to avoid potential conflict
with old external audit plugin
2、rename org.apache.doris.plugin.audit.AuditEvent to
org.apache.doris.plugin.AuditEvent to keep eventFilter in AuditPlugin be
compatible with old external audit plugin
Co-authored-by: caiconghui1 <[email protected]>
---
.../src/main/java/org/apache/doris/catalog/InternalSchema.java | 4 ++--
.../org/apache/doris/catalog/InternalSchemaInitializer.java | 10 +++++-----
.../main/java/org/apache/doris/load/StreamLoadRecordMgr.java | 4 ++--
.../main/java/org/apache/doris/load/loadv2/BulkLoadJob.java | 2 +-
.../java/org/apache/doris/plugin/{audit => }/AuditEvent.java | 2 +-
.../src/main/java/org/apache/doris/plugin/AuditPlugin.java | 2 --
.../src/main/java/org/apache/doris/plugin/PluginMgr.java | 4 ++--
.../plugin/audit/{AuditLoaderPlugin.java => AuditLoader.java} | 9 +++++----
.../java/org/apache/doris/plugin/audit/AuditLogBuilder.java | 5 +++--
.../java/org/apache/doris/plugin/audit/AuditStreamLoader.java | 2 +-
.../java/org/apache/doris/plugin/audit/LoadAuditEvent.java | 2 ++
.../org/apache/doris/plugin/audit/StreamLoadAuditEvent.java | 2 ++
.../src/main/java/org/apache/doris/qe/AuditEventProcessor.java | 2 +-
.../src/main/java/org/apache/doris/qe/AuditLogHelper.java | 4 ++--
.../src/main/java/org/apache/doris/qe/ConnectContext.java | 2 +-
.../resource/workloadschedpolicy/WorkloadRuntimeStatusMgr.java | 2 +-
.../java/org/apache/doris/alter/InternalSchemaAlterTest.java | 9 +++++----
.../test/java/org/apache/doris/qe/AuditEventProcessorTest.java | 4 ++--
18 files changed, 38 insertions(+), 33 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/catalog/InternalSchema.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/InternalSchema.java
index 15bf65c3c73..768ae22d202 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/InternalSchema.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/InternalSchema.java
@@ -21,7 +21,7 @@ import org.apache.doris.analysis.ColumnDef;
import org.apache.doris.analysis.ColumnNullableType;
import org.apache.doris.analysis.TypeDef;
import org.apache.doris.common.UserException;
-import org.apache.doris.plugin.audit.AuditLoaderPlugin;
+import org.apache.doris.plugin.audit.AuditLoader;
import org.apache.doris.statistics.StatisticConstants;
import com.google.common.collect.Lists;
@@ -168,7 +168,7 @@ public class InternalSchema {
case StatisticConstants.HISTOGRAM_TBL_NAME:
schema = HISTO_STATS_SCHEMA;
break;
- case AuditLoaderPlugin.AUDIT_LOG_TABLE:
+ case AuditLoader.AUDIT_LOG_TABLE:
schema = AUDIT_SCHEMA;
break;
default:
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/catalog/InternalSchemaInitializer.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/InternalSchemaInitializer.java
index 87e8a0fc3b0..c038414fc65 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/catalog/InternalSchemaInitializer.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/catalog/InternalSchemaInitializer.java
@@ -38,7 +38,7 @@ import org.apache.doris.common.UserException;
import org.apache.doris.common.util.PropertyAnalyzer;
import org.apache.doris.datasource.InternalCatalog;
import org.apache.doris.ha.FrontendNodeType;
-import org.apache.doris.plugin.audit.AuditLoaderPlugin;
+import org.apache.doris.plugin.audit.AuditLoader;
import org.apache.doris.statistics.StatisticConstants;
import org.apache.doris.statistics.util.StatisticsUtil;
@@ -98,7 +98,7 @@ public class InternalSchemaInitializer extends Thread {
Database database = op.get();
modifyTblReplicaCount(database,
StatisticConstants.TABLE_STATISTIC_TBL_NAME);
modifyTblReplicaCount(database,
StatisticConstants.PARTITION_STATISTIC_TBL_NAME);
- modifyTblReplicaCount(database, AuditLoaderPlugin.AUDIT_LOG_TABLE);
+ modifyTblReplicaCount(database, AuditLoader.AUDIT_LOG_TABLE);
}
@VisibleForTesting
@@ -215,7 +215,7 @@ public class InternalSchemaInitializer extends Thread {
private static CreateTableStmt buildAuditTblStmt() throws UserException {
TableName tableName = new TableName("",
- FeConstants.INTERNAL_DB_NAME,
AuditLoaderPlugin.AUDIT_LOG_TABLE);
+ FeConstants.INTERNAL_DB_NAME, AuditLoader.AUDIT_LOG_TABLE);
String engineName = "olap";
ArrayList<String> dupKeys = Lists.newArrayList("query_id", "time",
"client_ip");
@@ -244,7 +244,7 @@ public class InternalSchemaInitializer extends Thread {
PropertyAnalyzer.getInstance().rewriteForceProperties(properties);
CreateTableStmt createTableStmt = new CreateTableStmt(true, false,
- tableName,
InternalSchema.getCopiedSchema(AuditLoaderPlugin.AUDIT_LOG_TABLE),
+ tableName,
InternalSchema.getCopiedSchema(AuditLoader.AUDIT_LOG_TABLE),
engineName, keysDesc, partitionDesc, distributionDesc,
properties, null, "Doris internal audit table, DO NOT MODIFY
IT", null);
StatisticsUtil.analyze(createTableStmt);
@@ -286,7 +286,7 @@ public class InternalSchemaInitializer extends Thread {
}
// 3. check audit table
- optionalStatsTbl = db.getTable(AuditLoaderPlugin.AUDIT_LOG_TABLE);
+ optionalStatsTbl = db.getTable(AuditLoader.AUDIT_LOG_TABLE);
return optionalStatsTbl.isPresent();
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/load/StreamLoadRecordMgr.java
b/fe/fe-core/src/main/java/org/apache/doris/load/StreamLoadRecordMgr.java
index 7f1d33bd649..3a38641036f 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/load/StreamLoadRecordMgr.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/load/StreamLoadRecordMgr.java
@@ -30,8 +30,8 @@ import org.apache.doris.common.util.TimeUtils;
import org.apache.doris.datasource.InternalCatalog;
import org.apache.doris.mysql.privilege.PrivPredicate;
import org.apache.doris.persist.gson.GsonUtils;
-import org.apache.doris.plugin.audit.AuditEvent;
-import org.apache.doris.plugin.audit.AuditEvent.EventType;
+import org.apache.doris.plugin.AuditEvent;
+import org.apache.doris.plugin.AuditEvent.EventType;
import org.apache.doris.plugin.audit.StreamLoadAuditEvent;
import org.apache.doris.qe.ConnectContext;
import org.apache.doris.system.Backend;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BulkLoadJob.java
b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BulkLoadJob.java
index 7b78efc7a50..12aa673eabf 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BulkLoadJob.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/BulkLoadJob.java
@@ -46,7 +46,7 @@ import org.apache.doris.load.BrokerFileGroupAggInfo;
import org.apache.doris.load.EtlJobType;
import org.apache.doris.load.FailMsg;
import org.apache.doris.persist.gson.GsonPostProcessable;
-import org.apache.doris.plugin.audit.AuditEvent;
+import org.apache.doris.plugin.AuditEvent;
import org.apache.doris.plugin.audit.LoadAuditEvent;
import org.apache.doris.qe.ConnectContext;
import org.apache.doris.qe.OriginStatement;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/AuditEvent.java
b/fe/fe-core/src/main/java/org/apache/doris/plugin/AuditEvent.java
similarity index 99%
rename from
fe/fe-core/src/main/java/org/apache/doris/plugin/audit/AuditEvent.java
rename to fe/fe-core/src/main/java/org/apache/doris/plugin/AuditEvent.java
index 0b64a748a10..55a8b00d2e8 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/AuditEvent.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/plugin/AuditEvent.java
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.doris.plugin.audit;
+package org.apache.doris.plugin;
import java.lang.annotation.Retention;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/plugin/AuditPlugin.java
b/fe/fe-core/src/main/java/org/apache/doris/plugin/AuditPlugin.java
index 55962a3dd10..d9c9ec84697 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/plugin/AuditPlugin.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/plugin/AuditPlugin.java
@@ -17,8 +17,6 @@
package org.apache.doris.plugin;
-import org.apache.doris.plugin.audit.AuditEvent;
-
/**
* Audit plugin interface describe.
*/
diff --git a/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginMgr.java
b/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginMgr.java
index 7fddf54e1ee..ea69b247e66 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginMgr.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/plugin/PluginMgr.java
@@ -27,7 +27,7 @@ import org.apache.doris.common.util.PrintableMap;
import org.apache.doris.nereids.parser.Dialect;
import org.apache.doris.plugin.PluginInfo.PluginType;
import org.apache.doris.plugin.PluginLoader.PluginStatus;
-import org.apache.doris.plugin.audit.AuditLoaderPlugin;
+import org.apache.doris.plugin.audit.AuditLoader;
import org.apache.doris.plugin.audit.AuditLogBuilder;
import org.apache.doris.plugin.dialect.HttpDialectConverterPlugin;
@@ -113,7 +113,7 @@ public class PluginMgr implements Writable {
}
// AuditLoader: log audit log to internal table
- AuditLoaderPlugin auditLoaderPlugin = new AuditLoaderPlugin();
+ AuditLoader auditLoaderPlugin = new AuditLoader();
if (!registerBuiltinPlugin(auditLoaderPlugin.getPluginInfo(),
auditLoaderPlugin)) {
LOG.warn("failed to register audit log builder");
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/AuditLoaderPlugin.java
b/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/AuditLoader.java
similarity index 98%
rename from
fe/fe-core/src/main/java/org/apache/doris/plugin/audit/AuditLoaderPlugin.java
rename to
fe/fe-core/src/main/java/org/apache/doris/plugin/audit/AuditLoader.java
index 4503b5b8802..27193856937 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/AuditLoaderPlugin.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/AuditLoader.java
@@ -20,6 +20,7 @@ package org.apache.doris.plugin.audit;
import org.apache.doris.catalog.Env;
import org.apache.doris.common.util.DigitalVersion;
import org.apache.doris.common.util.TimeUtils;
+import org.apache.doris.plugin.AuditEvent;
import org.apache.doris.plugin.AuditPlugin;
import org.apache.doris.plugin.Plugin;
import org.apache.doris.plugin.PluginContext;
@@ -42,8 +43,8 @@ import java.util.concurrent.TimeUnit;
/*
* This plugin will load audit log to specified doris table at specified
interval
*/
-public class AuditLoaderPlugin extends Plugin implements AuditPlugin {
- private static final Logger LOG =
LogManager.getLogger(AuditLoaderPlugin.class);
+public class AuditLoader extends Plugin implements AuditPlugin {
+ private static final Logger LOG = LogManager.getLogger(AuditLoader.class);
public static final String AUDIT_LOG_TABLE = "audit_log";
@@ -65,10 +66,10 @@ public class AuditLoaderPlugin extends Plugin implements
AuditPlugin {
private final PluginInfo pluginInfo;
- public AuditLoaderPlugin() {
+ public AuditLoader() {
pluginInfo = new PluginInfo(PluginMgr.BUILTIN_PLUGIN_PREFIX +
"AuditLoader", PluginType.AUDIT,
"builtin audit loader, to load audit log to internal table",
DigitalVersion.fromString("2.1.0"),
- DigitalVersion.fromString("1.8.31"),
AuditLoaderPlugin.class.getName(), null, null);
+ DigitalVersion.fromString("1.8.31"),
AuditLoader.class.getName(), null, null);
}
public PluginInfo getPluginInfo() {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/AuditLogBuilder.java
b/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/AuditLogBuilder.java
index 210081b101c..8d9e2c9d96e 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/AuditLogBuilder.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/AuditLogBuilder.java
@@ -20,13 +20,14 @@ package org.apache.doris.plugin.audit;
import org.apache.doris.common.AuditLog;
import org.apache.doris.common.Config;
import org.apache.doris.common.util.DigitalVersion;
+import org.apache.doris.plugin.AuditEvent;
+import org.apache.doris.plugin.AuditEvent.AuditField;
+import org.apache.doris.plugin.AuditEvent.EventType;
import org.apache.doris.plugin.AuditPlugin;
import org.apache.doris.plugin.Plugin;
import org.apache.doris.plugin.PluginInfo;
import org.apache.doris.plugin.PluginInfo.PluginType;
import org.apache.doris.plugin.PluginMgr;
-import org.apache.doris.plugin.audit.AuditEvent.AuditField;
-import org.apache.doris.plugin.audit.AuditEvent.EventType;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/AuditStreamLoader.java
b/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/AuditStreamLoader.java
index 3765872810d..0b70e9591d5 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/AuditStreamLoader.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/AuditStreamLoader.java
@@ -46,7 +46,7 @@ public class AuditStreamLoader {
public AuditStreamLoader() {
this.hostPort = "127.0.0.1:" + Config.http_port;
this.db = FeConstants.INTERNAL_DB_NAME;
- this.auditLogTbl = AuditLoaderPlugin.AUDIT_LOG_TABLE;
+ this.auditLogTbl = AuditLoader.AUDIT_LOG_TABLE;
this.auditLogLoadUrlStr = String.format(loadUrlPattern, hostPort, db,
auditLogTbl);
// currently, FE identity is FE's IP, so we replace the "." in IP to
make it suitable for label
this.feIdentity = hostPort.replaceAll("\\.", "_").replaceAll(":", "_");
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/LoadAuditEvent.java
b/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/LoadAuditEvent.java
index eb3e098bf41..e9e948df43f 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/LoadAuditEvent.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/LoadAuditEvent.java
@@ -17,6 +17,8 @@
package org.apache.doris.plugin.audit;
+import org.apache.doris.plugin.AuditEvent;
+
public class LoadAuditEvent extends AuditEvent {
@AuditField(value = "JobId")
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/StreamLoadAuditEvent.java
b/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/StreamLoadAuditEvent.java
index 8733a59656c..4a20901673a 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/StreamLoadAuditEvent.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/plugin/audit/StreamLoadAuditEvent.java
@@ -17,6 +17,8 @@
package org.apache.doris.plugin.audit;
+import org.apache.doris.plugin.AuditEvent;
+
public class StreamLoadAuditEvent extends AuditEvent {
@AuditField(value = "Label")
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/qe/AuditEventProcessor.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/AuditEventProcessor.java
index 12e174ab5d0..5cb826dc86c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/AuditEventProcessor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/AuditEventProcessor.java
@@ -18,11 +18,11 @@
package org.apache.doris.qe;
import org.apache.doris.common.Config;
+import org.apache.doris.plugin.AuditEvent;
import org.apache.doris.plugin.AuditPlugin;
import org.apache.doris.plugin.Plugin;
import org.apache.doris.plugin.PluginInfo.PluginType;
import org.apache.doris.plugin.PluginMgr;
-import org.apache.doris.plugin.audit.AuditEvent;
import com.google.common.base.Strings;
import com.google.common.collect.Queues;
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 7d14586bbea..904910822b8 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
@@ -39,8 +39,8 @@ import
org.apache.doris.nereids.trees.plans.commands.insert.InsertIntoTableComma
import org.apache.doris.nereids.trees.plans.logical.LogicalInlineTable;
import org.apache.doris.nereids.trees.plans.logical.LogicalPlan;
import org.apache.doris.nereids.trees.plans.logical.LogicalUnion;
-import org.apache.doris.plugin.audit.AuditEvent.AuditEventBuilder;
-import org.apache.doris.plugin.audit.AuditEvent.EventType;
+import org.apache.doris.plugin.AuditEvent.AuditEventBuilder;
+import org.apache.doris.plugin.AuditEvent.EventType;
import org.apache.doris.qe.QueryState.MysqlStateType;
import org.apache.doris.service.FrontendOptions;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
index 1b70c5b318b..ff960439f76 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
@@ -58,7 +58,7 @@ import org.apache.doris.nereids.stats.StatsErrorEstimator;
import org.apache.doris.nereids.trees.expressions.literal.Literal;
import org.apache.doris.plsql.Exec;
import org.apache.doris.plsql.executor.PlSqlOperation;
-import org.apache.doris.plugin.audit.AuditEvent.AuditEventBuilder;
+import org.apache.doris.plugin.AuditEvent.AuditEventBuilder;
import org.apache.doris.resource.Tag;
import org.apache.doris.service.arrowflight.results.FlightSqlChannel;
import org.apache.doris.statistics.ColumnStatistic;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/resource/workloadschedpolicy/WorkloadRuntimeStatusMgr.java
b/fe/fe-core/src/main/java/org/apache/doris/resource/workloadschedpolicy/WorkloadRuntimeStatusMgr.java
index b2de010b9e4..695bf983dc6 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/resource/workloadschedpolicy/WorkloadRuntimeStatusMgr.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/resource/workloadschedpolicy/WorkloadRuntimeStatusMgr.java
@@ -21,7 +21,7 @@ import org.apache.doris.catalog.Env;
import org.apache.doris.common.Config;
import org.apache.doris.common.Pair;
import org.apache.doris.common.util.MasterDaemon;
-import org.apache.doris.plugin.audit.AuditEvent;
+import org.apache.doris.plugin.AuditEvent;
import org.apache.doris.thrift.TQueryStatistics;
import org.apache.doris.thrift.TReportWorkloadRuntimeStatusParams;
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/alter/InternalSchemaAlterTest.java
b/fe/fe-core/src/test/java/org/apache/doris/alter/InternalSchemaAlterTest.java
index cf9d31b1cca..122014f0e8b 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/alter/InternalSchemaAlterTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/alter/InternalSchemaAlterTest.java
@@ -28,7 +28,7 @@ import org.apache.doris.catalog.PartitionInfo;
import org.apache.doris.common.AnalysisException;
import org.apache.doris.common.Config;
import org.apache.doris.common.FeConstants;
-import org.apache.doris.plugin.audit.AuditLoaderPlugin;
+import org.apache.doris.plugin.audit.AuditLoader;
import org.apache.doris.statistics.StatisticConstants;
import org.apache.doris.utframe.TestWithFeService;
@@ -54,11 +54,12 @@ public class InternalSchemaAlterTest extends
TestWithFeService {
public void testModifyTblReplicaCount() throws AnalysisException {
Database db = Env.getCurrentEnv().getCatalogMgr()
.getInternalCatalog().getDbNullable(FeConstants.INTERNAL_DB_NAME);
+
InternalSchemaInitializer.modifyTblReplicaCount(db,
StatisticConstants.TABLE_STATISTIC_TBL_NAME);
- InternalSchemaInitializer.modifyTblReplicaCount(db,
AuditLoaderPlugin.AUDIT_LOG_TABLE);
+ InternalSchemaInitializer.modifyTblReplicaCount(db,
AuditLoader.AUDIT_LOG_TABLE);
checkReplicationNum(db, StatisticConstants.TABLE_STATISTIC_TBL_NAME);
- checkReplicationNum(db, AuditLoaderPlugin.AUDIT_LOG_TABLE);
+ checkReplicationNum(db, AuditLoader.AUDIT_LOG_TABLE);
}
private void checkReplicationNum(Database db, String tblName) throws
AnalysisException {
@@ -77,7 +78,7 @@ public class InternalSchemaAlterTest extends
TestWithFeService {
Database db = Env.getCurrentEnv().getCatalogMgr()
.getInternalCatalog().getDbNullable(FeConstants.INTERNAL_DB_NAME);
Assertions.assertNotNull(db);
- OlapTable table =
db.getOlapTableOrAnalysisException(AuditLoaderPlugin.AUDIT_LOG_TABLE);
+ OlapTable table =
db.getOlapTableOrAnalysisException(AuditLoader.AUDIT_LOG_TABLE);
Assertions.assertNotNull(table);
for (ColumnDef def : InternalSchema.AUDIT_SCHEMA) {
Assertions.assertNotNull(table.getColumn(def.getName()));
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/qe/AuditEventProcessorTest.java
b/fe/fe-core/src/test/java/org/apache/doris/qe/AuditEventProcessorTest.java
index 6c9f54080a0..f80b485609c 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/qe/AuditEventProcessorTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/qe/AuditEventProcessorTest.java
@@ -19,9 +19,9 @@ package org.apache.doris.qe;
import org.apache.doris.catalog.Env;
import org.apache.doris.common.util.DigitalVersion;
+import org.apache.doris.plugin.AuditEvent;
+import org.apache.doris.plugin.AuditEvent.EventType;
import org.apache.doris.plugin.PluginInfo;
-import org.apache.doris.plugin.audit.AuditEvent;
-import org.apache.doris.plugin.audit.AuditEvent.EventType;
import org.apache.doris.plugin.audit.AuditLogBuilder;
import org.apache.doris.utframe.UtFrameUtils;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
