diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b41c33b54..dd314aed42 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ include(cmake/Utils.cmake) include(cmake/Env.cmake) project("OceanBase CE" - VERSION 3.1.0 + VERSION 3.1.1 DESCRIPTION "OceanBase distributed database system" HOMEPAGE_URL "https://www.oceanbase.com/" LANGUAGES CXX C ASM) diff --git a/src/share/ob_cluster_version.h b/src/share/ob_cluster_version.h index cbb95d8904..cbfa65a990 100644 --- a/src/share/ob_cluster_version.h +++ b/src/share/ob_cluster_version.h @@ -92,11 +92,12 @@ uint64_t cal_version(const uint64_t major, const uint64_t minor, const uint64_t #define CLUSTER_VERSION_2277 (oceanbase::common::cal_version(2, 2, 77)) #define CLUSTER_VERSION_3000 (oceanbase::common::cal_version(3, 0, 0)) #define CLUSTER_VERSION_3100 (oceanbase::common::cal_version(3, 1, 0)) +#define CLUSTER_VERSION_311 (oceanbase::common::cal_version(3, 1, 1)) #define CLUSTER_VERSION_MAX UINT64_MAX // FIXME If you update the above version, please update me, CLUSTER_CURRENT_VERSION & ObUpgradeChecker!!!!!! //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -#define CLUSTER_CURRENT_VERSION CLUSTER_VERSION_3100 +#define CLUSTER_CURRENT_VERSION CLUSTER_VERSION_311 #define GET_MIN_CLUSTER_VERSION() (oceanbase::common::ObClusterVersion::get_instance().get_cluster_version()) #define GET_UNIS_CLUSTER_VERSION() (::oceanbase::lib::get_unis_compat_version() ?: GET_MIN_CLUSTER_VERSION()) @@ -110,6 +111,8 @@ uint64_t cal_version(const uint64_t major, const uint64_t minor, const uint64_t (oceanbase::common::ObClusterVersion::get_instance().get_cluster_version() < CLUSTER_VERSION_3000) #define IS_CLUSTER_VERSION_BEFORE_3100 \ (oceanbase::common::ObClusterVersion::get_instance().get_cluster_version() < CLUSTER_VERSION_3100) +#define IS_CLUSTER_VERSION_BEFORE_311 \ + (oceanbase::common::ObClusterVersion::get_instance().get_cluster_version() < CLUSTER_VERSION_311) #define IS_CLUSTER_VERSION_AFTER_2274 \ (oceanbase::common::ObClusterVersion::get_instance().get_cluster_version() > CLUSTER_VERSION_2274) diff --git a/src/share/ob_upgrade_utils.cpp b/src/share/ob_upgrade_utils.cpp index ef168deadb..4e9554931b 100644 --- a/src/share/ob_upgrade_utils.cpp +++ b/src/share/ob_upgrade_utils.cpp @@ -61,7 +61,8 @@ const uint64_t ObUpgradeChecker::UPGRADE_PATH[CLUTER_VERSION_NUM] = { CALC_CLUSTER_VERSION(2UL, 2UL, 74UL), // 2.2.74 CALC_CLUSTER_VERSION(2UL, 2UL, 75UL), // 2.2.75 CALC_CLUSTER_VERSION(2UL, 2UL, 76UL), // 2.2.76 - CALC_CLUSTER_VERSION(3UL, 1UL, 0UL) // 3.1.0 + CALC_CLUSTER_VERSION(3UL, 1UL, 0UL), // 3.1.0 + CALC_CLUSTER_VERSION(3UL, 1UL, 1UL) //3.1.1 }; bool ObUpgradeChecker::check_cluster_version_exist(const uint64_t version) @@ -1125,6 +1126,7 @@ int ObUpgradeProcesserSet::init(ObBaseUpgradeProcessor::UpgradeMode mode, common INIT_PROCESSOR_BY_VERSION(2, 2, 75); INIT_PROCESSOR_BY_VERSION(2, 2, 76); INIT_PROCESSOR_BY_VERSION(3, 1, 0); + INIT_PROCESSOR_BY_VERSION(3, 1, 1); #undef INIT_PROCESSOR_BY_VERSION inited_ = true; } diff --git a/src/share/ob_upgrade_utils.h b/src/share/ob_upgrade_utils.h index 45da0dd0e8..975b9c174b 100644 --- a/src/share/ob_upgrade_utils.h +++ b/src/share/ob_upgrade_utils.h @@ -181,7 +181,7 @@ public: static bool check_cluster_version_exist(const uint64_t version); public: - static const int64_t CLUTER_VERSION_NUM = 32; + static const int64_t CLUTER_VERSION_NUM = 33; static const uint64_t UPGRADE_PATH[CLUTER_VERSION_NUM]; }; @@ -230,6 +230,7 @@ public: DEF_SIMPLE_UPGRARD_PROCESSER(2, 2, 76); // 3.1.0 DEF_SIMPLE_UPGRARD_PROCESSER(3, 1, 0); +DEF_SIMPLE_UPGRARD_PROCESSER(3, 1, 1); /* =========== upgrade processor end ============= */ diff --git a/src/share/parameter/ob_parameter_seed.ipp b/src/share/parameter/ob_parameter_seed.ipp index 602f3b8f0d..f3a51ce03a 100644 --- a/src/share/parameter/ob_parameter_seed.ipp +++ b/src/share/parameter/ob_parameter_seed.ipp @@ -515,7 +515,7 @@ DEF_TIME(get_leader_candidate_rpc_timeout, OB_CLUSTER_PARAMETER, "9s", "[2s, 180 "the time during a get leader candidate rpc request " "is permitted to execute before it is terminated. Range: [2s, 180s]", ObParameterAttr(Section::ROOT_SERVICE, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE)); -DEF_STR(min_observer_version, OB_CLUSTER_PARAMETER, "3.1.0", "the min observer version", +DEF_STR(min_observer_version, OB_CLUSTER_PARAMETER, "3.1.1", "the min observer version", ObParameterAttr(Section::ROOT_SERVICE, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE)); DEF_BOOL(enable_ddl, OB_CLUSTER_PARAMETER, "True", "specifies whether DDL operation is turned on. "