This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 8c454a32875 [bug](scanner) Fix scanner core dump (#26156)
8c454a32875 is described below
commit 8c454a32875c97d1a651be2977128d39a382622f
Author: Gabriel <[email protected]>
AuthorDate: Tue Oct 31 22:23:32 2023 +0800
[bug](scanner) Fix scanner core dump (#26156)
---
be/src/vec/exec/scan/pip_scanner_context.h | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/be/src/vec/exec/scan/pip_scanner_context.h
b/be/src/vec/exec/scan/pip_scanner_context.h
index 8e3e00f5f4c..c74108b0cf3 100644
--- a/be/src/vec/exec/scan/pip_scanner_context.h
+++ b/be/src/vec/exec/scan/pip_scanner_context.h
@@ -76,15 +76,18 @@ public:
if (_blocks_queues[id].empty()) {
*eos = _is_finished || _should_stop;
return Status::OK();
- } else {
- *block = std::move(_blocks_queues[id].front());
- _blocks_queues[id].pop_front();
+ }
+ if (_process_status.is<ErrorCode::CANCELLED>()) {
+ *eos = true;
+ return Status::OK();
+ }
+ *block = std::move(_blocks_queues[id].front());
+ _blocks_queues[id].pop_front();
- RETURN_IF_ERROR(validate_block_schema((*block).get()));
+ RETURN_IF_ERROR(validate_block_schema((*block).get()));
- if (_blocks_queues[id].empty() && _data_dependency) {
- _data_dependency->block_reading();
- }
+ if (_blocks_queues[id].empty() && _data_dependency) {
+ _data_dependency->block_reading();
}
}
_current_used_bytes -= (*block)->allocated_bytes();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
