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

[bp2] batch patch code from 31x to opensource

Browse Source
This commit is contained in:
raywill
2021-07-29 16:30:15 +08:00
committed by wangzelin.wzl
parent 1f8ee09135
commit 79131c0cda
40 changed files with 549 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/sql/engine/px/ob_px_scheduler.cpp
View File

@ -232,7 +232,6 @@ int ObPxMsgProc::on_sqc_finish_msg(ObExecContext& ctx, const ObPxFinishSqcResult
ObDfo* edge = NULL;
ObPxSqcMeta* sqc = NULL;
ObSQLSessionInfo* session = NULL;
if (OB_ISNULL(session = ctx.get_my_session())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("NULL ptr session", K(ret));
@ -468,8 +467,26 @@ int ObPxTerminateMsgProc::on_sqc_finish_msg(ObExecContext& ctx, const ObPxFinish
LOG_TRACE("terminate msg : proc on sqc finish msg", K(pkt.rc_));
ObDfo* edge = NULL;
ObPxSqcMeta* sqc = NULL;
UNUSED(ctx);
if (OB_FAIL(coord_info_.dfo_mgr_.find_dfo_edge(pkt.dfo_id_, edge))) {
ObSQLSessionInfo* session = NULL;
if (OB_ISNULL(session = ctx.get_my_session())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("NULL ptr session", K(ret));
} else if (OB_FAIL(session->get_trans_result().merge_result(pkt.get_trans_result()))) {
LOG_WARN("fail merge result",
K(ret),
"session_trans_result",
session->get_trans_result(),
"packet_trans_result",
pkt.get_trans_result());
} else {
LOG_DEBUG("on_sqc_finish_msg trans_result",
"session_trans_result",
session->get_trans_result(),
"packet_trans_result",
pkt.get_trans_result());
}
if (OB_FAIL(ret)) {
} else if (OB_FAIL(coord_info_.dfo_mgr_.find_dfo_edge(pkt.dfo_id_, edge))) {
LOG_WARN("fail find dfo", K(pkt), K(ret));
} else if (OB_FAIL(edge->get_sqc(pkt.sqc_id_, sqc))) {
LOG_WARN("fail find sqc", K(pkt), K(ret));