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
commit 3076efcaff4096373886a848b86e295dc5b51516 Author: HHoflittlefish777 <[email protected]> AuthorDate: Sun Oct 8 17:07:30 2023 +0800 [fix](scanner) fix load cannot end when set exec_mem_limit (#25090) --- be/src/vec/exec/scan/scanner_context.cpp | 3 ++- .../suites/load_p0/stream_load/test_stream_load_properties.groovy | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/be/src/vec/exec/scan/scanner_context.cpp b/be/src/vec/exec/scan/scanner_context.cpp index a5f575d1750..b6702302e9e 100644 --- a/be/src/vec/exec/scan/scanner_context.cpp +++ b/be/src/vec/exec/scan/scanner_context.cpp @@ -52,7 +52,8 @@ ScannerContext::ScannerContext(doris::RuntimeState* state_, doris::vectorized::V _process_status(Status::OK()), _batch_size(state_->batch_size()), limit(limit_), - _max_bytes_in_queue(max_bytes_in_blocks_queue_), + _max_bytes_in_queue(std::max(max_bytes_in_blocks_queue_, (int64_t)1024) * + num_parallel_instances), _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 19e707f3851..56dcff89b6d 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]
