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

fix get_dh_msg state errors during reentry lead to hang/core

Browse Source
This commit is contained in:
obdev
2023-03-21 16:46:11 +00:00
committed by ob-robot
parent 1deb58123c
commit d7eba01b90
11 changed files with 123 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/engine/window_function/ob_window_function_op.cpp
View File

@ -2368,7 +2368,7 @@ int ObWindowFunctionOp::rd_fetch_patch()
const ObRDWFWholeMsg *whole_msg = NULL;
if (OB_FAIL(ret)) {
} else if (OB_FAIL(handler->get_sqc_proxy().get_dh_msg(
} else if (OB_FAIL(handler->get_sqc_proxy().get_dh_msg_sync(
MY_SPEC.id_, dtl::DH_RANGE_DIST_WF_PIECE_MSG, piece_msg, whole_msg,
ctx_.get_physical_plan_ctx()->get_timeout_timestamp()))) {
LOG_WARN("get range distribute window function msg failed", K(ret));
@ -3169,7 +3169,7 @@ int ObWindowFunctionOp::get_participator_whole_msg(
piece.target_dfo_id_ = proxy.get_dfo_id();
piece.pby_hash_value_array_ = pby_hash_value_array;
if (OB_SUCC(ret)) {
if (OB_FAIL(proxy.get_dh_msg(MY_SPEC.id_, dtl::DH_SECOND_STAGE_REPORTING_WF_WHOLE_MSG,
if (OB_FAIL(proxy.get_dh_msg_sync(MY_SPEC.id_, dtl::DH_SECOND_STAGE_REPORTING_WF_WHOLE_MSG,
piece, temp_whole_msg, ctx_.get_physical_plan_ctx()->get_timeout_timestamp()))) {
LOG_WARN("fail to get reporting wf whole msg", K(ret), K(piece), KPC(temp_whole_msg));
} else if (OB_ISNULL(temp_whole_msg)) {