diff --git a/src/storage/memtable/mvcc/ob_tx_callback_list.cpp b/src/storage/memtable/mvcc/ob_tx_callback_list.cpp index 3a310d444..f8b28f1cb 100644 --- a/src/storage/memtable/mvcc/ob_tx_callback_list.cpp +++ b/src/storage/memtable/mvcc/ob_tx_callback_list.cpp @@ -214,7 +214,7 @@ int ObTxCallbackList::callback_(ObITxCallbackFunctor &functor, if (OB_FAIL(functor(iter))) { // don't print log, print it in functor } else if (functor.need_remove_callback()) { - if (removed_ && (removed_ % 1000 == 0)) { + if (removed_ && (removed_ % 10000 == 0)) { uint64_t checksum_now = batch_checksum_.calc(); TRANS_LOG(INFO, "[CallbackList] remove-callback", K(checksum_now), KPC(this)); } diff --git a/src/storage/tx/ob_tx_data_functor.cpp b/src/storage/tx/ob_tx_data_functor.cpp index 25529e77b..6dbd5a1a2 100644 --- a/src/storage/tx/ob_tx_data_functor.cpp +++ b/src/storage/tx/ob_tx_data_functor.cpp @@ -120,10 +120,15 @@ int CheckRowLockedFunctor::operator() (const ObTxData &tx_data, ObTxCCCtx *tx_cc switch (state) { case ObTxData::COMMIT: { - // Case 1: data is committed, so the lock is locked by the data and we - // also need return the commit version for tsc check + // 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 if the data is not + // rollbacked 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; } case ObTxData::RUNNING: