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

[cp]fix: fix nested session restore bug

Browse Source
This commit is contained in:
obdev
2023-07-07 08:54:10 +00:00
committed by ob-robot
parent 0440420b8c
commit c08774b940
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/sql/session/ob_basic_session_info.cpp
View File

@ -5804,10 +5804,17 @@ int ObBasicSessionInfo::base_restore_session(BaseSavedValue &saved_value)
int ObBasicSessionInfo::stmt_restore_session(StmtSavedValue &saved_value) int ObBasicSessionInfo::stmt_restore_session(StmtSavedValue &saved_value)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
OX (thread_data_.cur_query_start_time_ = saved_value.cur_query_start_time_); int tmp_ret = OB_SUCCESS;
OZ (tx_result_.merge_result(saved_value.tx_result_)); thread_data_.cur_query_start_time_ = saved_value.cur_query_start_time_;
OZ (base_restore_session(saved_value)); if (OB_TMP_FAIL(tx_result_.merge_result(saved_value.tx_result_))) {
OX (stmt_type_ = saved_value.stmt_type_); LOG_WARN("failed to merge trans result", K(tmp_ret));
ret = COVER_SUCC(tmp_ret);
}
if (OB_TMP_FAIL(base_restore_session(saved_value))) {
LOG_WARN("failed to restore base session", K(tmp_ret));
ret = COVER_SUCC(tmp_ret);
}
stmt_type_ = saved_value.stmt_type_;
return ret; return ret;
} }
@ -5846,15 +5853,22 @@ int ObBasicSessionInfo::trans_save_session(TransSavedValue &saved_value)
int ObBasicSessionInfo::trans_restore_session(TransSavedValue &saved_value) int ObBasicSessionInfo::trans_restore_session(TransSavedValue &saved_value)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
int tmp_ret = OB_SUCCESS;
LockGuard lock_guard(thread_data_mutex_); LockGuard lock_guard(thread_data_mutex_);
OX (nested_count_ = saved_value.nested_count_); nested_count_ = saved_value.nested_count_;
OX (trans_flags_ = saved_value.trans_flags_); trans_flags_ = saved_value.trans_flags_;
/* /*
* restore means switch to saved transaction context, drop current one. * restore means switch to saved transaction context, drop current one.
*/ */
OZ (tx_result_.assign(saved_value.tx_result_)); if (OB_TMP_FAIL(tx_result_.assign(saved_value.tx_result_))) {
OX (tx_desc_ = saved_value.tx_desc_); LOG_WARN("failed to assign trans result", K(tmp_ret));
OZ (base_restore_session(saved_value)); ret = COVER_SUCC(tmp_ret);
}
tx_desc_ = saved_value.tx_desc_;
if (OB_TMP_FAIL(base_restore_session(saved_value))) {
LOG_WARN("failed to restore base session", K(tmp_ret));
ret = COVER_SUCC(tmp_ret);
}
return ret; return ret;
} }