From dc4430d1973b29702fb09b431db0536cea51e646 Mon Sep 17 00:00:00 2001
From: haitaoyang <haitaoy3.14@gmail.com>
Date: Thu, 21 Sep 2023 06:44:28 +0000
Subject: [PATCH] Fix query memtable use wrong allocator

---
 src/storage/memtable/ob_memtable.cpp          | 2 +-
 src/storage/memtable/ob_memtable_iterator.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/storage/memtable/ob_memtable.cpp b/src/storage/memtable/ob_memtable.cpp
index 27ded312a..81b30c402 100755
--- a/src/storage/memtable/ob_memtable.cpp
+++ b/src/storage/memtable/ob_memtable.cpp
@@ -680,7 +680,7 @@ int ObMemtable::get(
         }
         if (OB_FAIL(ret)) {
           // do nothing
-        } else if (OB_FAIL(row.init(*context.stmt_allocator_, request_cnt, trans_info_ptr))) {
+        } else if (OB_FAIL(row.init(*context.allocator_, request_cnt, trans_info_ptr))) {
           STORAGE_LOG(WARN, "Failed to init datum row", K(ret), K(param.need_trans_info()));
         }
       }
diff --git a/src/storage/memtable/ob_memtable_iterator.cpp b/src/storage/memtable/ob_memtable_iterator.cpp
index a95f1d33c..c079c1cd9 100755
--- a/src/storage/memtable/ob_memtable_iterator.cpp
+++ b/src/storage/memtable/ob_memtable_iterator.cpp
@@ -90,7 +90,7 @@ int ObMemtableGetIterator::init(
   } else if (OB_UNLIKELY(nullptr == read_info || !read_info->is_valid())) {
     ret = OB_ERR_UNEXPECTED;
     TRANS_LOG(WARN, "Unexpected read info", K(ret), KPC(read_info));
-  } else if (OB_FAIL(cur_row_.init(*context.stmt_allocator_, read_info->get_request_count(), trans_info_ptr))) {
+  } else if (OB_FAIL(cur_row_.init(*context.allocator_, read_info->get_request_count(), trans_info_ptr))) {
     STORAGE_LOG(WARN, "Failed to init datum row", K(ret));
   } else {
     param_ = &param;
@@ -216,7 +216,7 @@ int ObMemtableScanIterator::init(
   } else if (OB_ISNULL(read_info_ = param.get_read_info(false))) {
     ret = OB_INVALID_ARGUMENT;
     TRANS_LOG(WARN, "Unexpected null read info", K(ret), K(param));
-  } else if (OB_FAIL(row_.init(*context.stmt_allocator_,
+  } else if (OB_FAIL(row_.init(*context.allocator_,
                                read_info_->get_request_count(),
                                trans_info_ptr))) {
     TRANS_LOG(WARN, "Failed to init datum row", K(ret), K(param.need_trans_info()));
@@ -489,7 +489,7 @@ int ObMemtableMGetIterator::init(
   } else if (OB_UNLIKELY(nullptr == read_info || !read_info->is_valid())) {
     ret = OB_ERR_UNEXPECTED;
     TRANS_LOG(WARN, "Unexpected read info", K(ret), KPC(read_info));
-  } else if (OB_FAIL(cur_row_.init(*context.stmt_allocator_, read_info->get_request_count(), trans_info_ptr))) {
+  } else if (OB_FAIL(cur_row_.init(*context.allocator_, read_info->get_request_count(), trans_info_ptr))) {
     TRANS_LOG(WARN, "Failed to init datum row", K(ret));
   } else {
     const ObColDescIArray &out_cols = read_info->get_columns_desc();
@@ -812,7 +812,7 @@ int ObMemtableMultiVersionScanIterator::init(
       TRANS_LOG(WARN, "mvcc engine scan fail", K(ret), K(mvcc_scan_range));
     } else if (OB_FAIL(bitmap_.init(read_info_->get_request_count(), read_info_->get_rowkey_count()))) {
       TRANS_LOG(WARN, "init nop bitmap fail, ", K(ret));
-    } else if (OB_FAIL(row_.init(*context.stmt_allocator_, read_info_->get_request_count()))) {
+    } else if (OB_FAIL(row_.init(*context.allocator_, read_info_->get_request_count()))) {
       TRANS_LOG(WARN, "Failed to init datum row", K(ret));
     } else {
       TRANS_LOG(INFO, "multi version scan iterator init succ", K(param.table_id_), K(range), KPC(read_info_), K(row_));