Skip to content

tests: fix completion-order test with a single parser worker #470

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

Open
bryango wants to merge 2 commits into
base: main
Choose a base branch
from
Open

tests: fix completion-order test with a single parser worker #470

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea84ace
tests: fix completion-order worker guard
bryango Sep 19, 2026
b0f66da
tests: avoid duplicating target count
bryango Sep 19, 2026
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
21 changes: 13 additions & 8 deletions src-tauri/src/session_manager/cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,15 @@ where
})
}

/// Number of parser workers to use for a batch.
fn parse_worker_count(target_count: usize) -> usize {
std::thread::available_parallelism()
.map(|n| (n.get() / 2).max(1))
.unwrap_or(2)
.min(4)
.min(target_count)
}

/// Parse a fixed batch on a bounded worker pool and deliver results in actual
/// completion order. The sync channel retains at most two results per worker;
/// one slow target therefore cannot hold back unrelated completed metadata.
Expand All @@ -720,11 +729,7 @@ where
if is_cancelled() {
return Err(StreamScanStop::Cancelled);
}
let workers = std::thread::available_parallelism()
.map(|n| (n.get() / 2).max(1))
.unwrap_or(2)
.min(4)
.min(targets.len());
let workers = parse_worker_count(targets.len());
if workers <= 1 {
for target in targets {
if is_cancelled() {
Expand Down Expand Up @@ -1032,9 +1037,6 @@ mod tests {

#[test]
fn parser_results_are_delivered_in_completion_order() {
if std::thread::available_parallelism().map_or(1, |value| value.get()) < 2 {
return;
}
let targets: Vec<_> = (0..8)
.map(|index| FileScanTarget {
path: PathBuf::from(if index == 0 {
Expand All @@ -1047,6 +1049,9 @@ mod tests {
size: 1,
})
.collect();
if parse_worker_count(targets.len()) <= 1 {
return;
}
let mut completed = Vec::new();
parse_targets_completed_cancellable(
&targets,
Expand Down
Loading