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

fix typo in ob_row_conflict_handler.cpp (#1723)

Browse Source
This commit is contained in:
oldcb
2023-12-05 14:28:41 +08:00
committed by GitHub
parent 6a1b08a048
commit 4d744c40bb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/storage/memtable/ob_row_conflict_handler.cpp
View File

@ -209,7 +209,7 @@ int ObRowConflictHandler::check_foreign_key_constraint_for_sstable(ObTxTableGuar
ObStoreRowLockState &lock_state) { ObStoreRowLockState &lock_state) {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
// If a transaction is committed, the trans_id of it is 0, which is invalid. // If a transaction is committed, the trans_id of it is 0, which is invalid.
// So we can not use check_row_locekd interface to get the trans_version. // So we can not use check_row_locked interface to get the trans_version.
if (!data_trans_id.is_valid()) { if (!data_trans_id.is_valid()) {
if (trans_version > snapshot_version) { if (trans_version > snapshot_version) {
ret = OB_TRANSACTION_SET_VIOLATION; ret = OB_TRANSACTION_SET_VIOLATION;
@ -277,7 +277,7 @@ int ObRowConflictHandler::post_row_read_conflict(ObMvccAccessCtx &acc_ctx,
tx_desc->add_conflict_tx(conflict_tx); tx_desc->add_conflict_tx(conflict_tx);
} }
// The addr in tx_desc is the scheduler_addr of current trans, // The addr in tx_desc is the scheduler_addr of current trans,
// and GCTX.self_addr() will retrun the addr where the row is stored // and GCTX.self_addr() will return the addr where the row is stored
// (i.e. where the trans is executing) // (i.e. where the trans is executing)
bool remote_tx = tx_desc->get_addr() != GCTX.self_addr(); bool remote_tx = tx_desc->get_addr() != GCTX.self_addr();
ObFunction<int(bool&, bool&)> recheck_func([&](bool &locked, bool &wait_on_row) -> int { ObFunction<int(bool&, bool&)> recheck_func([&](bool &locked, bool &wait_on_row) -> int {