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

Use tenant-level object pool instead of sop_borrow

Browse Source
This commit is contained in:
obdev
2023-05-26 10:41:16 +00:00
committed by ob-robot
parent 982112f7bc
commit c9cccf08db
21 changed files with 102 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mittest/mtlenv/mock_tenant_module_env.h
View File

@ -63,6 +63,8 @@
#include "storage/ob_tenant_tablet_stat_mgr.h"
#include "storage/tx/ob_trans_part_ctx.h"
#include "storage/ob_file_system_router.h"
#include "storage/access/ob_table_scan_iterator.h"
#include "storage/lob/ob_lob_manager.h"
#include "ob_mittest_utils.h"
#include "storage/mock_disk_usage_report.h"
#include "share/deadlock/ob_deadlock_detector_mgr.h"
@ -97,7 +99,7 @@ static int server_obj_pool_mtl_new(common::ObServerObjectPool<T> *&pool)
int ret = common::OB_SUCCESS;
uint64_t tenant_id = MTL_ID();
pool = MTL_NEW(common::ObServerObjectPool<T>, "TntSrvObjPool", tenant_id, false,
MTL_IS_MINI_MODE());
MTL_IS_MINI_MODE(), MTL_CPU_COUNT());
if (OB_ISNULL(pool)) {
ret = common::OB_ALLOCATE_MEMORY_FAILED;
} else {
@ -673,6 +675,7 @@ int MockTenantModuleEnv::init()
MTL_BIND2(mtl_new_default, ObMultiVersionGarbageCollector::mtl_init, mtl_start_default, mtl_stop_default, mtl_wait_default, mtl_destroy_default);
MTL_BIND2(mtl_new_default, ObTableLockService::mtl_init, mtl_start_default, mtl_stop_default, mtl_wait_default, mtl_destroy_default);
MTL_BIND2(server_obj_pool_mtl_new<transaction::ObPartTransCtx>, nullptr, nullptr, nullptr, nullptr, server_obj_pool_mtl_destroy<transaction::ObPartTransCtx>);
MTL_BIND2(server_obj_pool_mtl_new<ObTableScanIterator>, nullptr, nullptr, nullptr, nullptr, server_obj_pool_mtl_destroy<ObTableScanIterator>);
}
if (OB_FAIL(ret)) {

7
mittest/mtlenv/storage/test_lob_manager.cpp
View File

@ -737,7 +737,6 @@ void TestLobManager::scan_lob_meta(
}
if (iter != NULL) {
iter->reset();
// common::sop_return(ObLobMetaScanIter, iter);
}
// ASSERT_EQ(0, out_data.length());
@ -1744,7 +1743,7 @@ TEST_F(TestLobManager, inrow_bin_reverse_query)
}
}
iter->reset();
common::sop_return(ObLobQueryIter, iter);
OB_DELETE(ObLobQueryIter, "unused", iter);
allocator.free(read_buf);
}
@ -1775,7 +1774,7 @@ TEST_F(TestLobManager, inrow_bin_reverse_query)
}
}
iter->reset();
common::sop_return(ObLobQueryIter, iter);
OB_DELETE(ObLobQueryIter, "unused", iter);
allocator.free(read_buf);
}
@ -1843,7 +1842,7 @@ TEST_F(TestLobManager, inrow_utf8_reverse_query)
}
}
iter->reset();
common::sop_return(ObLobQueryIter, iter);
OB_DELETE(ObLobQueryIter, "unused", iter);
allocator.free(read_buf);
}