This is an automated email from the ASF dual-hosted git repository.
dataroaring 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 f8620e33ec Revert "[fix](scanner) fix load cannot end when set
exec_mem_limit (#25090)" (#25271)
f8620e33ec is described below
commit f8620e33ec58e8c710724ffc4b25b89af838dc23
Author: zhengyu <[email protected]>
AuthorDate: Tue Oct 10 22:44:26 2023 +0800
Revert "[fix](scanner) fix load cannot end when set exec_mem_limit
(#25090)" (#25271)
This reverts commit 3076efcaff4096373886a848b86e295dc5b51516.
---
be/src/vec/exec/scan/scanner_context.cpp | 3 +--
.../suites/load_p0/stream_load/test_stream_load_properties.groovy | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/be/src/vec/exec/scan/scanner_context.cpp
b/be/src/vec/exec/scan/scanner_context.cpp
index b6702302e9..a5f575d175 100644
--- a/be/src/vec/exec/scan/scanner_context.cpp
+++ b/be/src/vec/exec/scan/scanner_context.cpp
@@ -52,8 +52,7 @@ ScannerContext::ScannerContext(doris::RuntimeState* state_,
doris::vectorized::V
_process_status(Status::OK()),
_batch_size(state_->batch_size()),
limit(limit_),
- _max_bytes_in_queue(std::max(max_bytes_in_blocks_queue_,
(int64_t)1024) *
- num_parallel_instances),
+ _max_bytes_in_queue(max_bytes_in_blocks_queue_),
_scanner_scheduler(state_->exec_env()->scanner_scheduler()),
_scanners(scanners_),
_num_parallel_instances(num_parallel_instances) {
diff --git
a/regression-test/suites/load_p0/stream_load/test_stream_load_properties.groovy
b/regression-test/suites/load_p0/stream_load/test_stream_load_properties.groovy
index 56dcff89b6..19e707f385 100644
---
a/regression-test/suites/load_p0/stream_load/test_stream_load_properties.groovy
+++
b/regression-test/suites/load_p0/stream_load/test_stream_load_properties.groovy
@@ -136,7 +136,7 @@ suite("test_stream_load_properties", "p0") {
table "stream_load_" + tableName
set 'column_separator', '|'
set 'columns', columns[i]
- set 'exec_mem_limit', '1'
+ //set 'exec_mem_limit', '1'
file files[i]
time 10000 // limit inflight 10s
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
