From f35ad26ae8218e42bd071a111143d08d69e400fd Mon Sep 17 00:00:00 2001 From: obdev Date: Mon, 17 Jun 2024 18:03:41 +0000 Subject: [PATCH] Occupy cluster version 4.2.3.1 --- src/share/ob_cluster_version.h | 2 ++ src/share/ob_upgrade_utils.cpp | 3 +++ src/share/ob_upgrade_utils.h | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/share/ob_cluster_version.h b/src/share/ob_cluster_version.h index 228739e9c0..db65e3fb61 100644 --- a/src/share/ob_cluster_version.h +++ b/src/share/ob_cluster_version.h @@ -179,6 +179,7 @@ cal_version(const uint64_t major, const uint64_t minor, const uint64_t major_pat #define CLUSTER_VERSION_4_2_2_0 (oceanbase::common::cal_version(4, 2, 2, 0)) #define MOCK_CLUSTER_VERSION_4_2_2_1 (oceanbase::common::cal_version(4, 2, 2, 1)) #define MOCK_CLUSTER_VERSION_4_2_3_0 (oceanbase::common::cal_version(4, 2, 3, 0)) +#define MOCK_CLUSTER_VERSION_4_2_3_1 (oceanbase::common::cal_version(4, 2, 3, 1)) #define MOCK_CLUSTER_VERSION_4_2_4_0 (oceanbase::common::cal_version(4, 2, 4, 0)) // new data version before 4.3 cannot upgrade to master, must add "MOCK_" prefix #define CLUSTER_VERSION_4_3_0_0 (oceanbase::common::cal_version(4, 3, 0, 0)) @@ -212,6 +213,7 @@ cal_version(const uint64_t major, const uint64_t minor, const uint64_t major_pat #define DATA_VERSION_4_2_2_0 (oceanbase::common::cal_version(4, 2, 2, 0)) #define MOCK_DATA_VERSION_4_2_2_1 (oceanbase::common::cal_version(4, 2, 2, 1)) #define MOCK_DATA_VERSION_4_2_3_0 (oceanbase::common::cal_version(4, 2, 3, 0)) +#define MOCK_DATA_VERSION_4_2_3_1 (oceanbase::common::cal_version(4, 2, 3, 1)) #define MOCK_DATA_VERSION_4_2_4_0 (oceanbase::common::cal_version(4, 2, 4, 0)) // new data version before 4.3 cannot upgrade to master, must add "MOCK_" prefix #define DATA_VERSION_4_3_0_0 (oceanbase::common::cal_version(4, 3, 0, 0)) diff --git a/src/share/ob_upgrade_utils.cpp b/src/share/ob_upgrade_utils.cpp index 6c3c67f509..7f064118c2 100755 --- a/src/share/ob_upgrade_utils.cpp +++ b/src/share/ob_upgrade_utils.cpp @@ -49,6 +49,7 @@ const uint64_t ObUpgradeChecker::UPGRADE_PATH[] = { CALC_VERSION(4UL, 2UL, 2UL, 0UL), // 4.2.2.0 CALC_VERSION(4UL, 2UL, 2UL, 1UL), // 4.2.2.1 CALC_VERSION(4UL, 2UL, 3UL, 0UL), // 4.2.3.0 + CALC_VERSION(4UL, 2UL, 3UL, 1UL), // 4.2.3.1 CALC_VERSION(4UL, 2UL, 4UL, 0UL), // 4.2.4.0 CALC_VERSION(4UL, 3UL, 0UL, 0UL), // 4.3.0.0 CALC_VERSION(4UL, 3UL, 0UL, 1UL), // 4.3.0.1 @@ -78,6 +79,7 @@ int ObUpgradeChecker::get_data_version_by_cluster_version( CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_2_2_0, DATA_VERSION_4_2_2_0) CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(MOCK_CLUSTER_VERSION_4_2_2_1, MOCK_DATA_VERSION_4_2_2_1) CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(MOCK_CLUSTER_VERSION_4_2_3_0, MOCK_DATA_VERSION_4_2_3_0) + CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(MOCK_CLUSTER_VERSION_4_2_3_1, MOCK_DATA_VERSION_4_2_3_1) CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(MOCK_CLUSTER_VERSION_4_2_4_0, MOCK_DATA_VERSION_4_2_4_0) CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_3_0_0, DATA_VERSION_4_3_0_0) CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_3_0_1, DATA_VERSION_4_3_0_1) @@ -654,6 +656,7 @@ int ObUpgradeProcesserSet::init( INIT_PROCESSOR_BY_VERSION(4, 2, 2, 0); INIT_PROCESSOR_BY_VERSION(4, 2, 2, 1); INIT_PROCESSOR_BY_VERSION(4, 2, 3, 0); + INIT_PROCESSOR_BY_VERSION(4, 2, 3, 1); INIT_PROCESSOR_BY_VERSION(4, 2, 4, 0); INIT_PROCESSOR_BY_VERSION(4, 3, 0, 0); INIT_PROCESSOR_BY_VERSION(4, 3, 0, 1); diff --git a/src/share/ob_upgrade_utils.h b/src/share/ob_upgrade_utils.h index 63a2d0ad36..fbaa951227 100755 --- a/src/share/ob_upgrade_utils.h +++ b/src/share/ob_upgrade_utils.h @@ -174,7 +174,7 @@ public: const uint64_t cluster_version, uint64_t &data_version); public: - static const int64_t DATA_VERSION_NUM = 16; + static const int64_t DATA_VERSION_NUM = 17; static const uint64_t UPGRADE_PATH[]; }; @@ -229,6 +229,7 @@ DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 1, 2) DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 2, 0) DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 2, 1) DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 3, 0) +DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 3, 1) DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 4, 0) DEF_SIMPLE_UPGRARD_PROCESSER(4, 3, 0, 0) DEF_SIMPLE_UPGRARD_PROCESSER(4, 3, 0, 1)