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 01da5c6dd71449..da2a1136b174f6 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 @@ -1472,7 +1472,7 @@ public Future execRemoteFragmentAsync() throws TExcepti } catch (RpcException e) { // DO NOT throw exception here, return a complete future with error code, // so that the following logic will cancel the fragment. - Future future = new Future() { + return new Future() { @Override public boolean cancel(boolean mayInterruptIfRunning) { return false; @@ -1489,9 +1489,10 @@ public boolean isDone() { } @Override - public PExecPlanFragmentResult get() throws InterruptedException, ExecutionException { + public PExecPlanFragmentResult get() { PExecPlanFragmentResult result = new PExecPlanFragmentResult(); PStatus pStatus = new PStatus(); + pStatus.error_msgs = Lists.newArrayList(); pStatus.error_msgs.add(e.getMessage()); // use THRIFT_RPC_ERROR so that this BE will be added to the blacklist later. pStatus.status_code = TStatusCode.THRIFT_RPC_ERROR.getValue(); @@ -1500,12 +1501,10 @@ public PExecPlanFragmentResult get() throws InterruptedException, ExecutionExcep } @Override - public PExecPlanFragmentResult get(long timeout, TimeUnit unit) - throws InterruptedException, ExecutionException, TimeoutException { + public PExecPlanFragmentResult get(long timeout, TimeUnit unit) { return get(); } }; - return future; } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java index 09e2e3cee7c20c..652e955c8e38cc 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java +++ b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java @@ -254,7 +254,7 @@ public void execute() throws Exception { throw e; } if (!context.getMysqlChannel().isSend()) { - LOG.warn("retry {} times. stmt: {}", (i + 1), context.getStmtId()); + LOG.warn("retry {} times. stmt: {}", (i + 1), parsedStmt.getOrigStmt().originStmt); } else { throw e; }