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

Fix ObMultipleMerge not refreshed during ObTableScanIterator::rescan

Browse Source
This commit is contained in:
JiahuaChen
2023-11-03 09:40:03 +00:00
committed by ob-robot
parent 4646e5136d
commit 8c9bd898fd
4 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/storage/access/ob_table_scan_iterator.cpp
View File

@ -205,6 +205,8 @@ int ObTableScanIterator::rescan(ObTableScanParam &scan_param)
LOG_WARN("Failed to rescan reuse", K(ret));
} else if (OB_FAIL(table_scan_range_.init(*scan_param_))) {
STORAGE_LOG(WARN, "Failed to init table scan range", K(ret));
} else if (OB_FAIL(rescan_for_iter())) {
STORAGE_LOG(WARN, "Failed to switch param for iter", K(ret), K(*this));
} else if (OB_FAIL(open_iter())) {
STORAGE_LOG(WARN, "fail to open iter", K(ret));
} else {
@ -281,6 +283,31 @@ int ObTableScanIterator::switch_param(ObTableScanParam &scan_param, const ObTabl
return ret;
}
int ObTableScanIterator::rescan_for_iter()
{
#define RESET_NOT_REFRESHED_ITER(refreshed_iter, iter) \
if (refreshed_iter != (void*)iter) { \
reset_scan_iter(iter); \
} \
int ret = OB_SUCCESS;
if (OB_LIKELY(nullptr == get_table_param_.refreshed_merge_)) {
// do nothing
} else {
RESET_NOT_REFRESHED_ITER(get_table_param_.refreshed_merge_, single_merge_);
RESET_NOT_REFRESHED_ITER(get_table_param_.refreshed_merge_, get_merge_);
RESET_NOT_REFRESHED_ITER(get_table_param_.refreshed_merge_, scan_merge_);
RESET_NOT_REFRESHED_ITER(get_table_param_.refreshed_merge_, multi_scan_merge_);
RESET_NOT_REFRESHED_ITER(get_table_param_.refreshed_merge_, skip_scan_merge_);
RESET_NOT_REFRESHED_ITER(get_table_param_.refreshed_merge_, memtable_row_sample_iterator_);
RESET_NOT_REFRESHED_ITER(get_table_param_.refreshed_merge_, row_sample_iterator_);
RESET_NOT_REFRESHED_ITER(get_table_param_.refreshed_merge_, block_sample_iterator_);
get_table_param_.refreshed_merge_ = nullptr;
}
#undef RESET_NOT_REFRESHED_ITER
return ret;
}
int ObTableScanIterator::switch_param_for_iter()
{
#define SWITCH_PARAM_FOR_ITER(iter, ret) \