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

4252增加在master占位

Browse Source
This commit is contained in:
obdev 2024-12-20 08:15:59 +00:00 committed by ob-robot
parent 451044fb83
commit be83d034b1
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,6 +127,7 @@ cal_version(const uint64_t major, const uint64_t minor, const uint64_t major_pat
#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))
#define MOCK_CLUSTER_VERSION_4_2_5_1 (oceanbase::common::cal_version(4, 2, 5, 1))
#define MOCK_CLUSTER_VERSION_4_2_5_2 (oceanbase::common::cal_version(4, 2, 5, 2))
// 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_1 (oceanbase::common::cal_version(4, 3, 0, 1))
@ -167,6 +168,7 @@ cal_version(const uint64_t major, const uint64_t minor, const uint64_t major_pat
#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))
#define MOCK_DATA_VERSION_4_2_5_1 (oceanbase::common::cal_version(4, 2, 5, 1))
#define MOCK_DATA_VERSION_4_2_5_2 (oceanbase::common::cal_version(4, 2, 5, 2))
// 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_1 (oceanbase::common::cal_version(4, 3, 0, 1))

3
src/share/ob_upgrade_utils.cpp
View File

@ -57,6 +57,7 @@ const uint64_t ObUpgradeChecker::UPGRADE_PATH[] = {
CALC_VERSION(4UL, 2UL, 4UL, 0UL), // 4.2.4.0
CALC_VERSION(4UL, 2UL, 5UL, 0UL), // 4.2.5.0
CALC_VERSION(4UL, 2UL, 5UL, 1UL), // 4.2.5.1
CALC_VERSION(4UL, 2UL, 5UL, 2UL), // 4.2.5.2
CALC_VERSION(4UL, 3UL, 0UL, 0UL), // 4.3.0.0
CALC_VERSION(4UL, 3UL, 0UL, 1UL), // 4.3.0.1
CALC_VERSION(4UL, 3UL, 1UL, 0UL), // 4.3.1.0
@ -95,6 +96,7 @@ int ObUpgradeChecker::get_data_version_by_cluster_version(
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(MOCK_CLUSTER_VERSION_4_2_5_1, MOCK_DATA_VERSION_4_2_5_1)
CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(MOCK_CLUSTER_VERSION_4_2_5_2, MOCK_DATA_VERSION_4_2_5_2)
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_1_0, DATA_VERSION_4_3_1_0)
@ -693,6 +695,7 @@ int ObUpgradeProcesserSet::init(
INIT_PROCESSOR_BY_VERSION(4, 2, 4, 0);
INIT_PROCESSOR_BY_VERSION(4, 2, 5, 0);
INIT_PROCESSOR_BY_VERSION(4, 2, 5, 1);
INIT_PROCESSOR_BY_VERSION(4, 2, 5, 2);
INIT_PROCESSOR_BY_VERSION(4, 3, 0, 0);
INIT_PROCESSOR_BY_VERSION(4, 3, 0, 1);
INIT_PROCESSOR_BY_VERSION(4, 3, 1, 0);

3
src/share/ob_upgrade_utils.h
View File

@ -176,7 +176,7 @@ public:
const uint64_t cluster_version,
uint64_t &data_version);
public:
static const int64_t DATA_VERSION_NUM = 25;
static const int64_t DATA_VERSION_NUM = 26;
static const uint64_t UPGRADE_PATH[];
};
@ -246,6 +246,7 @@ DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 3, 1)
DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 4, 0)
DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 5, 0)
DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 5, 1)
DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 5, 2)
DEF_SIMPLE_UPGRARD_PROCESSER(4, 3, 0, 0)
DEF_SIMPLE_UPGRARD_PROCESSER(4, 3, 0, 1)