From 4ec2a9f224be97c75a5d5fa9b85fa25896f1bf15 Mon Sep 17 00:00:00 2001 From: saltonz Date: Wed, 11 Oct 2023 08:43:05 +0000 Subject: [PATCH] [CP] assign memory usage of __all_virtual_tablet_sstable_macro_info to current tenant --- .../ob_all_virtual_tablet_sstable_macro_info.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/observer/virtual_table/ob_all_virtual_tablet_sstable_macro_info.cpp b/src/observer/virtual_table/ob_all_virtual_tablet_sstable_macro_info.cpp index af532460a4..aaeb77fbf3 100644 --- a/src/observer/virtual_table/ob_all_virtual_tablet_sstable_macro_info.cpp +++ b/src/observer/virtual_table/ob_all_virtual_tablet_sstable_macro_info.cpp @@ -478,6 +478,8 @@ void ObAllVirtualTabletSSTableMacroInfo::release_last_tenant() } curr_range_.reset(); tablet_allocator_.reset(); + iter_allocator_.reset(); + rowkey_allocator_.reset(); } bool ObAllVirtualTabletSSTableMacroInfo::is_need_process(uint64_t tenant_id) @@ -517,6 +519,8 @@ int ObAllVirtualTabletSSTableMacroInfo::get_next_tablet() tablet_allocator_.reuse(); if (nullptr == tablet_iter_) { tablet_allocator_.set_tenant_id(MTL_ID()); + iter_allocator_.set_tenant_id(MTL_ID()); + rowkey_allocator_.set_tenant_id(MTL_ID()); ObTenantMetaMemMgr *t3m = MTL(ObTenantMetaMemMgr*); if (OB_ISNULL(tablet_iter_ = new (iter_buf_) ObTenantTabletIterator(*t3m, tablet_allocator_))) { ret = OB_ERR_UNEXPECTED;