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

fix the savepoint cannot be obtained due to session changes in the proxy scenario

Browse Source
This commit is contained in:
obdev
2023-03-02 17:39:13 +00:00
committed by ob-robot
parent 18d5e039d2
commit f0cbd4582a
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/sql/ob_sql_trans_control.cpp
View File

@ -722,7 +722,7 @@ int ObSqlTransControl::create_savepoint(ObExecContext &exec_ctx,
OZ (acquire_tx_if_need_(txs, *session)); OZ (acquire_tx_if_need_(txs, *session));
bool start_hook = false; bool start_hook = false;
OZ(start_hook_if_need_(*session, txs, start_hook)); OZ(start_hook_if_need_(*session, txs, start_hook));
OZ (txs->create_explicit_savepoint(*session->get_tx_desc(), sp_name, !session->get_xid().empty() ? session->get_sessid() : 0), sp_name); OZ (txs->create_explicit_savepoint(*session->get_tx_desc(), sp_name, get_real_session_id(*session)), sp_name);
if (start_hook) { if (start_hook) {
int tmp_ret = txs->sql_stmt_end_hook(session->get_xid(), *session->get_tx_desc()); int tmp_ret = txs->sql_stmt_end_hook(session->get_xid(), *session->get_tx_desc());
if (OB_SUCCESS != tmp_ret) { if (OB_SUCCESS != tmp_ret) {
@ -733,6 +733,11 @@ int ObSqlTransControl::create_savepoint(ObExecContext &exec_ctx,
return ret; return ret;
} }
uint32_t ObSqlTransControl::get_real_session_id(ObSQLSessionInfo &session)
{
return session.get_xid().empty() ? 0 : (session.get_proxy_sessid() != 0 ? session.get_proxy_sessid() : session.get_sessid());
}
int ObSqlTransControl::start_hook_if_need_(ObSQLSessionInfo &session, int ObSqlTransControl::start_hook_if_need_(ObSQLSessionInfo &session,
transaction::ObTransService *txs, transaction::ObTransService *txs,
bool &start_hook) bool &start_hook)
@ -762,7 +767,7 @@ int ObSqlTransControl::rollback_savepoint(ObExecContext &exec_ctx,
OX (stmt_expire_ts = get_stmt_expire_ts(plan_ctx, *session)); OX (stmt_expire_ts = get_stmt_expire_ts(plan_ctx, *session));
bool start_hook = false; bool start_hook = false;
OZ(start_hook_if_need_(*session, txs, start_hook)); OZ(start_hook_if_need_(*session, txs, start_hook));
OZ (txs->rollback_to_explicit_savepoint(*session->get_tx_desc(), sp_name, stmt_expire_ts, !session->get_xid().empty() ? session->get_sessid() : 0), sp_name); OZ (txs->rollback_to_explicit_savepoint(*session->get_tx_desc(), sp_name, stmt_expire_ts, get_real_session_id(*session)), sp_name);
if (start_hook) { if (start_hook) {
int tmp_ret = txs->sql_stmt_end_hook(session->get_xid(), *session->get_tx_desc()); int tmp_ret = txs->sql_stmt_end_hook(session->get_xid(), *session->get_tx_desc());
if (OB_SUCCESS != tmp_ret) { if (OB_SUCCESS != tmp_ret) {
@ -786,7 +791,7 @@ int ObSqlTransControl::release_savepoint(ObExecContext &exec_ctx,
OZ (acquire_tx_if_need_(txs, *session)); OZ (acquire_tx_if_need_(txs, *session));
bool start_hook = false; bool start_hook = false;
OZ(start_hook_if_need_(*session, txs, start_hook)); OZ(start_hook_if_need_(*session, txs, start_hook));
OZ (txs->release_explicit_savepoint(*session->get_tx_desc(), sp_name, !session->get_xid().empty() ? session->get_sessid() : 0), *session, sp_name); OZ (txs->release_explicit_savepoint(*session->get_tx_desc(), sp_name, get_real_session_id(*session)), *session, sp_name);
if (start_hook) { if (start_hook) {
int tmp_ret = txs->sql_stmt_end_hook(session->get_xid(), *session->get_tx_desc()); int tmp_ret = txs->sql_stmt_end_hook(session->get_xid(), *session->get_tx_desc());
if (OB_SUCCESS != tmp_ret) { if (OB_SUCCESS != tmp_ret) {

1
src/sql/ob_sql_trans_control.h
View File

@ -251,6 +251,7 @@ private:
static int start_hook_if_need_(ObSQLSessionInfo &session, static int start_hook_if_need_(ObSQLSessionInfo &session,
transaction::ObTransService *txs, transaction::ObTransService *txs,
bool &start_hook); bool &start_hook);
static uint32_t get_real_session_id(ObSQLSessionInfo &session);
public: public:
/* /*
* create a savepoint without name * create a savepoint without name