This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.1 by this push:
new ea14a96eecc branch-4.1: [opt](planner) Enable Nereids distribute
planner after upgrade #66604 (#66640)
ea14a96eecc is described below
commit ea14a96eecce6ac007c092698dfc975609eee13b
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Aug 13 19:01:47 2026 +0800
branch-4.1: [opt](planner) Enable Nereids distribute planner after upgrade
#66604 (#66640)
Cherry-picked from #66604
---------
Co-authored-by: 924060929 <[email protected]>
---
.../main/java/org/apache/doris/qe/VariableMgr.java | 3 +++
.../java/org/apache/doris/qe/VariableMgrTest.java | 25 ++++++++++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/VariableMgr.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/VariableMgr.java
index 60c7852cb09..c293aa0d4e6 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/VariableMgr.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/VariableMgr.java
@@ -1087,6 +1087,9 @@ public class VariableMgr {
VariableMgr.refreshDefaultSessionVariables(updateInfo,
SessionVariable.ENABLE_SQL_CACHE,
String.valueOf(true));
+ VariableMgr.refreshDefaultSessionVariables(updateInfo,
+ SessionVariable.ENABLE_NEREIDS_DISTRIBUTE_PLANNER,
+ String.valueOf(true));
}
if (currentVariableVersion < GlobalVariable.CURRENT_VARIABLE_VERSION) {
VariableMgr.refreshDefaultSessionVariables(updateInfo,
diff --git a/fe/fe-core/src/test/java/org/apache/doris/qe/VariableMgrTest.java
b/fe/fe-core/src/test/java/org/apache/doris/qe/VariableMgrTest.java
index 78d7365a9c5..c7239481860 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/qe/VariableMgrTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/qe/VariableMgrTest.java
@@ -129,6 +129,31 @@ public class VariableMgrTest {
Assert.assertEquals(defaultSessionVar.enableProfile(),
VariableMgr.newSessionVariable().enableProfile());
}
+ @Test
+ public void testEnableNereidsDistributePlannerAfterUpgrade() {
+ SessionVariable defaultSessionVariable =
VariableMgr.getDefaultSessionVariable();
+ boolean originalValue =
defaultSessionVariable.isEnableNereidsDistributePlanner();
+ boolean originalEnableSqlCache =
defaultSessionVariable.isEnableSqlCache();
+ boolean originalAnsiBehavior =
GlobalVariable.enable_ansi_query_organization_behavior;
+ boolean originalTypeCoercionBehavior =
GlobalVariable.enableNewTypeCoercionBehavior;
+ int originalVersion = GlobalVariable.variableVersion;
+ try {
+ defaultSessionVariable.setEnableNereidsDistributePlanner(false);
+ GlobalVariable.variableVersion =
GlobalVariable.VARIABLE_VERSION_300;
+
+ VariableMgr.forceUpdateVariables();
+
+
Assert.assertTrue(VariableMgr.newSessionVariable().isEnableNereidsDistributePlanner());
+ Assert.assertEquals(GlobalVariable.CURRENT_VARIABLE_VERSION,
GlobalVariable.variableVersion);
+ } finally {
+
defaultSessionVariable.setEnableNereidsDistributePlanner(originalValue);
+ defaultSessionVariable.setEnableSqlCache(originalEnableSqlCache);
+ GlobalVariable.enable_ansi_query_organization_behavior =
originalAnsiBehavior;
+ GlobalVariable.enableNewTypeCoercionBehavior =
originalTypeCoercionBehavior;
+ GlobalVariable.variableVersion = originalVersion;
+ }
+ }
+
@Test
public void testAutoCommitConvert() throws Exception {
// boolean var with ConvertBoolToLongMethod annotation
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
