Skip to content
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

perf: do not clone version information #78

Merged
merged 2 commits into from
Dec 20, 2024
Merged

perf: do not clone version information #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adafb66
perf: do not clone version information
dsherret Dec 19, 2024
fa76c59
reduce cloning in TestNpmRegistryApi as it was very noisy in benchmarks
dsherret Dec 19, 2024
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
55 changes: 28 additions & 27 deletions src/registry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ impl NpmPackageInfo {
pub fn version_info(
&self,
nv: &PackageNv,
) -> Result<NpmPackageVersionInfo, NpmPackageVersionNotFound> {
match self.versions.get(&nv.version).cloned() {
) -> Result<&NpmPackageVersionInfo, NpmPackageVersionNotFound> {
match self.versions.get(&nv.version) {
Some(version_info) => Ok(version_info),
None => Err(NpmPackageVersionNotFound(nv.clone())),
}
Expand Down Expand Up @@ -388,15 +388,15 @@ pub trait NpmRegistryApi {
/// purposes. Construct everything on the same thread.
#[derive(Clone, Default, Debug)]
pub struct TestNpmRegistryApi {
package_infos: Rc<RefCell<HashMap<String, NpmPackageInfo>>>,
package_infos: Rc<RefCell<HashMap<String, Arc<NpmPackageInfo>>>>,
}

impl TestNpmRegistryApi {
pub fn add_package_info(&self, name: &str, info: NpmPackageInfo) {
let previous = self
.package_infos
.borrow_mut()
.insert(name.to_string(), info);
.insert(name.to_string(), Arc::new(info));
assert!(previous.is_none());
}

Expand All @@ -415,8 +415,9 @@ impl TestNpmRegistryApi {
pub fn with_package(&self, name: &str, f: impl FnOnce(&mut NpmPackageInfo)) {
self.ensure_package(name);
let mut infos = self.package_infos.borrow_mut();
let info = infos.get_mut(name).unwrap();
f(info);
let mut info = infos.get_mut(name).unwrap().as_ref().clone();
f(&mut info);
infos.insert(name.to_string(), Arc::new(info));
}

pub fn add_dist_tag(&self, package_name: &str, tag: &str, version: &str) {
Expand All @@ -438,22 +439,22 @@ impl TestNpmRegistryApi {
integrity: Option<&str>,
) {
self.ensure_package(name);
let mut infos = self.package_infos.borrow_mut();
let info = infos.get_mut(name).unwrap();
let version = Version::parse_from_npm(version).unwrap();
if !info.versions.contains_key(&version) {
info.versions.insert(
version.clone(),
NpmPackageVersionInfo {
version,
dist: NpmPackageVersionDistInfo {
integrity: integrity.map(|s| s.to_string()),
self.with_package(name, |info| {
let version = Version::parse_from_npm(version).unwrap();
if !info.versions.contains_key(&version) {
info.versions.insert(
version.clone(),
NpmPackageVersionInfo {
version,
dist: NpmPackageVersionDistInfo {
integrity: integrity.map(|s| s.to_string()),
..Default::default()
},
..Default::default()
},
..Default::default()
},
);
}
);
}
})
}

pub fn with_version_info(
Expand All @@ -463,11 +464,11 @@ impl TestNpmRegistryApi {
) {
let (name, version) = package;
self.ensure_package_version(name, version);
let mut infos = self.package_infos.borrow_mut();
let info = infos.get_mut(name).unwrap();
let version = Version::parse_from_npm(version).unwrap();
let version_info = info.versions.get_mut(&version).unwrap();
f(version_info);
self.with_package(name, |info| {
let version = Version::parse_from_npm(version).unwrap();
let version_info = info.versions.get_mut(&version).unwrap();
f(version_info);
});
}

pub fn add_dependency(&self, package: (&str, &str), entry: (&str, &str)) {
Expand Down Expand Up @@ -537,11 +538,11 @@ impl NpmRegistryApi for TestNpmRegistryApi {
name: &str,
) -> Result<Arc<NpmPackageInfo>, NpmRegistryPackageInfoLoadError> {
let infos = self.package_infos.borrow();
Ok(Arc::new(infos.get(name).cloned().ok_or_else(|| {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This clone was very noisy in benchmarks. It was causing a benchmark to run in 115ms instead of 10ms.

Ok(infos.get(name).cloned().ok_or_else(|| {
NpmRegistryPackageInfoLoadError::PackageNotExists {
package_name: name.into(),
}
})?))
})?)
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/resolution/graph.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -971,7 +971,7 @@ impl<'a, TNpmRegistryApi: NpmRegistryApi>
let version_info = package_info
.version_info(&pkg_nv)
.map_err(NpmPackageVersionResolutionError::VersionNotFound)?;
self.dep_entry_cache.store(pkg_nv.clone(), &version_info)?
self.dep_entry_cache.store(pkg_nv.clone(), version_info)?
};

(pkg_nv, deps)
Expand Down
25 changes: 16 additions & 9 deletions src/resolution/snapshot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -882,7 +882,7 @@ pub fn incomplete_snapshot_from_lockfile(
})
}

#[derive(Debug, Error)]
#[derive(Debug, Clone, Error)]
#[error("Integrity check failed for package: \"{package_display_id}\". Unable to verify that the package
is the same as when the lockfile was generated.

Expand All @@ -902,7 +902,7 @@ pub struct IntegrityCheckFailedError {
pub filename: String,
}

#[derive(Debug, Error)]
#[derive(Debug, Error, Clone)]
pub enum SnapshotFromLockfileError {
#[error(transparent)]
PackageInfoLoad(#[from] NpmRegistryPackageInfoLoadError),
Expand Down Expand Up @@ -947,15 +947,21 @@ pub async fn snapshot_from_lockfile<'a>(
.package_info(&nv.name)
.await
.map_err(SnapshotFromLockfileError::PackageInfoLoad)?;
package_info
.version_info(nv)
.map_err(|e| SnapshotFromLockfileError::VersionNotFound { source: e })
Ok((package_info, nv))
}))
};
let mut version_infos = get_version_infos();
let mut i = 0;
let mut packages = Vec::with_capacity(incomplete_snapshot.packages.len());
while let Some(result) = version_infos.next().await {
let result = result
.as_ref()
.map_err(|e: &SnapshotFromLockfileError| e.clone())
.and_then(|(package_info, nv)| {
package_info
.version_info(nv)
.map_err(|e| SnapshotFromLockfileError::VersionNotFound { source: e })
});
match result {
Ok(version_info) => {
let snapshot_package = &incomplete_snapshot.packages[i];
Expand All @@ -982,14 +988,15 @@ pub async fn snapshot_from_lockfile<'a>(
packages.push(SerializedNpmResolutionSnapshotPackage {
id: snapshot_package.id.clone(),
dependencies: snapshot_package.dependencies.clone(),
dist: version_info.dist,
dist: version_info.dist.clone(),
system: NpmResolutionPackageSystemInfo {
cpu: version_info.cpu,
os: version_info.os,
cpu: version_info.cpu.clone(),
os: version_info.os.clone(),
},
optional_dependencies: version_info
.optional_dependencies
.into_keys()
.keys()
.cloned()
.collect(),
bin: version_info.bin.clone(),
scripts: version_info.scripts.clone(),
Expand Down
Loading