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

Fix prefetch micro block that size bigger than batch size

Browse Source
This commit is contained in:
DengzhiLiu
2024-06-24 09:16:49 +00:00
committed by ob-robot
parent 3cfbf0100f
commit da3fb1fa43
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/storage/access/ob_index_tree_prefetcher.cpp
View File

@ -1732,15 +1732,11 @@ int ObIndexTreeMultiPassPrefetcher<DATA_PREFETCH_DEPTH, INDEX_PREFETCH_DEPTH>::p
need_submit_io_))) { need_submit_io_))) {
LOG_WARN("Fail to prefetch data block data", K(ret)); LOG_WARN("Fail to prefetch data block data", K(ret));
} else if (use_multi_block_prefetch_ && micro_handle.need_multi_io()) { } else if (use_multi_block_prefetch_ && micro_handle.need_multi_io()) {
bool need_split = false; bool need_split = true;
if (multi_io_params_.add_micro_data(index_block_info, prefetch_idx, micro_handle, need_split)) { while (OB_SUCC(ret) && need_split) {
if (OB_FAIL(prefetch_multi_data_block(prefetch_idx + 1))) { if (multi_io_params_.add_micro_data(index_block_info, prefetch_idx, micro_handle, need_split)) {
LOG_WARN("Fail to prefetch multi block", K(ret)); if (OB_FAIL(prefetch_multi_data_block(prefetch_idx + 1))) {
} else if (need_split) { LOG_WARN("Fail to prefetch multi block", K(ret));
// reused after prefetch_multi_data_block
if (multi_io_params_.add_micro_data(index_block_info, prefetch_idx, micro_handle, need_split)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("Unexpected multi_io_params status", K(ret), K_(multi_io_params));
} }
} }
} }

4
src/storage/blocksstable/ob_micro_block_cache.cpp
View File

@ -274,8 +274,8 @@ int ObMultiBlockIOParam::init(
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
is_reverse_ = is_reverse; is_reverse_ = is_reverse;
io_read_batch_size_ = iter_param.get_io_read_batch_size(); io_read_batch_size_ = MAX(iter_param.get_io_read_batch_size(), 0);
io_read_gap_size_ = iter_param.get_io_read_gap_size(); io_read_gap_size_ = MAX(iter_param.get_io_read_gap_size(), 0);
prefetch_idx_.set_allocator(&allocator); prefetch_idx_.set_allocator(&allocator);
micro_infos_.set_allocator(&allocator); micro_infos_.set_allocator(&allocator);
if (OB_UNLIKELY(0 >= micro_count_cap || MAX_MICRO_BLOCK_READ_COUNT < micro_count_cap)) { if (OB_UNLIKELY(0 >= micro_count_cap || MAX_MICRO_BLOCK_READ_COUNT < micro_count_cap)) {