This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new 58fb9c5bc31 branch-4.0: [opt](planner) Enable Nereids distribute
planner after upgrade (#66631)
58fb9c5bc31 is described below
commit 58fb9c5bc3158257b3c6521e28a794b285cbccf5
Author: 924060929 <[email protected]>
AuthorDate: Tue Aug 11 10:26:54 2026 +0800
branch-4.0: [opt](planner) Enable Nereids distribute planner after upgrade
(#66631)
cherry pick from #66604
---
.../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 c6f986875eb..b5c8148edd3 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
@@ -1083,6 +1083,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 7004e85b5f2..69258cd52b7 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
@@ -128,6 +128,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]
