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

[FEAT MERGE] del_tenant_memleak branch

Browse Source 
Co-authored-by: HaHaJeff <jeffzhouhhh@gmail.com>
This commit is contained in:
obdev
2023-01-28 19:29:23 +08:00
committed by ob-robot
parent e3b89cd741
commit ba19ba90e0
179 changed files with 3235 additions and 2291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/engine/basic/ob_expr_values_op.cpp
View File

@ -494,13 +494,13 @@ OB_INLINE int ObExprValuesOp::calc_next_row()
if (ObObjDatumMapType::OBJ_DATUM_STRING == dst_expr->obj_datum_map_) {
ObExprStrResAlloc res_alloc(*dst_expr, eval_ctx_);
if (OB_FAIL(dst_datum.deep_copy(*datum, res_alloc))) {
LOG_WARN("fail to deep copy datum from cast res datum", K(ret), K(*datum));
LOG_WARN("fail to deep copy datum from cast res datum", K(ret), KP(datum));
}
} else {
ObDataBuffer res_alloc(const_cast<char*>(dst_datum.ptr_),
dst_expr->res_buf_len_);
if (OB_FAIL(dst_datum.deep_copy(*datum, res_alloc))) {
LOG_WARN("fail to deep copy datum from cast res datum", K(ret), K(*datum));
LOG_WARN("fail to deep copy datum from cast res datum", K(ret), KP(datum));
}
}
dst_expr->set_evaluated_projected(eval_ctx_);

2
src/sql/engine/basic/ob_ra_datum_store.cpp
View File

@ -1272,7 +1272,7 @@ bool ObRADatumStore::need_dump()
} else {
const int64_t mem_ctx_pct_trigger = 80;
lib::ObMallocAllocator *instance = lib::ObMallocAllocator::get_instance();
lib::ObTenantCtxAllocator *allocator = NULL;
lib::ObTenantCtxAllocatorGuard allocator = NULL;
if (NULL == instance) {
ret = common::OB_ERR_SYS;
LOG_ERROR("NULL allocator", K(ret));

2
src/sql/engine/basic/ob_ra_row_store.cpp
View File

@ -1052,7 +1052,7 @@ bool ObRARowStore::need_dump()
} else {
const int64_t mem_ctx_pct_trigger = 80;
lib::ObMallocAllocator *instance = lib::ObMallocAllocator::get_instance();
lib::ObTenantCtxAllocator *allocator = NULL;
lib::ObTenantCtxAllocatorGuard allocator = NULL;
if (NULL == instance) {
ret = common::OB_ERR_SYS;
LOG_ERROR("NULL allocator", K(ret));