From a4e317f09ec573819911effb700829ec3c20db41 Mon Sep 17 00:00:00 2001 From: BePPPower Date: Tue, 30 Apr 2024 14:54:45 +0800 Subject: [PATCH] fix --- .../main/java/org/apache/doris/load/ExportMgr.java | 1 + .../org/apache/doris/load/ExportTaskExecutor.java | 13 ++++--------- .../nereids/trees/plans/commands/ExportCommand.java | 3 --- .../java/org/apache/doris/qe/ConnectContext.java | 2 +- 4 files changed, 6 insertions(+), 13 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 index afc7ea51984475..9a3e0d9948197f 100644 --- 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 @@ -384,6 +384,7 @@ private List composeExportJobInfo(ExportJob job) { infoMap.put("tablet_num", job.getTabletsNum()); infoMap.put("max_file_size", job.getMaxFileSize()); infoMap.put("delete_existing_files", job.getDeleteExistingFiles()); + infoMap.put("parallelism", job.getParallelism()); infoMap.put("data_consistency", job.getDataConsistency()); jobInfo.add(new Gson().toJson(infoMap)); // path diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/ExportTaskExecutor.java b/fe/fe-core/src/main/java/org/apache/doris/load/ExportTaskExecutor.java index 6ead047dc722fb..1424f3bc3010cf 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/load/ExportTaskExecutor.java +++ b/fe/fe-core/src/main/java/org/apache/doris/load/ExportTaskExecutor.java @@ -32,7 +32,6 @@ import org.apache.doris.nereids.trees.plans.logical.LogicalPlan; import org.apache.doris.qe.AutoCloseConnectContext; import org.apache.doris.qe.ConnectContext; -import org.apache.doris.qe.OriginStatement; import org.apache.doris.qe.QueryState.MysqlStateType; import org.apache.doris.qe.StmtExecutor; import org.apache.doris.scheduler.exception.JobException; @@ -41,7 +40,6 @@ import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import java.util.List; import java.util.Map; @@ -135,13 +133,7 @@ public void execute() throws JobException { } try (AutoCloseConnectContext r = buildConnectContext()) { - StatementBase statementBase = selectStmtLists.get(idx); - OriginStatement originStatement = new OriginStatement( - StringUtils.isEmpty(statementBase.getOrigStmt().originStmt) - ? exportJob.getOrigStmt().originStmt : statementBase.getOrigStmt().originStmt, idx); - statementBase.setOrigStmt(originStatement); - stmtExecutor = new StmtExecutor(r.connectContext, statementBase); - + stmtExecutor = new StmtExecutor(r.connectContext, selectStmtLists.get(idx)); stmtExecutor.execute(); if (r.connectContext.getState().getStateType() == MysqlStateType.ERR) { exportJob.updateExportJobState(ExportJobState.CANCELLED, taskId, null, @@ -178,6 +170,9 @@ private AutoCloseConnectContext buildConnectContext() { ConnectContext connectContext = new ConnectContext(); exportJob.getSessionVariables().setQueryTimeoutS(exportJob.getTimeoutSecond()); connectContext.setSessionVariable(exportJob.getSessionVariables()); + // The rollback to the old optimizer is prohibited + // Since originStmt is empty, reverting to the old optimizer when the new optimizer is enabled is meaningless. + connectContext.getSessionVariable().enableFallbackToOriginalPlanner = false; connectContext.setEnv(Env.getCurrentEnv()); connectContext.setDatabase(exportJob.getTableName().getDb()); connectContext.setQualifiedUser(exportJob.getQualifiedUser()); diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ExportCommand.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ExportCommand.java index 4b2121a5dc8a4c..f89145ec45cdaa 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ExportCommand.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ExportCommand.java @@ -249,9 +249,6 @@ private ExportJob generateExportJob(ConnectContext ctx, Map file exportJob.setTableName(tblName); exportJob.setExportTable(table); exportJob.setTableId(table.getId()); - if (ctx.getExecutor() != null) { - exportJob.setOrigStmt(ctx.getExecutor().getOriginStmt()); - } // set partitions exportJob.setPartitionNames(this.partitionsNames); // set where expression 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 f1a4bc54b4d36f..f64f68da388aff 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 @@ -222,7 +222,7 @@ public enum ConnectType { private StatsErrorEstimator statsErrorEstimator; - private Map resultAttachedInfo; + private Map resultAttachedInfo = Maps.newHashMap(); private String workloadGroupName = ""; private Map insertGroupCommitTableToBeMap = new HashMap<>();