[fix](multicast) should not ignore Status of block::merge

apache · Jun 5, 2024 · 8f07789 · 8f07789
1 parent 174eea7
commit 8f07789
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/be/src/pipeline/exec/multi_cast_data_stream_source.cpp b/be/src/pipeline/exec/multi_cast_data_stream_source.cpp
@@ -87,7 +87,8 @@ Status MultiCastDataStreamerSourceOperatorX::get_block(RuntimeState* state,
  if (!local_state._output_expr_contexts.empty()) {
  output_block = &tmp_block;
  }
- local_state._shared_state->multi_cast_data_streamer->pull(_consumer_id, output_block, eos);
+ RETURN_IF_ERROR(local_state._shared_state->multi_cast_data_streamer->pull(_consumer_id,
+ output_block, eos));
 
  if (!local_state._conjuncts.empty()) {
  RETURN_IF_ERROR(vectorized::VExprContext::filter_block(local_state._conjuncts, output_block,

diff --git a/be/src/pipeline/exec/multi_cast_data_streamer.cpp b/be/src/pipeline/exec/multi_cast_data_streamer.cpp
@@ -29,7 +29,7 @@ MultiCastBlock::MultiCastBlock(vectorized::Block* block, int used_count, size_t
  block->clear();
 }
 
-void MultiCastDataStreamer::pull(int sender_idx, doris::vectorized::Block* block, bool* eos) {
+Status MultiCastDataStreamer::pull(int sender_idx, doris::vectorized::Block* block, bool* eos) {
  std::lock_guard l(_mutex);
  auto& pos_to_pull = _sender_pos_to_read[sender_idx];
  if (pos_to_pull != _multi_cast_blocks.end()) {
@@ -43,14 +43,15 @@ void MultiCastDataStreamer::pull(int sender_idx, doris::vectorized::Block* block
  } else {
  pos_to_pull->_used_count--;
  pos_to_pull->_block->create_same_struct_block(0)->swap(*block);
- (void)vectorized::MutableBlock(block).merge(*pos_to_pull->_block);
+ RETURN_IF_ERROR(vectorized::MutableBlock(block).merge(*pos_to_pull->_block));
  pos_to_pull++;
  }
  }
  *eos = _eos and pos_to_pull == _multi_cast_blocks.end();
  if (pos_to_pull == _multi_cast_blocks.end()) {
  _block_reading(sender_idx);
  }
+ return Status::OK();
 }
 
 void MultiCastDataStreamer::close_sender(int sender_idx) {

diff --git a/be/src/pipeline/exec/multi_cast_data_streamer.h b/be/src/pipeline/exec/multi_cast_data_streamer.h
@@ -50,7 +50,7 @@ class MultiCastDataStreamer {
 
  ~MultiCastDataStreamer() = default;
 
- void pull(int sender_idx, vectorized::Block* block, bool* eos);
+ Status pull(int sender_idx, vectorized::Block* block, bool* eos);
 
  void close_sender(int sender_idx);