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

[Bug](excution) fix ScannerContext is done make query failed (#21923)

Browse Source 
fix ScannerContext is done make query failed
This commit is contained in:
Pxl
2023-07-18 17:58:00 +08:00
committed by GitHub
parent e654b5ddfc
commit 3089e4b3b6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
be/src/vec/exec/scan/pip_scanner_context.h
View File

@ -48,7 +48,7 @@ public:
set_status_on_error(Status::Cancelled("cancelled"), false);
}
if (!_process_status.ok()) {
if (!status().ok()) {
return _process_status;
}
}

6
be/src/vec/exec/scan/scanner_context.cpp
View File

@ -199,7 +199,7 @@ Status ScannerContext::get_block_from_queue(RuntimeState* state, vectorized::Blo
// Wait for block from queue
if (wait) {
SCOPED_TIMER(_scanner_wait_batch_timer);
while (!(!_blocks_queue.empty() || _is_finished || !_process_status.ok() ||
while (!(!_blocks_queue.empty() || _is_finished || !status().ok() ||
state->is_cancelled())) {
_blocks_queue_added_cv.wait(l);
}
@ -231,7 +231,7 @@ bool ScannerContext::set_status_on_error(const Status& status, bool need_lock) {
if (need_lock) {
l.lock();
}
if (_process_status.ok()) {
if (this->status().ok()) {
_process_status = status;
_status_error = true;
_blocks_queue_added_cv.notify_one();
@ -327,7 +327,7 @@ std::string ScannerContext::debug_string() {
" status: {}, _should_stop: {}, _is_finished: {}, free blocks: {},"
" limit: {}, _num_running_scanners: {}, _num_scheduling_ctx: {}, _max_thread_num: {},"
" _block_per_scanner: {}, _cur_bytes_in_queue: {}, MAX_BYTE_OF_QUEUE: {}",
ctx_id, _scanners.size(), _blocks_queue.size(), _process_status.ok(), _should_stop,
ctx_id, _scanners.size(), _blocks_queue.size(), status().ok(), _should_stop,
_is_finished, _free_blocks.size_approx(), limit, _num_running_scanners,
_num_scheduling_ctx, _max_thread_num, _block_per_scanner, _cur_bytes_in_queue,
_max_bytes_in_queue);