add place holder to master

src/observer/virtual_table/ob_all_virtual_table_mgr.cpp

@@ -314,6 +314,10 @@ int ObAllVirtualTableMgr::process_curr_tenant(common::ObNewRow *&row)
           cur_row_.cells_[i].set_int(data_checksum);
           break;
         }
+        case TABLE_FLAG:
+          // TODO(yanfeng): only for place holder purpose, need change when auto_split branch merge
+          cur_row_.cells_[i].set_int(0);
+          break;
         default:
           ret = OB_ERR_UNEXPECTED;
           SERVER_LOG(WARN, "invalid col_id", K(ret), K(col_id));

src/observer/virtual_table/ob_all_virtual_table_mgr.h

@@ -56,7 +56,8 @@ class ObAllVirtualTableMgr : public common::ObVirtualTableScannerIterator,
     NESTED_OFFSET,
     NESTED_SIZE,
     CG_IDX,
-    DATA_CHECKSUM
+    DATA_CHECKSUM,
+    TABLE_FLAG
   };
 public:
   ObAllVirtualTableMgr();

src/share/inner_table/ob_inner_table_schema.12001_12050.cpp

@@ -2977,6 +2977,21 @@ int ObInnerTableSchema::all_virtual_table_mgr_schema(ObTableSchema &table_schema
       false, //is_nullable
       false); //is_autoincrement
   }
+
+  if (OB_SUCC(ret)) {
+    ADD_COLUMN_SCHEMA("table_flag", //column_name
+      ++column_id, //column_id
+      0, //rowkey_id
+      0, //index_id
+      0, //part_key_pos
+      ObIntType, //column_type
+      CS_TYPE_INVALID, //column_collation_type
+      sizeof(int64_t), //column_length
+      -1, //column_precision
+      -1, //column_scale
+      false, //is_nullable
+      false); //is_autoincrement
+  }
   if (OB_SUCC(ret)) {
     table_schema.get_part_option().set_part_num(1);
     table_schema.set_part_level(PARTITION_LEVEL_ONE);

src/share/inner_table/ob_inner_table_schema.15051_15100.cpp

@@ -3447,6 +3447,21 @@ int ObInnerTableSchema::all_virtual_table_mgr_ora_schema(ObTableSchema &table_sc
       false, //is_nullable
       false); //is_autoincrement
   }
+
+  if (OB_SUCC(ret)) {
+    ADD_COLUMN_SCHEMA("TABLE_FLAG", //column_name
+      ++column_id, //column_id
+      0, //rowkey_id
+      0, //index_id
+      0, //part_key_pos
+      ObNumberType, //column_type
+      CS_TYPE_INVALID, //column_collation_type
+      38, //column_length
+      38, //column_precision
+      0, //column_scale
+      false, //is_nullable
+      false); //is_autoincrement
+  }
   if (OB_SUCC(ret)) {
     table_schema.get_part_option().set_part_num(1);
     table_schema.set_part_level(PARTITION_LEVEL_ONE);

src/share/inner_table/ob_inner_table_schema_def.py

@@ -9964,6 +9964,7 @@ def_table_schema(
       ('nested_size', 'int'),
       ('cg_idx', 'int'),
       ('data_checksum', 'int'),
+      ('table_flag', 'int'),
     ],
   partition_columns = ['svr_ip', 'svr_port'],
   vtable_route_policy = 'distributed',

src/storage/backup/ob_backup_data_struct.h

@@ -78,7 +78,9 @@ enum ObBackupBlockType {
   BACKUP_BLOCK_MARCO_RANGE_INDEX = 4,
   BACKUP_BLOCK_MARCO_RANGE_INDEX_INDEX = 5,
   BACKUP_BLOCK_META_INDEX_INDEX = 6,
-  BACKUP_BLOCK_MAX = 6,
+  BACKUP_BLOCK_MACRO_BLOCK_INDEX = 7,
+  BACKUP_BLOCK_MACRO_BLOCK_INDEX_INDEX = 8,
+  BACKUP_BLOCK_MAX,
 };
 
 enum ObBackupRestoreMode {
@@ -140,6 +142,7 @@ enum ObBackupFileType {
   BACKUP_MACRO_RANGE_INDEX_FILE = 1,
   BACKUP_META_INDEX_FILE = 2,
   BACKUP_SEC_META_INDEX_FILE = 3,
+  BACKUP_MACRO_BLOCK_INDEX_FILE = 4,
   BACKUP_FILE_TYPE_MAX,
 };
 
@@ -147,6 +150,7 @@ enum ObBackupFileMagic {
   BACKUP_DATA_FILE_MAGIC = 0x0F0F,
   BACKUP_MACRO_RANGE_INDEX_FILE_MAGIC = 0x1F1F,
   BACKUP_META_INDEX_FILE_MAGIC = 0x2F2F,
+  BACKUP_MACRO_BLOCK_INDEX_FILE_MAGIC = 0x3F3F,
   BACKUP_MAGIC_MAX = 0xFFFF,
 };
 

src/storage/blocksstable/ob_macro_block_id.h

@@ -22,6 +22,7 @@ namespace blocksstable
 enum class ObMacroBlockIdMode : uint8_t
 {
   ID_MODE_LOCAL = 0,
+  ID_MODE_BACKUP = 1,
   ID_MODE_MAX,
 };
 

tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_virtual_table_in_mysql.result

@@ -1637,6 +1637,7 @@ nested_offset	bigint(20)	NO		NULL
 nested_size	bigint(20)	NO		NULL	
 cg_idx	bigint(20)	NO		NULL	
 data_checksum	bigint(20)	NO		NULL	
+table_flag	bigint(20)	NO		NULL	
 select /*+QUERY_TIMEOUT(60000000)*/ IF(count(*) >= 0, 1, 0) from oceanbase.__all_virtual_table_mgr;
 IF(count(*) >= 0, 1, 0)
 1

tools/deploy/mysql_test/test_suite/inner_table/r/mysql/desc_virtual_table_in_sys.result

@@ -2185,6 +2185,7 @@ nested_offset	bigint(20)	NO		NULL
 nested_size	bigint(20)	NO		NULL	
 cg_idx	bigint(20)	NO		NULL	
 data_checksum	bigint(20)	NO		NULL	
+table_flag	bigint(20)	NO		NULL	
 select /*+QUERY_TIMEOUT(60000000)*/ IF(count(*) >= 0, 1, 0) from oceanbase.__all_virtual_table_mgr;
 IF(count(*) >= 0, 1, 0)
 1