Fix flashback error code when read snapshot recycled

This commit is contained in:
JiahuaChen
2024-01-03 11:42:48 +00:00
committed by ob-robot
parent ebac2a6e42
commit 512e24e98e
3 changed files with 6 additions and 6 deletions

View File

@ -321,7 +321,7 @@ int ObDASScanOp::open_op()
LOG_WARN("init scan param failed", K(ret));
} else if (OB_FAIL(tsc_service.table_scan(scan_param_, result_))) {
if (OB_SNAPSHOT_DISCARDED == ret && scan_param_.fb_snapshot_.is_valid()) {
ret = OB_TABLE_DEFINITION_CHANGED;
ret = OB_INVALID_QUERY_TIMESTAMP;
} else if (OB_TRY_LOCK_ROW_CONFLICT != ret) {
LOG_WARN("fail to scan table", K(scan_param_), K(ret));
}
@ -371,7 +371,6 @@ int ObDASScanOp::release_op()
//need to clear the flag:need_switch_param_
//otherwise table_rescan will jump to the switch iterator path in retry
scan_param_.need_switch_param_ = false;
scan_param_.partition_guard_ = nullptr;
scan_param_.destroy_schema_guard();
if (retry_alloc_ != nullptr) {