From fac42370c9008c0d48b447bdb53b049fd2a16947 Mon Sep 17 00:00:00 2001 From: zhangstar333 Date: Mon, 21 Jul 2025 12:08:48 +0800 Subject: [PATCH] [branch-21](upgrate) fix upgrate error of branch-21 (#53353) --- be/src/agent/be_exec_version_manager.h | 2 +- be/test/vec/utils/be_exec_version_test.cpp | 2 +- .../src/main/java/org/apache/doris/common/Config.java | 2 +- .../src/test/java/org/apache/doris/common/ConfigTest.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/be/src/agent/be_exec_version_manager.h b/be/src/agent/be_exec_version_manager.h index fafa764267..0c2c0d75f9 100644 --- a/be/src/agent/be_exec_version_manager.h +++ b/be/src/agent/be_exec_version_manager.h @@ -73,7 +73,7 @@ private: * h. "now": ALWAYS_NOT_NULLABLE -> DEPEND_ON_ARGUMENTS * i. change FunctionIsIPAddressInRange from AlwaysNotNullable to DependOnArguments. controlled by individual session variable. */ -constexpr inline int BeExecVersionManager::max_be_exec_version = 6; +constexpr inline int BeExecVersionManager::max_be_exec_version = 7; constexpr inline int BeExecVersionManager::min_be_exec_version = 0; /// functional diff --git a/be/test/vec/utils/be_exec_version_test.cpp b/be/test/vec/utils/be_exec_version_test.cpp index c0e1117dab..d9e32a02cf 100644 --- a/be/test/vec/utils/be_exec_version_test.cpp +++ b/be/test/vec/utils/be_exec_version_test.cpp @@ -25,7 +25,7 @@ namespace doris::vectorized { TEST(be_exec_version_test, empty_buckets) { // YOU MUST NOT CHANGE THIS TEST ! // if you want to change be_exec_version, you should know what you are doing - EXPECT_EQ(BeExecVersionManager::get_newest_version(), 6); + EXPECT_EQ(BeExecVersionManager::get_newest_version(), 7); EXPECT_EQ(BeExecVersionManager::get_min_version(), 0); } diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java index 6c81062175..4b2711bcc9 100644 --- a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java +++ b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java @@ -1952,7 +1952,7 @@ public class Config extends ConfigBase { * Max data version of backends serialize block. */ @ConfField(mutable = false) - public static int max_be_exec_version = 6; + public static int max_be_exec_version = 7; /** * Min data version of backends serialize block. diff --git a/fe/fe-core/src/test/java/org/apache/doris/common/ConfigTest.java b/fe/fe-core/src/test/java/org/apache/doris/common/ConfigTest.java index 5af44ec2ed..6982986fae 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/common/ConfigTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/common/ConfigTest.java @@ -28,8 +28,8 @@ public class ConfigTest { System.out.println(Config.be_exec_version); // YOU MUST NOT CHANGE THIS TEST ! // if you want to change be_exec_version, you should know what you are doing - Assertions.assertEquals(6, Config.max_be_exec_version); + Assertions.assertEquals(7, Config.max_be_exec_version); Assertions.assertEquals(0, Config.min_be_exec_version); - Assertions.assertEquals(6, Config.be_exec_version); + Assertions.assertEquals(7, Config.be_exec_version); } }