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

Upgrade master version to 4.3.3

Browse Source
This commit is contained in:
wuyuqiao.wyq 2024-07-10 09:57:33 +00:00 committed by ob-robot
parent 198c612e8e
commit 89b5be9179
12 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -5,14 +5,14 @@ include(cmake/Env.cmake)
if(OB_BUILD_OPENSOURCE)
project("OceanBase_CE"
VERSION 4.3.2.0
VERSION 4.3.3.0
DESCRIPTION "OceanBase distributed database system"
HOMEPAGE_URL "https://open.oceanbase.com/"
LANGUAGES CXX C ASM)
message(STATUS "open source build enabled")
else()
project(OceanBase
VERSION 4.3.2.0
VERSION 4.3.3.0
DESCRIPTION "OceanBase distributed database system"
HOMEPAGE_URL "https://www.oceanbase.com/"
LANGUAGES CXX C ASM)

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

@ -130,9 +130,10 @@ cal_version(const uint64_t major, const uint64_t minor, const uint64_t major_pat
#define CLUSTER_VERSION_4_3_0_1 (oceanbase::common::cal_version(4, 3, 0, 1))
#define CLUSTER_VERSION_4_3_1_0 (oceanbase::common::cal_version(4, 3, 1, 0))
#define CLUSTER_VERSION_4_3_2_0 (oceanbase::common::cal_version(4, 3, 2, 0))
#define CLUSTER_VERSION_4_3_3_0 (oceanbase::common::cal_version(4, 3, 3, 0))
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
//TODO: If you update the above version, please update CLUSTER_CURRENT_VERSION.
#define CLUSTER_CURRENT_VERSION CLUSTER_VERSION_4_3_2_0
#define CLUSTER_CURRENT_VERSION CLUSTER_VERSION_4_3_3_0
// ATTENSION !!!!!!!!!!!!!!!!!!!!!!!!!!!
// 1. After 4.0, each cluster_version is corresponed to a data version.
@ -161,7 +162,8 @@ cal_version(const uint64_t major, const uint64_t minor, const uint64_t major_pat
#define DATA_VERSION_4_3_0_1 (oceanbase::common::cal_version(4, 3, 0, 1))
#define DATA_VERSION_4_3_1_0 (oceanbase::common::cal_version(4, 3, 1, 0))
#define DATA_VERSION_4_3_2_0 (oceanbase::common::cal_version(4, 3, 2, 0))
#define DATA_CURRENT_VERSION DATA_VERSION_4_3_2_0
#define DATA_VERSION_4_3_3_0 (oceanbase::common::cal_version(4, 3, 3, 0))
#define DATA_CURRENT_VERSION DATA_VERSION_4_3_3_0
// ATTENSION !!!!!!!!!!!!!!!!!!!!!!!!!!!
// LAST_BARRIER_DATA_VERSION should be the latest barrier data version before DATA_CURRENT_VERSION
#define LAST_BARRIER_DATA_VERSION DATA_VERSION_4_2_1_0

2
rpm/oceanbase.spec
View File

@ -1,4 +1,4 @@
Name: %NAME
Version:4.3.2.0
Version:4.3.3.0
Release: %RELEASE
BuildRequires: binutils = 2.30

3
src/share/ob_upgrade_utils.cpp
View File

@ -56,6 +56,7 @@ const uint64_t ObUpgradeChecker::UPGRADE_PATH[] = {
CALC_VERSION(4UL, 3UL, 0UL, 1UL), // 4.3.0.1
CALC_VERSION(4UL, 3UL, 1UL, 0UL), // 4.3.1.0
CALC_VERSION(4UL, 3UL, 2UL, 0UL), // 4.3.2.0
CALC_VERSION(4UL, 3UL, 3UL, 0UL), // 4.3.3.0
};
int ObUpgradeChecker::get_data_version_by_cluster_version(
@ -86,6 +87,7 @@ int ObUpgradeChecker::get_data_version_by_cluster_version(
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_2_0, DATA_VERSION_4_3_2_0)
CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_3_3_0, DATA_VERSION_4_3_3_0)
#undef CONVERT_CLUSTER_VERSION_TO_DATA_VERSION
default: {
ret = OB_INVALID_ARGUMENT;
@ -663,6 +665,7 @@ int ObUpgradeProcesserSet::init(
INIT_PROCESSOR_BY_VERSION(4, 3, 0, 1);
INIT_PROCESSOR_BY_VERSION(4, 3, 1, 0);
INIT_PROCESSOR_BY_VERSION(4, 3, 2, 0);
INIT_PROCESSOR_BY_VERSION(4, 3, 3, 0);
#undef INIT_PROCESSOR_BY_VERSION
inited_ = true;
}

3
src/share/ob_upgrade_utils.h
View File

@ -174,7 +174,7 @@ public:
const uint64_t cluster_version,
uint64_t &data_version);
public:
static const int64_t DATA_VERSION_NUM = 17;
static const int64_t DATA_VERSION_NUM = 18;
static const uint64_t UPGRADE_PATH[];
};
@ -258,6 +258,7 @@ private:
int post_upgrade_for_spm();
};
DEF_SIMPLE_UPGRARD_PROCESSER(4, 3, 3, 0)
/* =========== special upgrade processor end ============= */
/* =========== upgrade processor end ============= */

4
src/share/parameter/ob_parameter_seed.ipp
View File

@ -570,9 +570,9 @@ DEF_TIME(tablet_meta_table_check_interval, OB_CLUSTER_PARAMETER, "30m", "[1m,)",
"the time interval that observer compares tablet meta table with local ls replica info "
"and make adjustments to ensure the correctness of tablet meta table. Range: [1m,+∞)",
ObParameterAttr(Section::ROOT_SERVICE, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
DEF_STR(min_observer_version, OB_CLUSTER_PARAMETER, "4.3.2.0", "the min observer version",
DEF_STR(min_observer_version, OB_CLUSTER_PARAMETER, "4.3.3.0", "the min observer version",
ObParameterAttr(Section::ROOT_SERVICE, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
DEF_VERSION(compatible, OB_TENANT_PARAMETER, "4.3.2.0", "compatible version for persisted data",
DEF_VERSION(compatible, OB_TENANT_PARAMETER, "4.3.3.0", "compatible version for persisted data",
ObParameterAttr(Section::ROOT_SERVICE, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
DEF_BOOL(enable_ddl, OB_CLUSTER_PARAMETER, "True", "specifies whether DDL operation is turned on. "
"Value: True:turned on; False: turned off",

2
test/.obcdc_conf
View File

@ -3,5 +3,5 @@ code_path=src/logservice/libobcdc/
output_path=src/logservice/libobcdc/
so_name=libobcdc.so
so_name_V=libobcdc.so.4
so_name_v=libobcdc.so.4.3.2.0
so_name_v=libobcdc.so.4.3.3.0
tailf_name=obcdc_tailf

4
tools/deploy/mysql_test/test_suite/inner_table/r/mysql/parameter_data_type.result
View File

@ -351,7 +351,7 @@ zone svr_type svr_ip svr_port name data_type value info section scope source edi
zone1 observer server_ip server_port major_freeze_duty_time MOMENT value info DAILY_MERGE TENANT DEFAULT DYNAMIC_EFFECTIVE 02:00 1
show parameters where svr_ip = host_ip() and svr_port = rpc_port() and name = 'compatible' tenant = sys;
zone svr_type svr_ip svr_port name data_type value info section scope source edit_level default_value isdefault
zone1 observer server_ip server_port compatible VERSION value info ROOT_SERVICE TENANT DEFAULT DYNAMIC_EFFECTIVE 4.3.2.0 1
zone1 observer server_ip server_port compatible VERSION value info ROOT_SERVICE TENANT DEFAULT DYNAMIC_EFFECTIVE 4.3.3.0 1
========================== case2: under mysql tenant ==========================
===================== [1] prevent data_type UNKNOWN ======================
show parameters where data_type = 'UNKNOWN';
@ -573,4 +573,4 @@ zone svr_type svr_ip svr_port name data_type value info section scope source edi
zone1 observer server_ip server_port major_freeze_duty_time MOMENT value info DAILY_MERGE TENANT DEFAULT DYNAMIC_EFFECTIVE 02:00 1
show parameters where svr_ip = host_ip() and svr_port = rpc_port() and name = 'compatible';
zone svr_type svr_ip svr_port name data_type value info section scope source edit_level default_value isdefault
zone1 observer server_ip server_port compatible VERSION value info ROOT_SERVICE TENANT DEFAULT DYNAMIC_EFFECTIVE 4.3.2.0 1
zone1 observer server_ip server_port compatible VERSION value info ROOT_SERVICE TENANT DEFAULT DYNAMIC_EFFECTIVE 4.3.3.0 1

4
tools/upgrade/actions.py
View File

@ -18,8 +18,8 @@ class SqlItem:
self.action_sql = action_sql
self.rollback_sql = rollback_sql
current_cluster_version = "4.3.2.0"
current_data_version = "4.3.2.0"
current_cluster_version = "4.3.3.0"
current_data_version = "4.3.3.0"
g_succ_sql_list = []
g_commit_sql_list = []

6
tools/upgrade/oceanbase_upgrade_dep.yml
View File

@ -80,4 +80,8 @@
can_be_upgraded_to:
- 4.3.2.0
- version: 4.3.2.0
- version: 4.3.2.0
can_be_upgraded_to:
- 4.3.3.0
- version: 4.3.3.0

4
tools/upgrade/upgrade_post.py
View File

@ -26,8 +26,8 @@
# self.action_sql = action_sql
# self.rollback_sql = rollback_sql
#
#current_cluster_version = "4.3.2.0"
#current_data_version = "4.3.2.0"
#current_cluster_version = "4.3.3.0"
#current_data_version = "4.3.3.0"
#g_succ_sql_list = []
#g_commit_sql_list = []
#

4
tools/upgrade/upgrade_pre.py
View File

@ -26,8 +26,8 @@
# self.action_sql = action_sql
# self.rollback_sql = rollback_sql
#
#current_cluster_version = "4.3.2.0"
#current_data_version = "4.3.2.0"
#current_cluster_version = "4.3.3.0"
#current_data_version = "4.3.3.0"
#g_succ_sql_list = []
#g_commit_sql_list = []
#