From 2fa51abb579e2ba3b78468eaef3dcff9386dc554 Mon Sep 17 00:00:00 2001 From: obdev Date: Thu, 5 Dec 2024 15:48:47 +0000 Subject: [PATCH] Occupy 4.3.4.1 on master --- deps/oblib/src/common/ob_version_def.h | 2 ++ src/objit/src/ob_llvm_di_helper.cpp | 18 +++++++++--------- src/share/ob_upgrade_utils.cpp | 3 +++ src/share/ob_upgrade_utils.h | 4 +++- tools/upgrade/oceanbase_upgrade_dep.yml | 4 ++++ 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/deps/oblib/src/common/ob_version_def.h b/deps/oblib/src/common/ob_version_def.h index 4bd8ec87ac..8992cb92e8 100644 --- a/deps/oblib/src/common/ob_version_def.h +++ b/deps/oblib/src/common/ob_version_def.h @@ -136,6 +136,7 @@ cal_version(const uint64_t major, const uint64_t minor, const uint64_t major_pat #define CLUSTER_VERSION_4_3_3_0 (oceanbase::common::cal_version(4, 3, 3, 0)) #define CLUSTER_VERSION_4_3_3_1 (oceanbase::common::cal_version(4, 3, 3, 1)) #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)) //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! //TODO: If you update the above version, please update CLUSTER_CURRENT_VERSION. @@ -175,6 +176,7 @@ cal_version(const uint64_t major, const uint64_t minor, const uint64_t major_pat #define DATA_VERSION_4_3_3_0 (oceanbase::common::cal_version(4, 3, 3, 0)) #define DATA_VERSION_4_3_3_1 (oceanbase::common::cal_version(4, 3, 3, 1)) #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 // ATTENSION !!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/src/objit/src/ob_llvm_di_helper.cpp b/src/objit/src/ob_llvm_di_helper.cpp index 0e3178437e..941183f388 100644 --- a/src/objit/src/ob_llvm_di_helper.cpp +++ b/src/objit/src/ob_llvm_di_helper.cpp @@ -94,16 +94,16 @@ int ObLLVMDIHelper::create_file() return ret; } -int ObLLVMDIHelper::create_file(const char *name, const char *path) -{ - int ret = OB_SUCCESS; +int ObLLVMDIHelper::create_file(const char *name, const char *path) +{ + int ret = OB_SUCCESS; DIFile *file = NULL; if (OB_ISNULL(jc_)) { ret = OB_NOT_INIT; LOG_WARN("jc is NULL", K(ret)); - } else if (OB_ISNULL(file = jc_->dbuilder_.createFile(name, path))) { - ret = OB_ERR_UNEXPECTED; - LOG_WARN("failed to create file", K(ret)); + } else if (OB_ISNULL(file = jc_->dbuilder_.createFile(name, path))) { + ret = OB_ERR_UNEXPECTED; + LOG_WARN("failed to create file", K(ret)); } else { jc_->file_ = file; } @@ -281,9 +281,9 @@ int ObLLVMDIHelper::create_member_type(const ObString &name, uint64_t offset_bit size_bits, align_bits, offset_bits, - llvm::DINode::FlagZero, - base_type.get_v()))) { - ret = OB_ERR_UNEXPECTED; + llvm::DINode::FlagZero, + base_type.get_v()))) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("failed to create member type", K(ret), K(name), K(jc_), K(file), K(scope), K(line)); } else { diff --git a/src/share/ob_upgrade_utils.cpp b/src/share/ob_upgrade_utils.cpp index 7aba7aff07..003a9f9994 100755 --- a/src/share/ob_upgrade_utils.cpp +++ b/src/share/ob_upgrade_utils.cpp @@ -65,6 +65,7 @@ const uint64_t ObUpgradeChecker::UPGRADE_PATH[] = { CALC_VERSION(4UL, 3UL, 3UL, 0UL), // 4.3.3.0 CALC_VERSION(4UL, 3UL, 3UL, 1UL), // 4.3.3.1 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 }; @@ -102,6 +103,7 @@ int ObUpgradeChecker::get_data_version_by_cluster_version( CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_3_3_0, DATA_VERSION_4_3_3_0) CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_3_3_1, DATA_VERSION_4_3_3_1) 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) #undef CONVERT_CLUSTER_VERSION_TO_DATA_VERSION @@ -699,6 +701,7 @@ int ObUpgradeProcesserSet::init( INIT_PROCESSOR_BY_VERSION(4, 3, 3, 0); INIT_PROCESSOR_BY_VERSION(4, 3, 3, 1); INIT_PROCESSOR_BY_VERSION(4, 3, 4, 0); + INIT_PROCESSOR_BY_VERSION(4, 3, 4, 1); INIT_PROCESSOR_BY_VERSION(4, 3, 5, 0); #undef INIT_PROCESSOR_BY_NAME_AND_VERSION diff --git a/src/share/ob_upgrade_utils.h b/src/share/ob_upgrade_utils.h index b17ba0ddba..7f30f49288 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 = 24; + static const int64_t DATA_VERSION_NUM = 25; static const uint64_t UPGRADE_PATH[]; }; @@ -301,6 +301,8 @@ private: int post_upgrade_for_persitent_routine(); }; +DEF_SIMPLE_UPGRARD_PROCESSER(4, 3, 4, 1) + class ObUpgradeFor4350Processor : public ObBaseUpgradeProcessor { public: diff --git a/tools/upgrade/oceanbase_upgrade_dep.yml b/tools/upgrade/oceanbase_upgrade_dep.yml index 794f89b298..c9c7663bb3 100644 --- a/tools/upgrade/oceanbase_upgrade_dep.yml +++ b/tools/upgrade/oceanbase_upgrade_dep.yml @@ -97,6 +97,10 @@ - 4.3.4.0 - version: 4.3.4.0 + can_be_upgraded_to: + - 4.3.4.1 + +- version: 4.3.4.1 can_be_upgraded_to: - 4.3.5.0