Occupy Cluster version 4.2.1.7

src/share/ob_cluster_version.h

@@ -178,6 +178,7 @@ cal_version(const uint64_t major, const uint64_t minor, const uint64_t major_pat
 #define MOCK_CLUSTER_VERSION_4_2_1_4 (oceanbase::common::cal_version(4, 2, 1, 4))
 #define MOCK_CLUSTER_VERSION_4_2_1_5 (oceanbase::common::cal_version(4, 2, 1, 5))
 #define MOCK_CLUSTER_VERSION_4_2_1_6 (oceanbase::common::cal_version(4, 2, 1, 6))
+#define MOCK_CLUSTER_VERSION_4_2_1_7 (oceanbase::common::cal_version(4, 2, 1, 7))
 #define CLUSTER_VERSION_4_2_2_0 (oceanbase::common::cal_version(4, 2, 2, 0))
 #define CLUSTER_VERSION_4_2_2_1 (oceanbase::common::cal_version(4, 2, 2, 1))
 #define CLUSTER_VERSION_4_2_3_0 (oceanbase::common::cal_version(4, 2, 3, 0))
@@ -210,6 +211,7 @@ cal_version(const uint64_t major, const uint64_t minor, const uint64_t major_pat
 #define MOCK_DATA_VERSION_4_2_1_4 (oceanbase::common::cal_version(4, 2, 1, 4))
 #define MOCK_DATA_VERSION_4_2_1_5 (oceanbase::common::cal_version(4, 2, 1, 5))
 #define MOCK_DATA_VERSION_4_2_1_6 (oceanbase::common::cal_version(4, 2, 1, 6))
+#define MOCK_DATA_VERSION_4_2_1_7 (oceanbase::common::cal_version(4, 2, 1, 7))
 #define DATA_VERSION_4_2_2_0 (oceanbase::common::cal_version(4, 2, 2, 0))
 #define DATA_VERSION_4_2_2_1 (oceanbase::common::cal_version(4, 2, 2, 1))
 #define DATA_VERSION_4_2_3_0 (oceanbase::common::cal_version(4, 2, 3, 0))

src/share/ob_upgrade_utils.cpp

@@ -50,6 +50,7 @@ const uint64_t ObUpgradeChecker::UPGRADE_PATH[] = {
   CALC_VERSION(4UL, 2UL, 1UL, 4UL),  // 4.2.1.4
   CALC_VERSION(4UL, 2UL, 1UL, 5UL),  // 4.2.1.5
   CALC_VERSION(4UL, 2UL, 1UL, 6UL),  // 4.2.1.6
+  CALC_VERSION(4UL, 2UL, 1UL, 7UL),  // 4.2.1.7
   CALC_VERSION(4UL, 2UL, 2UL, 0UL),  // 4.2.2.0
   CALC_VERSION(4UL, 2UL, 2UL, 1UL),  // 4.2.2.1
   CALC_VERSION(4UL, 2UL, 3UL, 0UL),   // 4.2.3.0
@@ -79,6 +80,7 @@ int ObUpgradeChecker::get_data_version_by_cluster_version(
     CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(MOCK_CLUSTER_VERSION_4_2_1_4, MOCK_DATA_VERSION_4_2_1_4)
     CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(MOCK_CLUSTER_VERSION_4_2_1_5, MOCK_DATA_VERSION_4_2_1_5)
     CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(MOCK_CLUSTER_VERSION_4_2_1_6, MOCK_DATA_VERSION_4_2_1_6)
+    CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(MOCK_CLUSTER_VERSION_4_2_1_7, MOCK_DATA_VERSION_4_2_1_7)
     CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_2_2_0, DATA_VERSION_4_2_2_0)
     CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_2_2_1, DATA_VERSION_4_2_2_1)
     CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_2_3_0, DATA_VERSION_4_2_3_0)
@@ -656,6 +658,7 @@ int ObUpgradeProcesserSet::init(
     INIT_PROCESSOR_BY_VERSION(4, 2, 1, 4);
     INIT_PROCESSOR_BY_VERSION(4, 2, 1, 5);
     INIT_PROCESSOR_BY_VERSION(4, 2, 1, 6);
+    INIT_PROCESSOR_BY_VERSION(4, 2, 1, 7);
     INIT_PROCESSOR_BY_VERSION(4, 2, 2, 0);
     INIT_PROCESSOR_BY_VERSION(4, 2, 2, 1);
     INIT_PROCESSOR_BY_VERSION(4, 2, 3, 0);

src/share/ob_upgrade_utils.h

@@ -174,7 +174,7 @@ public:
              const uint64_t cluster_version,
              uint64_t &data_version);
 public:
-  static const int64_t DATA_VERSION_NUM = 16;
+  static const int64_t DATA_VERSION_NUM = 17;
   static const uint64_t UPGRADE_PATH[];
 };
 
@@ -229,6 +229,7 @@ DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 1, 3)
 DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 1, 4)
 DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 1, 5)
 DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 1, 6)
+DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 1, 7)
 
 class ObUpgradeFor4220Processor : public ObBaseUpgradeProcessor
 {