Skip to content

[opt](multi-catalog) Optimize remote scan concurrency. #51415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
morningman merged 1 commit into from
Jun 5, 2025
Merged

[opt](multi-catalog) Optimize remote scan concurrency. #51415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions be/src/pipeline/exec/file_scan_operator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ Status FileScanLocalState::_init_scanners(std::list<vectorized::ScannerSPtr>* sc

auto& p = _parent->cast<FileScanOperatorX>();
// There's only one scan range for each backend in batch split mode. Each backend only starts up one ScanNode instance.
uint32_t shard_num =
std::min(config::doris_scanner_thread_pool_thread_num / p.query_parallel_instance_num(),
_max_scanners);
uint32_t shard_num = std::min(vectorized::ScannerScheduler::get_remote_scan_thread_num() /
p.query_parallel_instance_num(),
_max_scanners);
shard_num = std::max(shard_num, 1U);
_kv_cache.reset(new vectorized::ShardedKVCache(shard_num));
for (int i = 0; i < _max_scanners; ++i) {
Expand All @@ -65,9 +65,8 @@ void FileScanLocalState::set_scan_ranges(RuntimeState* state,
auto& p = _parent->cast<FileScanOperatorX>();

auto calc_max_scanners = [&](int parallel_instance_num) -> int {
int max_scanners = config::doris_scanner_thread_pool_thread_num / parallel_instance_num;
max_scanners =
std::max(std::max(max_scanners, state->parallel_scan_max_scanners_count()), 1);
int max_scanners =
vectorized::ScannerScheduler::get_remote_scan_thread_num() / parallel_instance_num;
if (should_run_serial()) {
max_scanners = 1;
}
Expand Down
11 changes: 6 additions & 5 deletions be/src/vec/exec/scan/scanner_scheduler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,11 +402,12 @@ void ScannerScheduler::_scanner_scan(std::shared_ptr<ScannerContext> ctx,
}

int ScannerScheduler::get_remote_scan_thread_num() {
int remote_max_thread_num = config::doris_max_remote_scanner_thread_pool_thread_num != -1
? config::doris_max_remote_scanner_thread_pool_thread_num
: std::max(512, CpuInfo::num_cores() * 10);
remote_max_thread_num =
std::max(remote_max_thread_num, config::doris_scanner_thread_pool_thread_num);
static int remote_max_thread_num = []() {
int num = config::doris_max_remote_scanner_thread_pool_thread_num != -1
? config::doris_max_remote_scanner_thread_pool_thread_num
: std::max(512, CpuInfo::num_cores() * 10);
return std::max(num, config::doris_scanner_thread_pool_thread_num);
}();
return remote_max_thread_num;
}

Expand Down
Loading