Restore fork source tablet handles in table iterator

Co-authored-by: fkuner <784819644@qq.com>

Author: 2 people

src/storage/meta_mem/ob_tablet_handle.cpp

@@ -252,6 +252,8 @@ int ObTabletTableIterator::assign(const ObTabletTableIterator& other)
       LOG_WARN("failed to build fork ctx", K(ret));
     } else if (OB_FAIL(fork_ctx_->fork_infos_.assign(other.fork_ctx_->fork_infos_))) {
       LOG_WARN("failed to assign fork infos", K(ret));
+    } else if (OB_FAIL(fork_ctx_->fork_tablet_handles_.assign(other.fork_ctx_->fork_tablet_handles_))) {
+      LOG_WARN("failed to assign fork tablet handles", K(ret));
     }
   }
   return ret;
@@ -314,8 +316,9 @@ int ObTabletTableIterator::add_fork_tablet_handle(const ObTabletHandle &tablet_h
     LOG_WARN("failed to build fork tablet ctx", K(ret));
   } else if (OB_FAIL(fork_ctx_->fork_infos_.push_back(fork_info))) {
     LOG_WARN("failed to push back", K(ret));
+  } else if (OB_FAIL(fork_ctx_->fork_tablet_handles_.push_back(tablet_handle))) {
+    LOG_WARN("failed to push back fork tablet handle", K(ret));
   }
-  UNUSED(tablet_handle);
   return ret;
 }
 

src/storage/meta_mem/ob_tablet_handle.h

@@ -79,16 +79,19 @@ class ObTabletTableIterator final
   friend class ObLSTabletService;
   typedef ObSEArray<ObTabletHandle, 1> SplitExtraTabletHandleArray;
   typedef ObSEArray<share::ObForkTabletInfo, 1> ForkTabletInfoArray;
+  typedef ObSEArray<ObTabletHandle, 1> ForkTabletHandleArray;
   struct ForkCtx final
   {
-    ForkCtx() : fork_infos_() {}
+    ForkCtx() : fork_infos_(), fork_tablet_handles_() {}
     ~ForkCtx() { reset(); }
     void reset()
     {
       fork_infos_.reset();
+      fork_tablet_handles_.reset();
     }
-    TO_STRING_KV(K_(fork_infos));
+    TO_STRING_KV(K_(fork_infos), K_(fork_tablet_handles));
     ForkTabletInfoArray fork_infos_;
+    ForkTabletHandleArray fork_tablet_handles_;
     DISALLOW_COPY_AND_ASSIGN(ForkCtx);
   };
 public: