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

Fix the issue that the row lock checker returns incorrect results when called again after returing OB_ITER_END.

Browse Source
This commit is contained in:
wudidapaopao 2023-11-13 04:46:55 +00:00 committed by ob-robot
parent 5809204848
commit 5336a2189f
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/storage/blocksstable/ob_micro_block_row_lock_checker.cpp
View File

@ -182,6 +182,7 @@ int ObMicroBlockRowLockChecker::get_next_row(const ObDatumRow *&row)
ObMicroBlockRowLockMultiChecker::ObMicroBlockRowLockMultiChecker(common::ObIAllocator &allocator)
: ObMicroBlockRowLockChecker(allocator),
reach_end_(false),
rowkey_current_idx_(0),
rowkey_begin_idx_(0),
rowkey_end_idx_(0),
@ -211,6 +212,7 @@ int ObMicroBlockRowLockMultiChecker::open(
rowkey_end_idx_ = rowkey_end_idx;
empty_read_cnt_ = 0;
rows_info_ = &rows_info;
reach_end_ = false;
}
return ret;
}
@ -233,7 +235,7 @@ int ObMicroBlockRowLockMultiChecker::inner_get_next_row(
ObStoreRowLockState *&lock_state)
{
int ret = OB_SUCCESS;
if (rowkey_current_idx_ == rowkey_end_idx_) {
if (reach_end_) {
ret = OB_ITER_END;
} else if (OB_ITER_END == end_of_block() || rows_info_->is_row_skipped(rowkey_current_idx_ - 1)) {
if (OB_FAIL(seek_forward())) {
@ -349,6 +351,7 @@ int ObMicroBlockRowLockMultiChecker::seek_forward()
const int64_t row_count = micro_block_reader->row_count();
while (OB_SUCC(ret)) {
if (rowkey_current_idx_ == rowkey_end_idx_) {
reach_end_ = true;
ret = OB_ITER_END;
} else if (rows_info_->is_row_skipped(rowkey_current_idx_)) {
++rowkey_current_idx_;

1
src/storage/blocksstable/ob_micro_block_row_lock_checker.h
View File

@ -85,6 +85,7 @@ protected:
virtual void check_row_in_major_sstable(bool &need_stop);
int seek_forward();
private:
bool reach_end_;
int64_t rowkey_current_idx_;
int64_t rowkey_begin_idx_;
int64_t rowkey_end_idx_;