hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix the memory_leak of release_last_tenant for some virtual tables

Browse Source
This commit is contained in:
obdev
2024-02-07 06:32:19 +00:00
committed by ob-robot
parent 503e76dc72
commit c66516433e
2 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/observer/virtual_table/ob_all_virtual_table_mgr.cpp
View File

@ -46,16 +46,12 @@ void ObAllVirtualTableMgr::reset()
omt::ObMultiTenantOperator::reset(); omt::ObMultiTenantOperator::reset();
addr_.reset(); addr_.reset();
ls_id_ = share::ObLSID::INVALID_LS_ID; ls_id_ = share::ObLSID::INVALID_LS_ID;
table_store_iter_.reset();
if (OB_NOT_NULL(iter_buf_)) { if (OB_NOT_NULL(iter_buf_)) {
allocator_->free(iter_buf_); allocator_->free(iter_buf_);
iter_buf_ = nullptr; iter_buf_ = nullptr;
} }
tablet_handle_.reset();
tablet_allocator_.reset();
ObVirtualTableScannerIterator::reset(); ObVirtualTableScannerIterator::reset();
} }
@ -89,6 +85,7 @@ int ObAllVirtualTableMgr::inner_get_next_row(ObNewRow *&row)
void ObAllVirtualTableMgr::release_last_tenant() void ObAllVirtualTableMgr::release_last_tenant()
{ {
table_store_iter_.reset();
tablet_handle_.reset(); tablet_handle_.reset();
if (OB_NOT_NULL(tablet_iter_)) { if (OB_NOT_NULL(tablet_iter_)) {
tablet_iter_->~ObTenantTabletIterator(); tablet_iter_->~ObTenantTabletIterator();

25
src/observer/virtual_table/ob_all_virtual_tablet_sstable_macro_info.cpp
View File

@ -97,10 +97,6 @@ void ObAllVirtualTabletSSTableMacroInfo::reset()
omt::ObMultiTenantOperator::reset(); omt::ObMultiTenantOperator::reset();
addr_.reset(); addr_.reset();
ls_id_ = share::ObLSID::INVALID_LS_ID; ls_id_ = share::ObLSID::INVALID_LS_ID;
table_store_iter_.reset();
block_idx_ = 0;
tablet_handle_.reset();
cols_desc_.reset();
if (OB_NOT_NULL(iter_buf_)) { if (OB_NOT_NULL(iter_buf_)) {
allocator_->free(iter_buf_); allocator_->free(iter_buf_);
@ -110,18 +106,7 @@ void ObAllVirtualTabletSSTableMacroInfo::reset()
allocator_->free(io_buf_); allocator_->free(io_buf_);
io_buf_ = nullptr; io_buf_ = nullptr;
} }
curr_sstable_ = nullptr;
curr_sstable_meta_handle_.reset();
if (OB_NOT_NULL(macro_iter_)) {
macro_iter_->~ObIMacroBlockIterator();
macro_iter_ = nullptr;
}
curr_range_.reset();
other_blk_iter_.reset();
memset(objs_, 0, sizeof(objs_)); memset(objs_, 0, sizeof(objs_));
iter_allocator_.reset();
rowkey_allocator_.reset();
tablet_allocator_.reset();
ObVirtualTableScannerIterator::reset(); ObVirtualTableScannerIterator::reset();
} }
@ -506,19 +491,17 @@ int ObAllVirtualTabletSSTableMacroInfo::inner_get_next_row(ObNewRow *&row)
void ObAllVirtualTabletSSTableMacroInfo::release_last_tenant() void ObAllVirtualTabletSSTableMacroInfo::release_last_tenant()
{ {
clean_cur_sstable();
cols_desc_.reset();
table_store_iter_.reset();
tablet_handle_.reset(); tablet_handle_.reset();
if (OB_NOT_NULL(tablet_iter_)) { if (OB_NOT_NULL(tablet_iter_)) {
tablet_iter_->~ObTenantTabletIterator(); tablet_iter_->~ObTenantTabletIterator();
tablet_iter_ = nullptr; tablet_iter_ = nullptr;
} }
if (OB_NOT_NULL(macro_iter_)) {
macro_iter_->~ObIMacroBlockIterator();
macro_iter_ = nullptr;
}
curr_range_.reset();
tablet_allocator_.reset();
iter_allocator_.reset(); iter_allocator_.reset();
rowkey_allocator_.reset(); rowkey_allocator_.reset();
tablet_allocator_.reset();
} }
bool ObAllVirtualTabletSSTableMacroInfo::is_need_process(uint64_t tenant_id) bool ObAllVirtualTabletSSTableMacroInfo::is_need_process(uint64_t tenant_id)