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

Fix query memtable use wrong allocator

Browse Source
This commit is contained in:
haitaoyang 2023-09-21 06:44:28 +00:00 committed by ob-robot
parent 296b9c7380
commit dc4430d197
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/storage/memtable/ob_memtable.cpp
View File

@ -680,7 +680,7 @@ int ObMemtable::get(
}
if (OB_FAIL(ret)) {
// do nothing
} else if (OB_FAIL(row.init(*context.stmt_allocator_, request_cnt, trans_info_ptr))) {
} else if (OB_FAIL(row.init(*context.allocator_, request_cnt, trans_info_ptr))) {
STORAGE_LOG(WARN, "Failed to init datum row", K(ret), K(param.need_trans_info()));
}
}

8
src/storage/memtable/ob_memtable_iterator.cpp
View File

@ -90,7 +90,7 @@ int ObMemtableGetIterator::init(
} else if (OB_UNLIKELY(nullptr == read_info || !read_info->is_valid())) {
ret = OB_ERR_UNEXPECTED;
TRANS_LOG(WARN, "Unexpected read info", K(ret), KPC(read_info));
} else if (OB_FAIL(cur_row_.init(*context.stmt_allocator_, read_info->get_request_count(), trans_info_ptr))) {
} else if (OB_FAIL(cur_row_.init(*context.allocator_, read_info->get_request_count(), trans_info_ptr))) {
STORAGE_LOG(WARN, "Failed to init datum row", K(ret));
} else {
param_ = &param;
@ -216,7 +216,7 @@ int ObMemtableScanIterator::init(
} else if (OB_ISNULL(read_info_ = param.get_read_info(false))) {
ret = OB_INVALID_ARGUMENT;
TRANS_LOG(WARN, "Unexpected null read info", K(ret), K(param));
} else if (OB_FAIL(row_.init(*context.stmt_allocator_,
} else if (OB_FAIL(row_.init(*context.allocator_,
read_info_->get_request_count(),
trans_info_ptr))) {
TRANS_LOG(WARN, "Failed to init datum row", K(ret), K(param.need_trans_info()));
@ -489,7 +489,7 @@ int ObMemtableMGetIterator::init(
} else if (OB_UNLIKELY(nullptr == read_info || !read_info->is_valid())) {
ret = OB_ERR_UNEXPECTED;
TRANS_LOG(WARN, "Unexpected read info", K(ret), KPC(read_info));
} else if (OB_FAIL(cur_row_.init(*context.stmt_allocator_, read_info->get_request_count(), trans_info_ptr))) {
} else if (OB_FAIL(cur_row_.init(*context.allocator_, read_info->get_request_count(), trans_info_ptr))) {
TRANS_LOG(WARN, "Failed to init datum row", K(ret));
} else {
const ObColDescIArray &out_cols = read_info->get_columns_desc();
@ -812,7 +812,7 @@ int ObMemtableMultiVersionScanIterator::init(
TRANS_LOG(WARN, "mvcc engine scan fail", K(ret), K(mvcc_scan_range));
} else if (OB_FAIL(bitmap_.init(read_info_->get_request_count(), read_info_->get_rowkey_count()))) {
TRANS_LOG(WARN, "init nop bitmap fail, ", K(ret));
} else if (OB_FAIL(row_.init(*context.stmt_allocator_, read_info_->get_request_count()))) {
} else if (OB_FAIL(row_.init(*context.allocator_, read_info_->get_request_count()))) {
TRANS_LOG(WARN, "Failed to init datum row", K(ret));
} else {
TRANS_LOG(INFO, "multi version scan iterator init succ", K(param.table_id_), K(range), KPC(read_info_), K(row_));