database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](exec_node) crashing caused by cancelled query in ExecNode (#30192)

Browse Source
This commit is contained in:
Jerry Hu
2024-01-22 15:04:27 +08:00
committed by yiguolei
parent 8061597f2a
commit 1b1e088e83
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
be/src/exec/exec_node.cpp
View File

@ -558,22 +558,22 @@ Status ExecNode::get_next_after_projects(
RuntimeState* state, vectorized::Block* block, bool* eos,
const std::function<Status(RuntimeState*, vectorized::Block*, bool*)>& func,
bool clear_data) {
Defer defer([block, this]() {
if (block && !block->empty()) {
COUNTER_UPDATE(_output_bytes_counter, block->allocated_bytes());
COUNTER_UPDATE(_block_count_counter, 1);
}
});
if (_output_row_descriptor) {
if (clear_data) {
clear_origin_block();
}
auto status = func(state, &_origin_block, eos);
if (UNLIKELY(!status.ok())) return status;
return do_projections(&_origin_block, block);
RETURN_IF_ERROR(func(state, &_origin_block, eos));
RETURN_IF_ERROR(do_projections(&_origin_block, block));
} else {
RETURN_IF_ERROR(func(state, block, eos));
}
_peak_memory_usage_counter->set(_mem_tracker->peak_consumption());
return func(state, block, eos);
if (block && !block->empty()) {
COUNTER_UPDATE(_output_bytes_counter, block->allocated_bytes());
COUNTER_UPDATE(_block_count_counter, 1);
}
return Status::OK();
}
Status ExecNode::sink(RuntimeState* state, vectorized::Block* input_block, bool eos) {