diff --git a/CMakeLists.txt b/CMakeLists.txt index 7eaa4f9a0..8969074af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,14 +5,14 @@ include(cmake/Env.cmake) if(OB_BUILD_OPENSOURCE) project("OceanBase_CE" - VERSION 4.3.5.0 + VERSION 4.3.5.1 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.5.0 + VERSION 4.3.5.1 DESCRIPTION "OceanBase distributed database system" HOMEPAGE_URL "https://www.oceanbase.com/" LANGUAGES CXX C ASM) diff --git a/deps/oblib/src/common/ob_version_def.h b/deps/oblib/src/common/ob_version_def.h index 05097c0c9..b8fa8e724 100644 --- a/deps/oblib/src/common/ob_version_def.h +++ b/deps/oblib/src/common/ob_version_def.h @@ -139,9 +139,10 @@ cal_version(const uint64_t major, const uint64_t minor, const uint64_t major_pat #define CLUSTER_VERSION_4_3_4_0 (oceanbase::common::cal_version(4, 3, 4, 0)) #define CLUSTER_VERSION_4_3_4_1 (oceanbase::common::cal_version(4, 3, 4, 1)) #define CLUSTER_VERSION_4_3_5_0 (oceanbase::common::cal_version(4, 3, 5, 0)) +#define CLUSTER_VERSION_4_3_5_1 (oceanbase::common::cal_version(4, 3, 5, 1)) //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! //TODO: If you update the above version, please update CLUSTER_CURRENT_VERSION. -#define CLUSTER_CURRENT_VERSION CLUSTER_VERSION_4_3_5_0 +#define CLUSTER_CURRENT_VERSION CLUSTER_VERSION_4_3_5_1 // ATTENSION !!!!!!!!!!!!!!!!!!!!!!!!!!! // 1. After 4.0, each cluster_version is corresponed to a data version. @@ -180,7 +181,8 @@ cal_version(const uint64_t major, const uint64_t minor, const uint64_t major_pat #define DATA_VERSION_4_3_4_0 (oceanbase::common::cal_version(4, 3, 4, 0)) #define DATA_VERSION_4_3_4_1 (oceanbase::common::cal_version(4, 3, 4, 1)) #define DATA_VERSION_4_3_5_0 (oceanbase::common::cal_version(4, 3, 5, 0)) -#define DATA_CURRENT_VERSION DATA_VERSION_4_3_5_0 +#define DATA_VERSION_4_3_5_1 (oceanbase::common::cal_version(4, 3, 5, 1)) +#define DATA_CURRENT_VERSION DATA_VERSION_4_3_5_1 // 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 diff --git a/rpm/oceanbase.spec b/rpm/oceanbase.spec index f63416395..d50555e7d 100644 --- a/rpm/oceanbase.spec +++ b/rpm/oceanbase.spec @@ -1,4 +1,4 @@ Name: %NAME -Version:4.3.5.0 +Version:4.3.5.1 Release: %RELEASE BuildRequires: binutils = 2.30 diff --git a/src/share/ob_upgrade_utils.cpp b/src/share/ob_upgrade_utils.cpp index bd2a1469d..6e3ce7b48 100755 --- a/src/share/ob_upgrade_utils.cpp +++ b/src/share/ob_upgrade_utils.cpp @@ -68,6 +68,7 @@ const uint64_t ObUpgradeChecker::UPGRADE_PATH[] = { CALC_VERSION(4UL, 3UL, 4UL, 0UL), // 4.3.4.0 CALC_VERSION(4UL, 3UL, 4UL, 1UL), // 4.3.4.1 CALC_VERSION(4UL, 3UL, 5UL, 0UL), // 4.3.5.0 + CALC_VERSION(4UL, 3UL, 5UL, 1UL), // 4.3.5.1 }; int ObUpgradeChecker::get_data_version_by_cluster_version( @@ -107,6 +108,7 @@ int ObUpgradeChecker::get_data_version_by_cluster_version( CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_3_4_0, DATA_VERSION_4_3_4_0) CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_3_4_1, DATA_VERSION_4_3_4_1) CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_3_5_0, DATA_VERSION_4_3_5_0) + CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_3_5_1, DATA_VERSION_4_3_5_1) #undef CONVERT_CLUSTER_VERSION_TO_DATA_VERSION default: { @@ -706,6 +708,7 @@ int ObUpgradeProcesserSet::init( INIT_PROCESSOR_BY_VERSION(4, 3, 4, 0); INIT_PROCESSOR_BY_VERSION(4, 3, 4, 1); INIT_PROCESSOR_BY_VERSION(4, 3, 5, 0); + INIT_PROCESSOR_BY_VERSION(4, 3, 5, 1); #undef INIT_PROCESSOR_BY_NAME_AND_VERSION #undef INIT_PROCESSOR_BY_VERSION diff --git a/src/share/ob_upgrade_utils.h b/src/share/ob_upgrade_utils.h index 67b7ce388..a84103281 100755 --- a/src/share/ob_upgrade_utils.h +++ b/src/share/ob_upgrade_utils.h @@ -176,7 +176,7 @@ public: const uint64_t cluster_version, uint64_t &data_version); public: - static const int64_t DATA_VERSION_NUM = 26; + static const int64_t DATA_VERSION_NUM = 27; static const uint64_t UPGRADE_PATH[]; }; @@ -316,6 +316,7 @@ private: int post_upgrade_for_optimizer_stats(); }; +DEF_SIMPLE_UPGRARD_PROCESSER(4, 3, 5, 1) /* =========== special upgrade processor end ============= */ /* =========== upgrade processor end ============= */ diff --git a/src/share/parameter/ob_parameter_seed.ipp b/src/share/parameter/ob_parameter_seed.ipp index 771554811..64a5f5aa9 100644 --- a/src/share/parameter/ob_parameter_seed.ipp +++ b/src/share/parameter/ob_parameter_seed.ipp @@ -614,9 +614,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.5.0", "the min observer version", +DEF_STR(min_observer_version, OB_CLUSTER_PARAMETER, "4.3.5.1", "the min observer version", ObParameterAttr(Section::ROOT_SERVICE, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE)); -DEF_VERSION(compatible, OB_TENANT_PARAMETER, "4.3.5.0", "compatible version for persisted data", +DEF_VERSION(compatible, OB_TENANT_PARAMETER, "4.3.5.1", "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", diff --git a/test/.obcdc_conf b/test/.obcdc_conf index 8879f2f10..689653f8d 100644 --- a/test/.obcdc_conf +++ b/test/.obcdc_conf @@ -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.5.0 +so_name_v=libobcdc.so.4.3.5.1 tailf_name=obcdc_tailf diff --git a/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/parameter_data_type.result b/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/parameter_data_type.result index 3fddeee11..34734675f 100644 --- a/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/parameter_data_type.result +++ b/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/parameter_data_type.result @@ -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.5.0 1 +zone1 observer server_ip server_port compatible VERSION value info ROOT_SERVICE TENANT DEFAULT DYNAMIC_EFFECTIVE 4.3.5.1 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.5.0 1 +zone1 observer server_ip server_port compatible VERSION value info ROOT_SERVICE TENANT DEFAULT DYNAMIC_EFFECTIVE 4.3.5.1 1 diff --git a/tools/upgrade/actions.py b/tools/upgrade/actions.py index 39d301ea7..c87fb6add 100755 --- a/tools/upgrade/actions.py +++ b/tools/upgrade/actions.py @@ -18,8 +18,8 @@ class SqlItem: self.action_sql = action_sql self.rollback_sql = rollback_sql -current_cluster_version = "4.3.5.0" -current_data_version = "4.3.5.0" +current_cluster_version = "4.3.5.1" +current_data_version = "4.3.5.1" g_succ_sql_list = [] g_commit_sql_list = [] diff --git a/tools/upgrade/oceanbase_upgrade_dep.yml b/tools/upgrade/oceanbase_upgrade_dep.yml index c9c7663bb..f9bbe8585 100644 --- a/tools/upgrade/oceanbase_upgrade_dep.yml +++ b/tools/upgrade/oceanbase_upgrade_dep.yml @@ -104,4 +104,8 @@ can_be_upgraded_to: - 4.3.5.0 -- version: 4.3.5.0 \ No newline at end of file +- version: 4.3.5.0 + can_be_upgraded_to: + - 4.3.5.1 + +- version: 4.3.5.1 \ No newline at end of file diff --git a/tools/upgrade/upgrade_post.py b/tools/upgrade/upgrade_post.py index d8d805a3e..700452143 100755 --- a/tools/upgrade/upgrade_post.py +++ b/tools/upgrade/upgrade_post.py @@ -26,8 +26,8 @@ # self.action_sql = action_sql # self.rollback_sql = rollback_sql # -#current_cluster_version = "4.3.5.0" -#current_data_version = "4.3.5.0" +#current_cluster_version = "4.3.5.1" +#current_data_version = "4.3.5.1" #g_succ_sql_list = [] #g_commit_sql_list = [] # diff --git a/tools/upgrade/upgrade_pre.py b/tools/upgrade/upgrade_pre.py index a3b5890c0..f752e3ab5 100755 --- a/tools/upgrade/upgrade_pre.py +++ b/tools/upgrade/upgrade_pre.py @@ -26,8 +26,8 @@ # self.action_sql = action_sql # self.rollback_sql = rollback_sql # -#current_cluster_version = "4.3.5.0" -#current_data_version = "4.3.5.0" +#current_cluster_version = "4.3.5.1" +#current_data_version = "4.3.5.1" #g_succ_sql_list = [] #g_commit_sql_list = [] #