Skip to content

faster algorithm for removing nested packages#8

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
mzruya merged 1 commit into from
Apr 9, 2023
Merged

faster algorithm for removing nested packages #8

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
36 changes: 20 additions & 16 deletions src/ownership/mapper/package_mapper.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,21 +117,20 @@ impl PackageMapper {
}

fn remove_nested_packages<'a>(packages: &'a [&'a Package]) -> Vec<&'a Package> {
packages
.iter()
.filter(|package| {
let package_root = package.package_root();
!packages.iter().any(|another_package| {
let another_package_root = another_package.package_root();
if package_root == another_package_root {
false
} else {
package_root.starts_with(another_package_root)
}
})
})
.copied()
.collect_vec()
let mut top_level_packages: Vec<&Package> = Vec::new();

for package in packages.iter().sorted_by_key(|package| package.package_root()) {
if let Some(last_package) = top_level_packages.last() {
let last_package_root = last_package.package_root();
if !package.package_root().starts_with(last_package_root) {
top_level_packages.push(package);
}
} else {
top_level_packages.push(package);
}
}

top_level_packages
}

#[cfg(test)]
Expand All@@ -149,7 +148,12 @@ mod tests {
owner: "owner_a".to_owned(),
},
Package {
path: Path::new("packs/a/b/package.yml").to_owned(),
path: Path::new("packs/a/b/e/package.yml").to_owned(),
package_type: PackageType::Ruby,
owner: "owner_b".to_owned(),
},
Package {
path: Path::new("packs/a/b/c/e/d/f/package.yml").to_owned(),
package_type: PackageType::Ruby,
owner: "owner_b".to_owned(),
},
Expand Down