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

[UPGRADE] Upgrade cluster_version/data_version to 4.2.0.0

Browse Source
This commit is contained in:
tino247
2023-04-18 03:44:59 +00:00
committed by ob-robot
parent 167d4b9724
commit 9a57e64e56
13 changed files with 159 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/share/ob_upgrade_utils.cpp
View File

@ -35,7 +35,8 @@ namespace share
{
const uint64_t ObUpgradeChecker::UPGRADE_PATH[DATA_VERSION_NUM] = {
CALC_VERSION(4UL, 0UL, 0UL, 0UL), // 4.0.0.0
CALC_VERSION(4UL, 1UL, 0UL, 0UL) // 4.1.0.0
CALC_VERSION(4UL, 1UL, 0UL, 0UL), // 4.1.0.0
CALC_VERSION(4UL, 2UL, 0UL, 0UL) // 4.2.0.0
};
int ObUpgradeChecker::get_data_version_by_cluster_version(
@ -44,14 +45,15 @@ int ObUpgradeChecker::get_data_version_by_cluster_version(
{
int ret = OB_SUCCESS;
switch (cluster_version) {
case CLUSTER_VERSION_4_0_0_0: {
data_version = DATA_VERSION_4_0_0_0;
break;
}
case CLUSTER_VERSION_4_1_0_0: {
data_version = DATA_VERSION_4_1_0_0;
break;
#define CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION, DATA_VERSION) \
case CLUSTER_VERSION : { \
data_version = DATA_VERSION; \
break; \
}
CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_0_0_0, DATA_VERSION_4_0_0_0)
CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_1_0_0, DATA_VERSION_4_1_0_0)
CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_2_0_0, DATA_VERSION_4_2_0_0)
#undef CONVERT_CLUSTER_VERSION_TO_DATA_VERSION
default: {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid cluster_version", KR(ret), K(cluster_version));
@ -71,6 +73,14 @@ bool ObUpgradeChecker::check_data_version_exist(
return bret;
}
//FIXME:(yanmu.ztl) cluster version should be discrete.
bool ObUpgradeChecker::check_cluster_version_exist(
const uint64_t version)
{
return version >= CLUSTER_VERSION_4_0_0_0
&& version <= CLUSTER_CURRENT_VERSION;
}
#define FORMAT_STR(str) ObHexEscapeSqlStr(str.empty() ? ObString("") : str)
/*
@ -596,6 +606,7 @@ int ObUpgradeProcesserSet::init(
// order by data version asc
INIT_PROCESSOR_BY_VERSION(4, 0, 0, 0);
INIT_PROCESSOR_BY_VERSION(4, 1, 0, 0);
INIT_PROCESSOR_BY_VERSION(4, 2, 0, 0);
#undef INIT_PROCESSOR_BY_VERSION
inited_ = true;
}