This is an automated email from the ASF dual-hosted git repository. morningman pushed a commit to branch dev-1.0.1 in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
commit f9f67880b53b62863c6b151bf5668464e219687f Author: HappenLee <happen...@hotmail.com> AuthorDate: Thu Jun 16 23:56:49 2022 +0800 [Bug][Vectorized] Fix DCHECK failed in VExchangeNode close twice (#10184) Co-authored-by: lihaopeng <lihaop...@baidu.com> --- be/src/vec/exec/vexchange_node.cpp | 5 ++++- be/src/vec/exec/vunion_node.cpp | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/be/src/vec/exec/vexchange_node.cpp b/be/src/vec/exec/vexchange_node.cpp index 83c9e31b56..014716b542 100644 --- a/be/src/vec/exec/vexchange_node.cpp +++ b/be/src/vec/exec/vexchange_node.cpp @@ -95,10 +95,13 @@ Status VExchangeNode::get_next(RuntimeState* state, Block* block, bool* eos) { } Status VExchangeNode::close(RuntimeState* state) { + if (is_closed()) { + return Status::OK(); + } + if (_stream_recvr != nullptr) { _stream_recvr->close(); } - if (_is_merging) _vsort_exec_exprs.close(state); return ExecNode::close(state); diff --git a/be/src/vec/exec/vunion_node.cpp b/be/src/vec/exec/vunion_node.cpp index c05b3ef6a8..5f1bfefa17 100644 --- a/be/src/vec/exec/vunion_node.cpp +++ b/be/src/vec/exec/vunion_node.cpp @@ -213,6 +213,7 @@ Status VUnionNode::get_next(RuntimeState* state, Block* block, bool* eos) { RETURN_IF_CANCELLED(state); // RETURN_IF_ERROR(QueryMaintenance(state)); + // TODO: Rethink the logic, which cause close the exec node twice. if (_to_close_child_idx != -1) { // The previous child needs to be closed if passthrough was enabled for it. In the non // passthrough case, the child was already closed in the previous call to get_next(). --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org