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

[scn] fix failure of mittest after refresh feature scn

Browse Source
This commit is contained in:
obdev
2022-11-28 01:46:42 +00:00
committed by ob-robot
parent 49a02f3304
commit 54b64a7263
1898 changed files with 255804 additions and 280809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/sql/engine/px/ob_px_sqc_proxy.cpp
View File

@ -399,15 +399,11 @@ int ObPxSQCProxy::report(int end_ret) const
finish_msg.dml_row_info_.add_px_dml_row_info(task.dml_row_info_);
finish_msg.temp_table_id_ = task.temp_table_id_;
if (OB_NOT_NULL(session)) {
transaction::ObTxDesc *&sqc_tx_desc = session->get_tx_desc();
transaction::ObTxDesc *sqc_tx_desc = session->get_tx_desc();
transaction::ObTxDesc *&task_tx_desc = tasks.at(i).get_tx_desc();
if (OB_NOT_NULL(task_tx_desc)) {
if (OB_NOT_NULL(sqc_tx_desc)) {
(void)MTL(transaction::ObTransService*)->merge_tx_state(*sqc_tx_desc, *task_tx_desc);
(void)MTL(transaction::ObTransService*)->release_tx(*task_tx_desc);
} else {
sqc_tx_desc = task_tx_desc;
}
if (OB_NOT_NULL(sqc_tx_desc) && OB_NOT_NULL(task_tx_desc)) {
(void)MTL(transaction::ObTransService*)->merge_tx_state(*sqc_tx_desc, *task_tx_desc);
(void)MTL(transaction::ObTransService*)->release_tx(*task_tx_desc);
task_tx_desc = NULL;
}
}