This is an automated email from the ASF dual-hosted git repository.
gabriellee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new f191736bfe [bug](shuffle) Fix DCHECK failure if exchange node has
limit (#22993)
f191736bfe is described below
commit f191736bfe6151a9d7c10954b07235606068a8ec
Author: Gabriel <[email protected]>
AuthorDate: Tue Aug 15 19:14:37 2023 +0800
[bug](shuffle) Fix DCHECK failure if exchange node has limit (#22993)
---
be/src/vec/sink/vdata_stream_sender.cpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/be/src/vec/sink/vdata_stream_sender.cpp
b/be/src/vec/sink/vdata_stream_sender.cpp
index ffd15ebf14..6e01aabb0f 100644
--- a/be/src/vec/sink/vdata_stream_sender.cpp
+++ b/be/src/vec/sink/vdata_stream_sender.cpp
@@ -519,8 +519,8 @@ Status VDataStreamSender::send(RuntimeState* state, Block*
block, bool eos) {
if (serialized) {
auto cur_block = _serializer.get_block()->to_block();
if (!cur_block.empty()) {
- _serializer.serialize_block(&cur_block,
block_holder->get_block(),
- _channels.size());
+ RETURN_IF_ERROR(_serializer.serialize_block(
+ &cur_block, block_holder->get_block(),
_channels.size()));
} else {
block_holder->get_block()->Clear();
}
@@ -548,7 +548,8 @@ Status VDataStreamSender::send(RuntimeState* state, Block*
block, bool eos) {
if (serialized) {
auto cur_block = _serializer.get_block()->to_block();
if (!cur_block.empty()) {
- _serializer.serialize_block(&cur_block, _cur_pb_block,
_channels.size());
+ RETURN_IF_ERROR(_serializer.serialize_block(&cur_block,
_cur_pb_block,
+
_channels.size()));
}
Status status;
for (auto channel : _channels) {
@@ -658,7 +659,7 @@ Status VDataStreamSender::send(RuntimeState* state, Block*
block, bool eos) {
}
Status VDataStreamSender::try_close(RuntimeState* state, Status exec_status) {
- DCHECK(_serializer.get_block() == nullptr ||
_serializer.get_block()->rows() == 0);
+ _serializer.reset_block();
Status final_st = Status::OK();
for (int i = 0; i < _channels.size(); ++i) {
Status st = _channels[i]->close(state);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
