replace ts related to ddl with scn.

This commit is contained in:
obdev
2022-11-28 02:21:13 +00:00
committed by ob-robot
parent bbec6aff49
commit 8a4d14122f
539 changed files with 17685 additions and 173434 deletions

View File

@ -399,11 +399,15 @@ 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(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);
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;
}
task_tx_desc = NULL;
}
}