From 099b3868a13c95103dfa5161a8f492b1e2631015 Mon Sep 17 00:00:00 2001 From: Yukang-Lian Date: Tue, 16 Jul 2024 22:19:48 +0800 Subject: [PATCH 1/2] 1 --- .../src/main/java/org/apache/doris/qe/StmtExecutor.java | 7 ------- 1 file changed, 7 deletions(-) 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 a8458318bd49fe..55c553d1ecd2ad 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 @@ -717,13 +717,6 @@ private void executeByNereids(TUniqueId queryId) throws Exception { + Env.getCurrentEnv().getSelfNode().getHost() + ") and failed to execute" + " because Master FE is not ready. You may need to check FE's status")); } - if (context.getSessionVariable().isEnableInsertGroupCommit()) { - // FIXME: Group commit insert does not need to forward to master - // Nereids does not support group commit, so we can not judge if should forward - // Here throw an exception to fallback to legacy planner and let legacy judge if should forward - // After Nereids support group commit, we can remove this exception - throw new NereidsException(new UserException("Nereids does not support group commit insert")); - } forwardToMaster(); if (masterOpExecutor != null && masterOpExecutor.getQueryId() != null) { context.setQueryId(masterOpExecutor.getQueryId()); From b1799c26893126ef3753c15036d9bcbf99b55465 Mon Sep 17 00:00:00 2001 From: Yukang-Lian Date: Wed, 17 Jul 2024 17:10:19 +0800 Subject: [PATCH 2/2] 2 --- .../src/main/java/org/apache/doris/qe/SessionVariable.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java index 7fbb595b814e1b..9a5caa5a7d1ace 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java +++ b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java @@ -1669,7 +1669,7 @@ public void setEnableLeftZigZag(boolean enableLeftZigZag) { @VariableMgr.VarAttr(name = LOAD_STREAM_PER_NODE) public int loadStreamPerNode = 2; - @VariableMgr.VarAttr(name = GROUP_COMMIT) + @VariableMgr.VarAttr(name = GROUP_COMMIT, needForward = true) public String groupCommit = "off_mode"; @VariableMgr.VarAttr(name = INVERTED_INDEX_CONJUNCTION_OPT_THRESHOLD,