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

Fix sanity complie error

Browse Source
This commit is contained in:
godyangfight
2023-08-16 06:44:33 +00:00
committed by ob-robot
parent af5440bd7a
commit 896f28392f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
deps/oblib/src/lib/alloc/ob_tenant_ctx_allocator.cpp vendored
View File

@ -403,6 +403,7 @@ void* ObTenantCtxAllocator::common_alloc(const int64_t size, const ObMemAttr &at
SANITY_DISABLE_CHECK_RANGE(); // prevent sanity_check_range SANITY_DISABLE_CHECK_RANGE(); // prevent sanity_check_range
void *ret = nullptr; void *ret = nullptr;
AObject *obj = nullptr; AObject *obj = nullptr;
int64_t alloc_size = 0;
bool sample_allowed = false; bool sample_allowed = false;
bool is_errsim = false; bool is_errsim = false;
if (!attr.label_.is_valid()) { if (!attr.label_.is_valid()) {
@ -421,7 +422,7 @@ void* ObTenantCtxAllocator::common_alloc(const int64_t size, const ObMemAttr &at
if (OB_UNLIKELY(is_errsim)) { if (OB_UNLIKELY(is_errsim)) {
} else { } else {
sample_allowed = ObMallocSampleLimiter::malloc_sample_allowed(size, attr); sample_allowed = ObMallocSampleLimiter::malloc_sample_allowed(size, attr);
const int64_t alloc_size = sample_allowed ? (size + AOBJECT_BACKTRACE_SIZE) : size; alloc_size = sample_allowed ? (size + AOBJECT_BACKTRACE_SIZE) : size;
obj = allocator.alloc_object(alloc_size, attr); obj = allocator.alloc_object(alloc_size, attr);
if (OB_ISNULL(obj) && g_alloc_failed_ctx().need_wash()) { if (OB_ISNULL(obj) && g_alloc_failed_ctx().need_wash()) {
int64_t total_size = ta.sync_wash(); int64_t total_size = ta.sync_wash();
@ -468,6 +469,7 @@ void* ObTenantCtxAllocator::common_realloc(const void *ptr, const int64_t size,
} }
AObject *obj = NULL; AObject *obj = NULL;
int64_t alloc_size = 0;
bool sample_allowed = false; bool sample_allowed = false;
bool is_errsim = false; bool is_errsim = false;
if (NULL != ptr) { if (NULL != ptr) {
@ -492,7 +494,7 @@ void* ObTenantCtxAllocator::common_realloc(const void *ptr, const int64_t size,
if (OB_UNLIKELY(is_errsim)) { if (OB_UNLIKELY(is_errsim)) {
} else { } else {
sample_allowed = ObMallocSampleLimiter::malloc_sample_allowed(size, attr); sample_allowed = ObMallocSampleLimiter::malloc_sample_allowed(size, attr);
const int64_t alloc_size = sample_allowed ? (size + AOBJECT_BACKTRACE_SIZE) : size; alloc_size = sample_allowed ? (size + AOBJECT_BACKTRACE_SIZE) : size;
obj = allocator.realloc_object(obj, alloc_size, attr); obj = allocator.realloc_object(obj, alloc_size, attr);
if(OB_ISNULL(obj) && g_alloc_failed_ctx().need_wash()) { if(OB_ISNULL(obj) && g_alloc_failed_ctx().need_wash()) {
int64_t total_size = ta.sync_wash(); int64_t total_size = ta.sync_wash();