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

Fix sample incr data nop datum

Browse Source
This commit is contained in:
haitaoyang
2024-02-20 03:12:26 +00:00
committed by ob-robot
parent eb4ce0dc71
commit 153ca78ad2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/storage/access/ob_multiple_merge.cpp
View File

@ -746,14 +746,14 @@ int ObMultipleMerge::process_fuse_row(const bool not_using_static_engine,
} else if (need_fill_virtual_columns_ && OB_FAIL(fill_virtual_columns(cur_row_))) { } else if (need_fill_virtual_columns_ && OB_FAIL(fill_virtual_columns(cur_row_))) {
LOG_WARN("Fail to fill virtual columns, ", K(ret)); LOG_WARN("Fail to fill virtual columns, ", K(ret));
} }
if (OB_FAIL(ret) || need_skip) { if (OB_FAIL(ret)) {
} else if (0 == (++scan_cnt_ % 10000) && !access_ctx_->query_flag_.is_daily_merge()) { } else if (0 == (++scan_cnt_ % 10000) && !access_ctx_->query_flag_.is_daily_merge()) {
// check if timeout or if transaction status every 10000 rows, which should be within 10ms // check if timeout or if transaction status every 10000 rows, which should be within 10ms
if (OB_FAIL(THIS_WORKER.check_status())) { if (OB_FAIL(THIS_WORKER.check_status())) {
STORAGE_LOG(WARN, "query interrupt, ", K(ret)); STORAGE_LOG(WARN, "query interrupt, ", K(ret));
} }
} }
if (OB_SUCC(ret)) { if (OB_SUCC(ret) && !need_skip) {
if (in_row.fast_filter_skipped_) { if (in_row.fast_filter_skipped_) {
in_row.fast_filter_skipped_ = false; in_row.fast_filter_skipped_ = false;
} else if (OB_FAIL(check_filtered(cur_row_, is_filter_filtered))) { } else if (OB_FAIL(check_filtered(cur_row_, is_filter_filtered))) {