This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new a5f27c5b281 branch-2.1: [fix](scan) Fix scan with limit #46035 (#46091)
a5f27c5b281 is described below
commit a5f27c5b281aa7761bb0827427ae4864a96fb572
Author: zhiqiang <[email protected]>
AuthorDate: Fri Dec 27 16:41:58 2024 +0800
branch-2.1: [fix](scan) Fix scan with limit #46035 (#46091)
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 10c149ca4af..9354c098c97 100644
--- a/be/src/pipeline/exec/scan_operator.cpp
+++ b/be/src/pipeline/exec/scan_operator.cpp
@@ -1228,15 +1228,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: [email protected]
For additional commands, e-mail: [email protected]
