placeholder for inner_table

src/rootserver/freeze/ob_major_merge_progress_util.cpp

@@ -67,11 +67,10 @@ int64_t ObMergeProgress::to_string(char *buf, const int64_t buf_len) const
   if (OB_ISNULL(buf) || buf_len <= 0) {
   } else {
     J_OBJ_START();
-    const bool merge_finish = is_merge_finished();
-    if (merge_finish) {
-      J_KV(K(merge_finish), K_(total_table_cnt));
+    if (merge_finish_) {
+      J_KV(K_(merge_finish), K_(total_table_cnt));
     } else {
-      J_KV(KP(this), K(merge_finish), K_(unmerged_tablet_cnt), K_(merged_tablet_cnt), K_(total_table_cnt));
+      J_KV(KP(this), K_(merge_finish), K_(unmerged_tablet_cnt), K_(merged_tablet_cnt), K_(total_table_cnt));
       for (int64_t i = 0; i < RECORD_TABLE_TYPE_CNT; ++i) {
         J_COMMA();
         J_KV(ObTableCompactionInfo::TableStatusStr[i], table_cnt_[i]);

src/rootserver/freeze/ob_major_merge_progress_util.h

@@ -95,13 +95,15 @@ public:
     : unmerged_tablet_cnt_(0),
       merged_tablet_cnt_(0),
       total_table_cnt_(0),
-      table_cnt_()
+      table_cnt_(),
+      merge_finish_(false)
   {
     MEMSET(table_cnt_, 0, sizeof(int64_t) * RECORD_TABLE_TYPE_CNT);
   }
   ~ObMergeProgress() {}
   void reset()
   {
+    merge_finish_ = false;
     unmerged_tablet_cnt_ = 0;
     merged_tablet_cnt_ = 0;
     total_table_cnt_ = 0;
@@ -109,7 +111,7 @@ public:
   }
   bool is_merge_finished() const
   {
-    return total_table_cnt_ > 0
+    return total_table_cnt_ > 0 && merge_finish_
     && (total_table_cnt_ == get_finish_verified_table_cnt());
   }
   bool exist_uncompacted_table() const
@@ -118,8 +120,8 @@ public:
   }
   bool is_merge_abnomal() const
   {
-    return total_table_cnt_ > 0
-    && (total_table_cnt_ < get_finish_verified_table_cnt());
+    return total_table_cnt_ > 0 && merge_finish_
+    && (total_table_cnt_ != get_finish_verified_table_cnt());
   }
   bool only_remain_special_table_to_verified() const
   {
@@ -138,6 +140,7 @@ public:
   void deal_with_special_tablet()
   {
     ++table_cnt_[ObTableCompactionInfo::VERIFIED];
+    merge_finish_ = true;
   }
   void clear_before_each_loop()
   {
@@ -160,6 +163,7 @@ public:
   int64_t merged_tablet_cnt_;
   int64_t total_table_cnt_;
   int64_t table_cnt_[RECORD_TABLE_TYPE_CNT];
+  bool merge_finish_;
 };
 
 struct ObUnfinishTableIds

src/share/inner_table/ob_inner_table_schema_def.py

@@ -6856,6 +6856,9 @@ all_tenant_snapshot_ls_replica_history_def = dict(
 def_table_schema(**all_tenant_snapshot_ls_replica_history_def)
 #
 # 508 : __all_ls_replica_task_history
+# 509 : __all_ls_compaction_status
+# 510 : __all_tablet_compaction_status
+# 511 : __all_tablet_checksum_error_info
 #
 # 余留位置（此行之前占位）
 # 本区域占位建议：采用真实表名进行占位
@@ -13635,6 +13638,9 @@ def_table_schema(**gen_iterate_private_virtual_table_def(
 # 12467: __all_virtual_ls_replica_task_history
 # 12468: __all_virtual_session_ps_info
 # 12469: __all_virtual_tracepoint_info
+# 12470: __all_virtual_ls_compaction_status
+# 12471: __all_virtual_tablet_compaction_status
+# 12472: __all_virtual_tablet_checksum_error_info
 #
 # 余留位置（此行之前占位）
 # 本区域占位建议：采用真实表名进行占位