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

[FEAT MERGE] merge transfer

Browse Source 
Co-authored-by: wxhwang <wxhwang@126.com>
Co-authored-by: godyangfight <godyangfight@gmail.com>
Co-authored-by: Tyshawn <tuyunshan@gmail.com>
This commit is contained in:
xuhuleon
2023-06-21 11:42:26 +00:00
committed by ob-robot
parent d06678002e
commit 9dae112952
1280 changed files with 149724 additions and 48813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
deps/oblib/src/lib/alloc/ob_malloc_allocator.cpp vendored
View File

@ -189,7 +189,7 @@ void *ObMallocAllocator::realloc(
} else if (OB_ISNULL(nptr = allocator->realloc(ptr, size, inner_attr))) {
// do nothing
}
return nptr;;
return nptr;
#endif
}
@ -247,7 +247,7 @@ ObTenantCtxAllocatorGuard ObMallocAllocator::get_tenant_ctx_allocator(uint64_t t
{
if (OB_LIKELY(tl_ta != NULL && tl_ta->get_tenant_id() == tenant_id)) {
const bool lock = false;
return ObTenantCtxAllocatorGuard(&tl_ta[ctx_id], lock);;
return ObTenantCtxAllocatorGuard(&tl_ta[ctx_id], lock);
}
return get_tenant_ctx_allocator_without_tlcache(tenant_id, ctx_id);
}