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

[BUG] let is_lock_decided also works for is_row_decided

Browse Source
This commit is contained in:
Handora
2024-04-09 15:36:02 +00:00
committed by ob-robot
parent 33b8782d40
commit 3429a337ea
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/storage/memtable/mvcc/ob_tx_callback_list.cpp
View File

@ -214,7 +214,7 @@ int ObTxCallbackList::callback_(ObITxCallbackFunctor &functor,
if (OB_FAIL(functor(iter))) { if (OB_FAIL(functor(iter))) {
// don't print log, print it in functor // don't print log, print it in functor
} else if (functor.need_remove_callback()) { } else if (functor.need_remove_callback()) {
if (removed_ && (removed_ % 1000 == 0)) { if (removed_ && (removed_ % 10000 == 0)) {
uint64_t checksum_now = batch_checksum_.calc(); uint64_t checksum_now = batch_checksum_.calc();
TRANS_LOG(INFO, "[CallbackList] remove-callback", K(checksum_now), KPC(this)); TRANS_LOG(INFO, "[CallbackList] remove-callback", K(checksum_now), KPC(this));
} }

11
src/storage/tx/ob_tx_data_functor.cpp
View File

@ -120,10 +120,15 @@ int CheckRowLockedFunctor::operator() (const ObTxData &tx_data, ObTxCCCtx *tx_cc
switch (state) { switch (state) {
case ObTxData::COMMIT: { case ObTxData::COMMIT: {
// Case 1: data is committed, so the lock is locked by the data and we // Case 1: data is committed, so the lock is not locked by the data and we
// also need return the commit version for tsc check // also need return the commit version for tsc check if the data is not
// rollbacked
lock_state_.is_locked_ = false; lock_state_.is_locked_ = false;
lock_state_.trans_version_ = commit_version; if (!is_rollback) {
lock_state_.trans_version_ = commit_version;
} else {
lock_state_.trans_version_.set_min();
}
break; break;
} }
case ObTxData::RUNNING: case ObTxData::RUNNING: