diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/NereidsSqlCoordinator.java b/fe/fe-core/src/main/java/org/apache/doris/qe/NereidsSqlCoordinator.java index 94342e37fe0198d..83efb9feef240e8 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/qe/NereidsSqlCoordinator.java +++ b/fe/fe-core/src/main/java/org/apache/doris/qe/NereidsSqlCoordinator.java @@ -173,7 +173,7 @@ public RowBatch getNext() throws Exception { return coordinatorContext.asQueryProcessor().getNext(); } - public boolean isEof() { + public boolean isEos() { return coordinatorContext.asQueryProcessor().isEos(); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/SqlCoordinatorContext.java b/fe/fe-core/src/main/java/org/apache/doris/qe/SqlCoordinatorContext.java index 5cec70a52ba7788..73d552ec5eb0c0f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/qe/SqlCoordinatorContext.java +++ b/fe/fe-core/src/main/java/org/apache/doris/qe/SqlCoordinatorContext.java @@ -170,8 +170,8 @@ public void updateProfileIfPresent(Consumer profileAction) { .ifPresent(profileAction); } - public boolean isEof() { - return coordinator.isEof(); + public boolean isEos() { + return jobProcessor instanceof QueryProcessor && coordinator.isEos(); } public void cancelSchedule(Status cancelReason) { @@ -193,7 +193,7 @@ public synchronized Status readCloneStatus() { public synchronized Status updateStatusIfOk(Status newStatus) { // If query is done, we will ignore their cancelled updates, and let the remote fragments to clean up async. Status originStatus = readCloneStatus(); - if (coordinator.getJobProcessor() instanceof QueryProcessor && coordinator.isEof() + if (coordinator.getJobProcessor() instanceof QueryProcessor && coordinator.isEos() && newStatus.isCancelled()) { return originStatus; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/runtime/LoadProcessor.java b/fe/fe-core/src/main/java/org/apache/doris/qe/runtime/LoadProcessor.java index e92f211d0c011a6..4a7bb93107ec5bd 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/qe/runtime/LoadProcessor.java +++ b/fe/fe-core/src/main/java/org/apache/doris/qe/runtime/LoadProcessor.java @@ -182,7 +182,7 @@ public void updateFragmentExecStatus(TReportExecStatusParams params) { // and returned_all_results_ is true. // (UpdateStatus() initiates cancellation, if it hasn't already been initiated) if (!status.ok()) { - if (coordinatorContext.isEof() && status.isCancelled()) { + if (coordinatorContext.isEos() && status.isCancelled()) { LOG.warn("Query {} has returned all results, fragment_id={} instance_id={}, be={}" + " is reporting failed status {}", DebugUtil.printId(queryId), params.getFragmentId(),