This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new fdce054f2ec [BugFix](VScanner) fix file scanner is still running when
the query is timeout/killed (#36850)
fdce054f2ec is described below
commit fdce054f2ec323af1b9c0c3067ff6cb95b8819d8
Author: GoGoWen <[email protected]>
AuthorDate: Fri Aug 2 17:41:49 2024 +0800
[BugFix](VScanner) fix file scanner is still running when the query is
timeout/killed (#36850)
---
be/src/vec/exec/scan/vfile_scanner.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/be/src/vec/exec/scan/vfile_scanner.cpp
b/be/src/vec/exec/scan/vfile_scanner.cpp
index 34e8acea8dd..68075525d56 100644
--- a/be/src/vec/exec/scan/vfile_scanner.cpp
+++ b/be/src/vec/exec/scan/vfile_scanner.cpp
@@ -235,6 +235,7 @@ void VFileScanner::_get_slot_ids(VExpr* expr,
std::vector<int>* slot_ids) {
}
Status VFileScanner::open(RuntimeState* state) {
+ RETURN_IF_CANCELLED(state);
RETURN_IF_ERROR(VScanner::open(state));
RETURN_IF_ERROR(_init_expr_ctxes());
@@ -271,6 +272,7 @@ Status VFileScanner::_get_block_impl(RuntimeState* state,
Block* block, bool* eo
// _convert_to_output_block - - - - -
- x
Status VFileScanner::_get_block_wrapped(RuntimeState* state, Block* block,
bool* eof) {
do {
+ RETURN_IF_CANCELLED(state);
if (_cur_reader == nullptr || _cur_reader_eof) {
RETURN_IF_ERROR(_get_next_reader());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
