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

fix invalid mvcc_row_flag

Browse Source
This commit is contained in:
obdev
2024-02-10 09:44:17 +00:00
committed by ob-robot
parent dc815f81b3
commit 980d78ddfd
2 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/storage/compaction/ob_partition_merge_iter.cpp
View File

@ -143,7 +143,7 @@ ObPartitionMergeIter::ObPartitionMergeIter(common::ObIAllocator &allocator)
iter_end_(false),
allocator_(allocator),
last_macro_block_reused_(false),
is_rowkey_first_row_reused_(false),
is_rowkey_first_row_already_output_(false),
is_rowkey_shadow_row_reused_(false)
{
}
@ -176,7 +176,7 @@ void ObPartitionMergeIter::reset()
curr_row_ = nullptr;
iter_end_ = false;
is_inited_ = false;
is_rowkey_first_row_reused_ = false;
is_rowkey_first_row_already_output_ = false;
is_rowkey_shadow_row_reused_ = false;
ObMergeIter::reset();
}
@ -262,7 +262,7 @@ int ObPartitionMergeIter::init(const ObMergeParameter &merge_param)
iter_row_count_ = 0;
curr_row_ = nullptr;
iter_end_ = false;
is_rowkey_first_row_reused_ = false;
is_rowkey_first_row_already_output_ = false;
is_rowkey_shadow_row_reused_ = false;
if (OB_FAIL(init_query_base_params(merge_param))) {
@ -1505,6 +1505,11 @@ int ObPartitionMinorRowMergeIter::next()
} else if (OB_ISNULL(row_iter_)) {
ret = OB_INNER_STAT_ERROR;
LOG_WARN("Unexpected null row iter", K(ret), K(*this));
} else if (OB_LIKELY(curr_row_ != nullptr)) {
is_rowkey_first_row_already_output_ = !curr_row_->is_last_multi_version_row();
}
if (OB_FAIL(ret)) {
} else if (FALSE_IT(curr_row_ = nullptr)) {
} else if (row_queue_.has_next()) { // get row from row_queue
if (OB_FAIL(row_queue_.get_next_row(curr_row_))) {
@ -1780,7 +1785,7 @@ int ObPartitionMinorMacroMergeIter::next_range()
}
macro_block_opened_ = false;
have_macro_output_row_ = false;
is_rowkey_first_row_reused_ = false;
is_rowkey_first_row_already_output_ = false;
is_rowkey_shadow_row_reused_ = false;
if (OB_FAIL(check_macro_block_recycle(curr_block_desc_, can_recycle))) {
LOG_WARN("failed to check macro block recycle", K(ret));
@ -1832,13 +1837,13 @@ int ObPartitionMinorMacroMergeIter::open_curr_macro_block()
LOG_WARN("Fail to check rowkey first row info", K(ret), KPC(iter));
} else {
check_committing_trans_compacted_ = is_first_row;
is_rowkey_first_row_reused_ = !is_first_row;
is_rowkey_first_row_already_output_ = !is_first_row;
is_rowkey_shadow_row_reused_ = !is_first_row && !is_shadow_row;
}
} else if (last_macro_block_recycled_) {
last_macro_block_recycled_ = false;
check_committing_trans_compacted_ = true;
is_rowkey_first_row_reused_ = false;
is_rowkey_first_row_already_output_ = false;
is_rowkey_shadow_row_reused_ = false;
if (OB_FAIL(recycle_last_rowkey_in_macro_block(*iter))) {
LOG_WARN("Fail to recycle last rowkey in current macro block", K(ret), K(curr_block_desc_.macro_block_id_));
@ -1895,7 +1900,7 @@ int ObPartitionMinorMacroMergeIter::next()
}
} else {
if (have_macro_output_row_) {
is_rowkey_first_row_reused_ = false;
is_rowkey_first_row_already_output_ = false;
is_rowkey_shadow_row_reused_ = false;
} else if (nullptr != curr_row_) {
have_macro_output_row_ = true;
@ -1912,11 +1917,22 @@ int ObPartitionMinorMacroMergeIter::inner_next(const bool open_macro)
iter_row_count_++;
} else if (OB_UNLIKELY(OB_SUCCESS != ret && OB_ITER_END != ret)) {
LOG_WARN("Failed to get next row", K(ret), K(*this));
} else {
if (OB_ITER_END == ret) {
ret = OB_SUCCESS;
if (macro_block_opened_) {
if (!curr_block_meta_.val_.is_last_row_last_flag_ && !is_rowkey_first_row_already_output()) {
need_check = true;
}
}
}
if (OB_FAIL(ret)) {
} else if (OB_FAIL(next_range())) {
if (OB_UNLIKELY(OB_ITER_END != ret)) {
LOG_WARN("Failed to get next range", K(ret), K(*this));
}
} else if (!open_macro && OB_FAIL(check_need_open_curr_macro_block(need_check))) {
} else if (!open_macro && !need_check && OB_FAIL(check_need_open_curr_macro_block(need_check))) {
STORAGE_LOG(WARN, "Failed to check need open curr macro block", K(ret));
} else if (open_macro || need_check) {
if (OB_FAIL(open_curr_macro_block())) {
@ -1929,6 +1945,7 @@ int ObPartitionMinorMacroMergeIter::inner_next(const bool open_macro)
LOG_DEBUG("open macro block on demand", K(open_macro), K(need_check), KPC(this));
}
}
}
return ret;
}

6
src/storage/compaction/ob_partition_merge_iter.h
View File

@ -124,7 +124,7 @@ public:
virtual int multi_version_compare(const ObPartitionMergeIter &other, int &cmp_ret)
{ UNUSEDx(other, cmp_ret); return OB_NOT_SUPPORTED;}
virtual OB_INLINE const storage::ObITable *get_table() const override { return table_; }
virtual OB_INLINE bool is_rowkey_first_row_already_output() { return is_rowkey_first_row_reused_; }
virtual OB_INLINE bool is_rowkey_first_row_already_output() { return is_rowkey_first_row_already_output_; }
virtual OB_INLINE bool is_rowkey_shadow_row_already_output() { return is_rowkey_shadow_row_reused_; }
OB_INLINE bool is_base_iter() const { return is_base_iter_; }
@ -155,7 +155,7 @@ public:
INHERIT_TO_STRING_KV("ObMergeIter", ObMergeIter, K_(tablet_id), K_(iter_end), K_(schema_rowkey_column_cnt), K_(schema_version), K_(merge_range),
KPC(table_), K_(store_ctx), KPC_(read_info), KPC(row_iter_), K_(iter_row_count), KPC(curr_row_), K_(is_inited),
K_(iter_row_id), K_(last_macro_block_reused), K_(is_rowkey_first_row_reused), K_(is_base_iter), K(access_context_));
K_(iter_row_id), K_(last_macro_block_reused), K_(is_rowkey_first_row_already_output), K_(is_base_iter), K(access_context_));
protected:
virtual bool inner_check(const ObMergeParameter &merge_param) = 0;
virtual int inner_init(const ObMergeParameter &merge_param) = 0;
@ -185,7 +185,7 @@ protected:
bool iter_end_;
common::ObIAllocator &allocator_;
bool last_macro_block_reused_;
bool is_rowkey_first_row_reused_;
bool is_rowkey_first_row_already_output_;
bool is_rowkey_shadow_row_reused_;
bool is_reserve_mode_;
};