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

[CP] Repair memory leak in sort operator about stored_rows_.

Browse Source
This commit is contained in:
obdev
2022-11-03 02:11:34 +00:00
committed by wangzelin.wzl
parent d0856a50a3
commit 54885402b0
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sql/engine/sort/ob_sort_op_impl.cpp
View File

@ -617,8 +617,8 @@ int ObSortOpImpl::init(
default_block_size))) { default_block_size))) {
LOG_WARN("init row store failed", K(ret)); LOG_WARN("init row store failed", K(ret));
} else if (batch_size > 0 } else if (batch_size > 0
&& NULL == (stored_rows_ = static_cast<ObChunkDatumStore::StoredRow **>( && OB_ISNULL(stored_rows_ = static_cast<ObChunkDatumStore::StoredRow **>(
mem_context_->get_arena_allocator().alloc( mem_context_->get_malloc_allocator().alloc(
sizeof(*stored_rows_) * batch_size)))) { sizeof(*stored_rows_) * batch_size)))) {
ret = OB_ALLOCATE_MEMORY_FAILED; ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("allocate memory failed", K(ret)); LOG_WARN("allocate memory failed", K(ret));
@ -699,6 +699,10 @@ void ObSortOpImpl::reset()
mem_context_->get_malloc_allocator().free(ems_heap_); mem_context_->get_malloc_allocator().free(ems_heap_);
ems_heap_ = NULL; ems_heap_ = NULL;
} }
if (NULL != stored_rows_) {
mem_context_->get_malloc_allocator().free(stored_rows_);
stored_rows_ = NULL;
}
if (NULL != buckets_) { if (NULL != buckets_) {
mem_context_->get_malloc_allocator().free(buckets_); mem_context_->get_malloc_allocator().free(buckets_);
buckets_ = NULL; buckets_ = NULL;