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 ca86ee7b152 [fix](load) fix wrong assert and cancel load error (#35362)
ca86ee7b152 is described below
commit ca86ee7b15254c68f4ded442e1a617bfd5b13c83
Author: Mingyu Chen <morning...@163.com>
AuthorDate: Fri May 24 17:11:01 2024 +0800
[fix](load) fix wrong assert and cancel load error (#35362)
---
fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java | 1 -
fe/fe-core/src/main/java/org/apache/doris/qe/DdlExecutor.java | 8 ++++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
index 623237144ca..3baaace0aaf 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
@@ -2587,7 +2587,6 @@ public class Coordinator implements CoordInterface {
icebergCommitDataFunc.accept(params.getIcebergCommitDatas());
}
- Preconditions.checkArgument(params.isSetDetailedReport());
if (ctx.done) {
if (LOG.isDebugEnabled()) {
LOG.debug("Query {} fragment {} is marked done",
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/DdlExecutor.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/DdlExecutor.java
index 6f2d5e01244..5b26bb87e72 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/DdlExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/DdlExecutor.java
@@ -125,6 +125,7 @@ import org.apache.doris.catalog.EncryptKeyHelper;
import org.apache.doris.catalog.Env;
import org.apache.doris.common.DdlException;
import org.apache.doris.common.util.ProfileManager;
+import org.apache.doris.job.exception.JobException;
import org.apache.doris.load.sync.SyncJobManager;
import org.apache.doris.persist.CleanQueryStatsInfo;
import org.apache.doris.statistics.StatisticsRepository;
@@ -177,8 +178,11 @@ public class DdlExecutor {
} else if (ddlStmt instanceof CancelLoadStmt) {
CancelLoadStmt cs = (CancelLoadStmt) ddlStmt;
// cancel all
- env.getJobManager().cancelLoadJob(cs);
- env.getLoadManager().cancelLoadJob(cs);
+ try {
+ env.getJobManager().cancelLoadJob(cs);
+ } catch (JobException e) {
+ env.getLoadManager().cancelLoadJob(cs);
+ }
} else if (ddlStmt instanceof CreateRoutineLoadStmt) {
env.getRoutineLoadManager().createRoutineLoadJob((CreateRoutineLoadStmt)
ddlStmt);
} else if (ddlStmt instanceof PauseRoutineLoadStmt) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
