This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 395b469aed5 branch-3.0: [fix](scan) Fix scan with limit #46035 (#46090)
395b469aed5 is described below
commit 395b469aed545877277c600f6cc8f032e4ee0514
Author: zhiqiang <hezhiqi...@selectdb.com>
AuthorDate: Tue Dec 31 21:49:43 2024 +0800
branch-3.0: [fix](scan) Fix scan with limit #46035 (#46090)
cherry pick from #46035
---
be/src/pipeline/exec/scan_operator.cpp | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/be/src/pipeline/exec/scan_operator.cpp
b/be/src/pipeline/exec/scan_operator.cpp
index a59098c0fee..37b9b8f59cf 100644
--- a/be/src/pipeline/exec/scan_operator.cpp
+++ b/be/src/pipeline/exec/scan_operator.cpp
@@ -1203,15 +1203,12 @@ Status ScanOperatorX<LocalStateType>::init(const
TPlanNode& tnode, RuntimeState*
// The set of enable_adaptive_pipeline_task_serial_read_on_limit
// is checked in previous branch.
if (query_options.enable_adaptive_pipeline_task_serial_read_on_limit) {
- int32_t adaptive_pipeline_task_serial_read_on_limit =
- ADAPTIVE_PIPELINE_TASK_SERIAL_READ_ON_LIMIT_DEFAULT;
- if
(query_options.__isset.adaptive_pipeline_task_serial_read_on_limit) {
- adaptive_pipeline_task_serial_read_on_limit =
-
query_options.adaptive_pipeline_task_serial_read_on_limit;
- }
-
- if (tnode.limit > 0 && tnode.limit <=
adaptive_pipeline_task_serial_read_on_limit) {
- _should_run_serial = true;
+
DCHECK(query_options.__isset.adaptive_pipeline_task_serial_read_on_limit);
+ if (!tnode.__isset.conjuncts || tnode.conjuncts.empty()) {
+ if (tnode.limit > 0 &&
+ tnode.limit <=
query_options.adaptive_pipeline_task_serial_read_on_limit) {
+ _should_run_serial = true;
+ }
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
