CMakeLists.txt

@@ -5,14 +5,14 @@ include(cmake/Env.cmake)
 
 if(OB_BUILD_OPENSOURCE)
   project("OceanBase_CE"
-    VERSION 4.2.1.5
+    VERSION 4.2.1.6
     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.2.1.5
+    VERSION 4.2.1.6
     DESCRIPTION "OceanBase distributed database system"
     HOMEPAGE_URL "https://www.oceanbase.com/"
     LANGUAGES CXX C ASM)

rpm/oceanbase.spec

 Name: %NAME
-Version:4.2.1.5
+Version:4.2.1.6
 Release: %RELEASE
 BuildRequires: binutils = 2.30

src/share/inner_table/ob_inner_table_schema.25001_25050.cpp

@@ -1710,7 +1710,7 @@ int ObInnerTableSchema::all_col_comments_schema(ObTableSchema &table_schema)
   table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
 
   if (OB_SUCC(ret)) {
-    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       A.DATABASE_NAME AS OWNER,       CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME,       C.COLUMN_NAME AS COLUMN_NAME,       CAST(C."COMMENT" AS VARCHAR(4000)) AS COMMENTS     FROM     SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT A,       SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B,       SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C     WHERE       A.DATABASE_ID = B.DATABASE_ID       AND B.TABLE_ID = C.TABLE_ID       AND A.TENANT_ID = EFFECTIVE_TENANT_ID()       AND B.TENANT_ID = EFFECTIVE_TENANT_ID()       AND C.TENANT_ID = EFFECTIVE_TENANT_ID()       AND (A.DATABASE_ID = USERENV('SCHEMAID')            OR USER_CAN_ACCESS_OBJ(1, B.TABLE_ID, B.DATABASE_ID) = 1)       AND B.TABLE_TYPE != 12 AND B.TABLE_TYPE != 13       AND BITAND((B.TABLE_MODE / 4096), 15) IN (0,1)        AND BITAND(B.INDEX_ATTRIBUTES_SET, 16) = 0 )__"))) {
+    if (OB_FAIL(table_schema.set_view_definition(R"__(     SELECT       A.DATABASE_NAME AS OWNER,       CAST(B.TABLE_NAME AS VARCHAR2(128)) AS TABLE_NAME,       C.COLUMN_NAME AS COLUMN_NAME,       CAST(C."COMMENT" AS VARCHAR(4000)) AS COMMENTS     FROM     SYS.ALL_VIRTUAL_DATABASE_REAL_AGENT A,       SYS.ALL_VIRTUAL_TABLE_REAL_AGENT B,       SYS.ALL_VIRTUAL_COLUMN_REAL_AGENT C     WHERE       A.DATABASE_ID = B.DATABASE_ID       AND B.TABLE_ID = C.TABLE_ID       AND A.TENANT_ID = EFFECTIVE_TENANT_ID()       AND B.TENANT_ID = EFFECTIVE_TENANT_ID()       AND C.TENANT_ID = EFFECTIVE_TENANT_ID()       AND (A.DATABASE_ID = USERENV('SCHEMAID')            OR USER_CAN_ACCESS_OBJ(1, B.TABLE_ID, B.DATABASE_ID) = 1)       AND B.TABLE_TYPE != 12 AND B.TABLE_TYPE != 13       AND BITAND((B.TABLE_MODE / 4096), 15) IN (0,1)        AND BITAND(B.INDEX_ATTRIBUTES_SET, 16) = 0       AND BITAND(C.COLUMN_FLAGS, 2097152) = 0 )__"))) {
       LOG_ERROR("fail to set view_definition", K(ret));
     }
   }

src/share/inner_table/ob_inner_table_schema_def.py

@@ -34576,6 +34576,7 @@ def_table_schema(
       AND B.TABLE_TYPE != 12 AND B.TABLE_TYPE != 13
       AND BITAND((B.TABLE_MODE / 4096), 15) IN (0,1)
       AND BITAND(B.INDEX_ATTRIBUTES_SET, 16) = 0
+      AND BITAND(C.COLUMN_FLAGS, 2097152) = 0
 """.replace("\n", " ")
 )
 

src/share/ob_cluster_version.h

@@ -175,11 +175,12 @@ cal_version(const uint64_t major, const uint64_t minor, const uint64_t major_pat
 #define CLUSTER_VERSION_4_2_1_3 (oceanbase::common::cal_version(4, 2, 1, 3))
 #define CLUSTER_VERSION_4_2_1_4 (oceanbase::common::cal_version(4, 2, 1, 4))
 #define CLUSTER_VERSION_4_2_1_5 (oceanbase::common::cal_version(4, 2, 1, 5))
+#define CLUSTER_VERSION_4_2_1_6 (oceanbase::common::cal_version(4, 2, 1, 6))
 
 #define CLUSTER_VERSION_4_2_2_0 (oceanbase::common::cal_version(4, 2, 2, 0))
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 //TODO: If you update the above version, please update CLUSTER_CURRENT_VERSION.
-#define CLUSTER_CURRENT_VERSION CLUSTER_VERSION_4_2_1_5
+#define CLUSTER_CURRENT_VERSION CLUSTER_VERSION_4_2_1_6
 #define GET_MIN_CLUSTER_VERSION() (oceanbase::common::ObClusterVersion::get_instance().get_cluster_version())
 
 #define IS_CLUSTER_VERSION_BEFORE_4_1_0_0 (oceanbase::common::ObClusterVersion::get_instance().get_cluster_version() < CLUSTER_VERSION_4_1_0_0)
@@ -199,8 +200,9 @@ cal_version(const uint64_t major, const uint64_t minor, const uint64_t major_pat
 #define DATA_VERSION_4_2_1_3 (oceanbase::common::cal_version(4, 2, 1, 3))
 #define DATA_VERSION_4_2_1_4 (oceanbase::common::cal_version(4, 2, 1, 4))
 #define DATA_VERSION_4_2_1_5 (oceanbase::common::cal_version(4, 2, 1, 5))
+#define DATA_VERSION_4_2_1_6 (oceanbase::common::cal_version(4, 2, 1, 6))
 
-#define DATA_CURRENT_VERSION DATA_VERSION_4_2_1_5
+#define DATA_CURRENT_VERSION DATA_VERSION_4_2_1_6
 // ATTENSION !!!!!!!!!!!!!!!!!!!!!!!!!!!
 // LAST_BARRIER_DATA_VERSION should be the latest barrier data version before DATA_CURRENT_VERSION
 #define LAST_BARRIER_DATA_VERSION DATA_VERSION_4_1_0_0

src/share/ob_upgrade_utils.cpp

@@ -49,6 +49,7 @@ const uint64_t ObUpgradeChecker::UPGRADE_PATH[DATA_VERSION_NUM] = {
   CALC_VERSION(4UL, 2UL, 1UL, 3UL),  // 4.2.1.3
   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
 };
 
 int ObUpgradeChecker::get_data_version_by_cluster_version(
@@ -73,6 +74,7 @@ int ObUpgradeChecker::get_data_version_by_cluster_version(
     CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_2_1_3, DATA_VERSION_4_2_1_3)
     CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_2_1_4, DATA_VERSION_4_2_1_4)
     CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_2_1_5, DATA_VERSION_4_2_1_5)
+    CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_2_1_6, DATA_VERSION_4_2_1_6)
 #undef CONVERT_CLUSTER_VERSION_TO_DATA_VERSION
     default: {
       ret = OB_INVALID_ARGUMENT;
@@ -636,6 +638,7 @@ int ObUpgradeProcesserSet::init(
     INIT_PROCESSOR_BY_VERSION(4, 2, 1, 3);
     INIT_PROCESSOR_BY_VERSION(4, 2, 1, 4);
     INIT_PROCESSOR_BY_VERSION(4, 2, 1, 5);
+    INIT_PROCESSOR_BY_VERSION(4, 2, 1, 6);
 #undef INIT_PROCESSOR_BY_VERSION
     inited_ = true;
   }

src/share/ob_upgrade_utils.h

@@ -170,7 +170,7 @@ public:
              const uint64_t cluster_version,
              uint64_t &data_version);
 public:
-  static const int64_t DATA_VERSION_NUM = 11;
+  static const int64_t DATA_VERSION_NUM = 12;
   static const uint64_t UPGRADE_PATH[DATA_VERSION_NUM];
 };
 
@@ -225,6 +225,7 @@ DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 1, 2)
 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)
 /* =========== special upgrade processor end   ============= */
 
 /* =========== upgrade processor end ============= */

src/share/parameter/ob_parameter_seed.ipp

@@ -491,9 +491,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.2.1.5", "the min observer version",
+DEF_STR(min_observer_version, OB_CLUSTER_PARAMETER, "4.2.1.6", "the min observer version",
         ObParameterAttr(Section::ROOT_SERVICE, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
-DEF_VERSION(compatible, OB_TENANT_PARAMETER, "4.2.1.5", "compatible version for persisted data",
+DEF_VERSION(compatible, OB_TENANT_PARAMETER, "4.2.1.6", "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",

tools/upgrade/actions.py

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

tools/upgrade/oceanbase_upgrade_dep.yml

@@ -78,6 +78,10 @@
       - 4.2.1.5
 
 - version: 4.2.1.5
+  can_be_upgraded_to:
+      - 4.2.1.6
+
+- version: 4.2.1.6
   require_from_binary:
     value: True
     when_come_from: [4.1.0.0, 4.1.0.1, 4.1.0.2, 4.2.0.0]

tools/upgrade/upgrade_post.py

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

tools/upgrade/upgrade_pre.py

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