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

implicit trx first stmt retry does not abort tx

Browse Source
This commit is contained in:
felix-w15
2023-11-27 06:51:19 +00:00
committed by ob-robot
parent 0bc0de8440
commit 13d649f400
6 changed files with 86 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/sql/ob_sql_trans_control.cpp
View File

@ -1028,6 +1028,7 @@ int ObSqlTransControl::end_stmt(ObExecContext &exec_ctx, const bool rollback)
sql::stmt::StmtType stmt_type = sql::stmt::StmtType::T_NONE;
bool is_plain_select = false;
transaction::ObTxSEQ savepoint = das_ctx.get_savepoint();
int exec_errcode = exec_ctx.get_errcode();
CK (OB_NOT_NULL(session), OB_NOT_NULL(plan_ctx));
CK (OB_NOT_NULL(plan = plan_ctx->get_phy_plan()));
@ -1053,7 +1054,7 @@ int ObSqlTransControl::end_stmt(ObExecContext &exec_ctx, const bool rollback)
} else if (rollback) {
auto stmt_expire_ts = get_stmt_expire_ts(plan_ctx, *session);
auto &touched_ls = tx_result.get_touched_ls();
OZ (txs->rollback_to_implicit_savepoint(*tx_desc, savepoint, stmt_expire_ts, &touched_ls),
OZ (txs->rollback_to_implicit_savepoint(*tx_desc, savepoint, stmt_expire_ts, &touched_ls, exec_errcode),
savepoint, stmt_expire_ts, touched_ls);
// prioritize returning session error code
if (session->is_terminate(ret)) {