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

Fix memory expansion

Browse Source
This commit is contained in:
obdev
2023-04-18 08:11:53 +00:00
committed by ob-robot
parent 0e762bcbc5
commit b25c41566c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/sql/das/ob_das_scan_op.cpp
View File

@ -864,8 +864,9 @@ int ObLocalIndexLookupOp::process_data_table_rowkey()
: index_ctdef_->result_output_.count(); : index_ctdef_->result_output_.count();
ObObj *obj_ptr = nullptr; ObObj *obj_ptr = nullptr;
void *buf = nullptr; void *buf = nullptr;
common::ObArenaAllocator& lookup_alloc = lookup_memctx_->get_arena_allocator();
ObNewRange lookup_range; ObNewRange lookup_range;
if (OB_ISNULL(buf = lookup_rtdef_->scan_allocator_.alloc(sizeof(ObObj) * rowkey_cnt))) { if (OB_ISNULL(buf = lookup_alloc.alloc(sizeof(ObObj) * rowkey_cnt))) {
ret = OB_ALLOCATE_MEMORY_FAILED; ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("allocate buffer failed", K(ret), K(rowkey_cnt)); LOG_WARN("allocate buffer failed", K(ret), K(rowkey_cnt));
} else { } else {
@ -880,7 +881,7 @@ int ObLocalIndexLookupOp::process_data_table_rowkey()
ObDatum &col_datum = expr->locate_expr_datum(*lookup_rtdef_->eval_ctx_); ObDatum &col_datum = expr->locate_expr_datum(*lookup_rtdef_->eval_ctx_);
if (OB_FAIL(col_datum.to_obj(tmp_obj, expr->obj_meta_, expr->obj_datum_map_))) { if (OB_FAIL(col_datum.to_obj(tmp_obj, expr->obj_meta_, expr->obj_datum_map_))) {
LOG_WARN("convert datum to obj failed", K(ret)); LOG_WARN("convert datum to obj failed", K(ret));
} else if (OB_FAIL(ob_write_obj(lookup_rtdef_->scan_allocator_, tmp_obj, obj_ptr[i]))) { } else if (OB_FAIL(ob_write_obj(lookup_alloc, tmp_obj, obj_ptr[i]))) {
LOG_WARN("deep copy rowkey value failed", K(ret), K(tmp_obj)); LOG_WARN("deep copy rowkey value failed", K(ret), K(tmp_obj));
} }
} }