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

[FEAT MERGE] Phase one of 3A project

Browse Source 
Co-authored-by: rolandqi <qikai456@126.com>
Co-authored-by: yangzhifeng <yangzhifeng83@gmail.com>
This commit is contained in:
AntiTopQuark
2023-08-25 08:44:14 +00:00
committed by ob-robot
parent 56ee77a670
commit e0b1dda713
142 changed files with 15224 additions and 1314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sql/ob_sql_trans_control.cpp
View File

@ -456,14 +456,18 @@ int ObSqlTransControl::do_end_trans_(ObSQLSessionInfo *session,
LOG_WARN("fail to inc session ref", K(ret));
} else {
callback->handout();
ObActiveSessionGuard::get_stat().in_committing_ = true;
if(OB_FAIL(txs->submit_commit_tx(*tx_ptr, expire_ts, *callback, &trace_info))) {
LOG_WARN("submit commit tx fail", K(ret), KP(callback), K(expire_ts), KPC(tx_ptr));
GCTX.session_mgr_->revert_session(session);
callback->handin();
}
}
} else if (OB_FAIL(txs->commit_tx(*tx_ptr, expire_ts, &trace_info))) {
LOG_WARN("sync commit tx fail", K(ret), K(expire_ts), KPC(tx_ptr));
} else {
ACTIVE_SESSION_FLAG_SETTER_GUARD(in_committing);
if (OB_FAIL(txs->commit_tx(*tx_ptr, expire_ts, &trace_info))) {
LOG_WARN("sync commit tx fail", K(ret), K(expire_ts), KPC(tx_ptr));
}
}
}