hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

增加425在master占位

Browse Source
This commit is contained in:
obdev
2024-07-11 06:46:48 +00:00
committed by ob-robot
parent d85c98a175
commit 5bf59291e3
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
deps/oblib/src/common/ob_version_def.h vendored
View File

@ -125,6 +125,7 @@ cal_version(const uint64_t major, const uint64_t minor, const uint64_t major_pat
#define MOCK_CLUSTER_VERSION_4_2_3_0 (oceanbase::common::cal_version(4, 2, 3, 0)) #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_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)) #define MOCK_CLUSTER_VERSION_4_2_4_0 (oceanbase::common::cal_version(4, 2, 4, 0))
#define MOCK_CLUSTER_VERSION_4_2_5_0 (oceanbase::common::cal_version(4, 2, 5, 0))
// new data version before 4.3 cannot upgrade to master, must add "MOCK_" prefix // 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)) #define CLUSTER_VERSION_4_3_0_0 (oceanbase::common::cal_version(4, 3, 0, 0))
#define CLUSTER_VERSION_4_3_0_1 (oceanbase::common::cal_version(4, 3, 0, 1)) #define CLUSTER_VERSION_4_3_0_1 (oceanbase::common::cal_version(4, 3, 0, 1))
@ -157,6 +158,7 @@ cal_version(const uint64_t major, const uint64_t minor, const uint64_t major_pat
#define MOCK_DATA_VERSION_4_2_3_0 (oceanbase::common::cal_version(4, 2, 3, 0)) #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_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)) #define MOCK_DATA_VERSION_4_2_4_0 (oceanbase::common::cal_version(4, 2, 4, 0))
#define MOCK_DATA_VERSION_4_2_5_0 (oceanbase::common::cal_version(4, 2, 5, 0))
// new data version before 4.3 cannot upgrade to master, must add "MOCK_" prefix // 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)) #define DATA_VERSION_4_3_0_0 (oceanbase::common::cal_version(4, 3, 0, 0))
#define DATA_VERSION_4_3_0_1 (oceanbase::common::cal_version(4, 3, 0, 1)) #define DATA_VERSION_4_3_0_1 (oceanbase::common::cal_version(4, 3, 0, 1))
@ -178,4 +180,4 @@ public:
} // namespace common } // namespace common
} // namespace oceanbase } // namespace oceanbase
#endif #endif

3
src/share/ob_upgrade_utils.cpp
View File

@ -52,6 +52,7 @@ const uint64_t ObUpgradeChecker::UPGRADE_PATH[] = {
CALC_VERSION(4UL, 2UL, 3UL, 0UL), // 4.2.3.0 CALC_VERSION(4UL, 2UL, 3UL, 0UL), // 4.2.3.0
CALC_VERSION(4UL, 2UL, 3UL, 1UL), // 4.2.3.1 CALC_VERSION(4UL, 2UL, 3UL, 1UL), // 4.2.3.1
CALC_VERSION(4UL, 2UL, 4UL, 0UL), // 4.2.4.0 CALC_VERSION(4UL, 2UL, 4UL, 0UL), // 4.2.4.0
CALC_VERSION(4UL, 2UL, 5UL, 0UL), // 4.2.5.0
CALC_VERSION(4UL, 3UL, 0UL, 0UL), // 4.3.0.0 CALC_VERSION(4UL, 3UL, 0UL, 0UL), // 4.3.0.0
CALC_VERSION(4UL, 3UL, 0UL, 1UL), // 4.3.0.1 CALC_VERSION(4UL, 3UL, 0UL, 1UL), // 4.3.0.1
CALC_VERSION(4UL, 3UL, 1UL, 0UL), // 4.3.1.0 CALC_VERSION(4UL, 3UL, 1UL, 0UL), // 4.3.1.0
@ -83,6 +84,7 @@ int ObUpgradeChecker::get_data_version_by_cluster_version(
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_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_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(MOCK_CLUSTER_VERSION_4_2_4_0, MOCK_DATA_VERSION_4_2_4_0)
CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(MOCK_CLUSTER_VERSION_4_2_5_0, MOCK_DATA_VERSION_4_2_5_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_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) CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_3_0_1, DATA_VERSION_4_3_0_1)
CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_3_1_0, DATA_VERSION_4_3_1_0) CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_3_1_0, DATA_VERSION_4_3_1_0)
@ -661,6 +663,7 @@ int ObUpgradeProcesserSet::init(
INIT_PROCESSOR_BY_VERSION(4, 2, 3, 0); INIT_PROCESSOR_BY_VERSION(4, 2, 3, 0);
INIT_PROCESSOR_BY_VERSION(4, 2, 3, 1); INIT_PROCESSOR_BY_VERSION(4, 2, 3, 1);
INIT_PROCESSOR_BY_VERSION(4, 2, 4, 0); INIT_PROCESSOR_BY_VERSION(4, 2, 4, 0);
INIT_PROCESSOR_BY_VERSION(4, 2, 5, 0);
INIT_PROCESSOR_BY_VERSION(4, 3, 0, 0); INIT_PROCESSOR_BY_VERSION(4, 3, 0, 0);
INIT_PROCESSOR_BY_VERSION(4, 3, 0, 1); INIT_PROCESSOR_BY_VERSION(4, 3, 0, 1);
INIT_PROCESSOR_BY_VERSION(4, 3, 1, 0); INIT_PROCESSOR_BY_VERSION(4, 3, 1, 0);

3
src/share/ob_upgrade_utils.h
View File

@ -174,7 +174,7 @@ public:
const uint64_t cluster_version, const uint64_t cluster_version,
uint64_t &data_version); uint64_t &data_version);
public: public:
static const int64_t DATA_VERSION_NUM = 18; static const int64_t DATA_VERSION_NUM = 19;
static const uint64_t UPGRADE_PATH[]; static const uint64_t UPGRADE_PATH[];
}; };
@ -231,6 +231,7 @@ DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 2, 1)
DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 3, 0) DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 3, 0)
DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 3, 1) DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 3, 1)
DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 4, 0) DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 4, 0)
DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 5, 0)
DEF_SIMPLE_UPGRARD_PROCESSER(4, 3, 0, 0) DEF_SIMPLE_UPGRARD_PROCESSER(4, 3, 0, 0)
DEF_SIMPLE_UPGRARD_PROCESSER(4, 3, 0, 1) DEF_SIMPLE_UPGRARD_PROCESSER(4, 3, 0, 1)