From dee3773664a25f68775a73b5a0d0f87a4db5d8bf Mon Sep 17 00:00:00 2001
From: Tsunaou <895254752@qq.com>
Date: Mon, 8 Apr 2024 10:04:13 +0000
Subject: [PATCH] let mocked_row_store_cg_ in ObTabletCopyFinishTask to local
 variable

---
 src/storage/high_availability/ob_physical_copy_task.cpp | 9 +++++----
 src/storage/high_availability/ob_physical_copy_task.h   | 1 -
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/storage/high_availability/ob_physical_copy_task.cpp b/src/storage/high_availability/ob_physical_copy_task.cpp
index 39e7816ac0..d509c76bac 100644
--- a/src/storage/high_availability/ob_physical_copy_task.cpp
+++ b/src/storage/high_availability/ob_physical_copy_task.cpp
@@ -620,8 +620,7 @@ ObSSTableCopyFinishTask::ObSSTableCopyFinishTask()
     ls_(nullptr),
     tablet_service_(nullptr),
     sstable_index_builder_(),
-    restore_macro_block_id_mgr_(nullptr),
-    mocked_row_store_cg_()
+    restore_macro_block_id_mgr_(nullptr)
 {
 }
 
@@ -826,15 +825,17 @@ int ObSSTableCopyFinishTask::prepare_data_store_desc_(
   } else {
     const uint16_t cg_idx = sstable_param->table_key_.get_column_group_id();
     const ObStorageColumnGroupSchema *cg_schema = nullptr;
+    ObStorageColumnGroupSchema mocked_row_store_cg;
     if (sstable_param->table_key_.is_cg_sstable()) {
       if (OB_UNLIKELY(cg_idx < 0 || cg_idx >= storage_schema->get_column_group_count())) {
         ret = OB_ERR_UNEXPECTED;
         LOG_WARN("get unexpected cg idx", K(ret), K(cg_idx), KPC(storage_schema));
       } else if (ALL_CG_TYPE == sstable_param->co_base_type_ && cg_schema->is_rowkey_column_group()) {
-        if (OB_FAIL(storage_schema->mock_row_store_cg(mocked_row_store_cg_))) {
+        // ALL_CG_TYPE means major is row store (no cgs), cg_schema means table is created with column store.
+        if (OB_FAIL(storage_schema->mock_row_store_cg(mocked_row_store_cg))) {
           LOG_WARN("failed to mock row store column group schema", K(ret));
         } else {
-          cg_schema = &mocked_row_store_cg_;
+          cg_schema = &mocked_row_store_cg;
         }
       } else {
         cg_schema = &storage_schema->get_column_groups().at(cg_idx);
diff --git a/src/storage/high_availability/ob_physical_copy_task.h b/src/storage/high_availability/ob_physical_copy_task.h
index 07a77502d1..8d3370f793 100644
--- a/src/storage/high_availability/ob_physical_copy_task.h
+++ b/src/storage/high_availability/ob_physical_copy_task.h
@@ -218,7 +218,6 @@ private:
   ObLSTabletService *tablet_service_;
   ObSSTableIndexBuilder sstable_index_builder_;
   ObRestoreMacroBlockIdMgr *restore_macro_block_id_mgr_;
-  ObStorageColumnGroupSchema mocked_row_store_cg_;
   DISALLOW_COPY_AND_ASSIGN(ObSSTableCopyFinishTask);
 };