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

[master][tx-route][xa] fix sanity-check for xa-commit/rollback

Browse Source
This commit is contained in:
chinaxing
2023-02-24 14:00:06 +00:00
committed by ob-robot
parent 2dae586e31
commit 2c860eae57
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/storage/tx/ob_tx_api.cpp
View File

@ -38,11 +38,11 @@
// ::rollback to savepoint::
// 1. advance In-Transaction-Clock to establish operation relation of Rollback-After-Write
// -------------------------------------------------------------------------------------------
#define TXN_API_SANITY_CHECK_FOR_TXN_FREE_ROUTE \
#define TXN_API_SANITY_CHECK_FOR_TXN_FREE_ROUTE(end_txn) \
do { \
bool inv = false; \
if (tx.is_xa_trans()) { \
inv = tx.xa_start_addr_ != self_; \
inv = end_txn ? tx.addr_ != self_ : tx.xa_start_addr_ != self_; \
} else { \
inv = tx.addr_ != self_; \
} \
@ -270,7 +270,7 @@ int ObTransService::start_tx(ObTxDesc &tx, const ObTxParam &tx_param)
int ObTransService::rollback_tx(ObTxDesc &tx)
{
TXN_API_SANITY_CHECK_FOR_TXN_FREE_ROUTE
TXN_API_SANITY_CHECK_FOR_TXN_FREE_ROUTE(true)
int ret = OB_SUCCESS;
TX_STAT_ROLLBACK_INC
ObSpinLockGuard guard(tx.lock_);
@ -405,7 +405,7 @@ int ObTransService::submit_commit_tx(ObTxDesc &tx,
ObITxCallback &cb,
const ObString *trace_info)
{
TXN_API_SANITY_CHECK_FOR_TXN_FREE_ROUTE
TXN_API_SANITY_CHECK_FOR_TXN_FREE_ROUTE(true)
int ret = OB_SUCCESS;
tx.lock_.lock();
if (tx.commit_ts_ <= 0) {