1.cancel export, 2 huge-compound case

englefly · Nov 30, 2024 · 80faacd · 80faacd
1 parent dfa39da
commit 80faacd
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 54 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/ExportMgr.java b/fe/fe-core/src/main/java/org/apache/doris/load/ExportMgr.java
@@ -38,6 +38,7 @@
 import org.apache.doris.common.util.TimeUtils;
 import org.apache.doris.datasource.InternalCatalog;
 import org.apache.doris.mysql.privilege.PrivPredicate;
+import org.apache.doris.nereids.trees.expressions.Expression;
 import org.apache.doris.nereids.trees.expressions.Or;
 import org.apache.doris.qe.ConnectContext;
 import org.apache.doris.scheduler.exception.JobException;
@@ -163,7 +164,7 @@ public void cancelExportJob(CancelExportStmt stmt) throws DdlException, Analysis
 
     private List<ExportJob> getWaitingCancelJobs(
             String label, String state,
-            org.apache.doris.nereids.trees.expressions.CompoundPredicate operator)
+            Expression operator)
             throws AnalysisException {
         Predicate<ExportJob> jobFilter = buildCancelJobFilter(label, state, operator);
         readLock();
@@ -177,7 +178,7 @@ private List<ExportJob> getWaitingCancelJobs(
     @VisibleForTesting
     public static Predicate<ExportJob> buildCancelJobFilter(
             String label, String state,
-            org.apache.doris.nereids.trees.expressions.CompoundPredicate operator)
+            Expression operator)
             throws AnalysisException {
         PatternMatcher matcher = PatternMatcherWrapper.createMysqlPattern(label,
                 CaseSensibility.LABEL.getCaseSensibility());
@@ -207,7 +208,7 @@ public static Predicate<ExportJob> buildCancelJobFilter(
     public void cancelExportJob(
             String label,
             String state,
-            org.apache.doris.nereids.trees.expressions.CompoundPredicate operator, String dbName)
+            Expression operator, String dbName)
             throws DdlException, AnalysisException {
         // List of export jobs waiting to be cancelled
         List<ExportJob> matchExportJobs = getWaitingCancelJobs(label, state, operator);

diff --git a/...core/src/main/java/org/apache/doris/nereids/trees/plans/commands/CancelExportCommand.java b/...core/src/main/java/org/apache/doris/nereids/trees/plans/commands/CancelExportCommand.java
@@ -20,7 +20,6 @@
 import org.apache.doris.common.AnalysisException;
 import org.apache.doris.common.UserException;
 import org.apache.doris.load.ExportJobState;
-import org.apache.doris.nereids.trees.expressions.CompoundPredicate;
 import org.apache.doris.nereids.trees.expressions.Expression;
 import org.apache.doris.nereids.trees.plans.PlanType;
 import org.apache.doris.nereids.trees.plans.visitor.PlanVisitor;
@@ -55,7 +54,7 @@ public CancelExportCommand(String dbName, Expression whereClause) {
     @Override
     public void run(ConnectContext ctx, StmtExecutor executor) throws Exception {
         validate(ctx);
-        ctx.getEnv().getExportMgr().cancelExportJob(label, state, (CompoundPredicate) whereClause, dbName);
+        ctx.getEnv().getExportMgr().cancelExportJob(label, state, whereClause, dbName);
     }
 
     private void validate(ConnectContext ctx) throws UserException {