diff options
author | David Sherret <dsherret@users.noreply.github.com> | 2022-10-17 12:27:31 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-17 12:27:31 -0400 |
commit | 9df8d9d83140beb24a53b0ac52b1eaf2ea34c095 (patch) | |
tree | 3d170572b4ef2a7414db57bc223ef364fc7c0b0e /cli/npm/resolution.rs | |
parent | 60dd84a5a042fdb706d3160d1f4a1deeeeec9889 (diff) |
perf(npm): parallelize caching of npm specifier package infos (#16323)
Diffstat (limited to 'cli/npm/resolution.rs')
-rw-r--r-- | cli/npm/resolution.rs | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/cli/npm/resolution.rs b/cli/npm/resolution.rs index d53b67714..2ceaa86ab 100644 --- a/cli/npm/resolution.rs +++ b/cli/npm/resolution.rs @@ -15,6 +15,7 @@ use deno_core::parking_lot::RwLock; use serde::Deserialize; use serde::Serialize; +use super::cache::should_sync_download; use super::registry::NpmPackageInfo; use super::registry::NpmPackageVersionDistInfo; use super::registry::NpmPackageVersionInfo; @@ -386,6 +387,7 @@ impl NpmResolution { // go over the top level packages first, then down the // tree one level at a time through all the branches + let mut unresolved_tasks = Vec::with_capacity(package_reqs.len()); for package_req in package_reqs { if snapshot.package_reqs.contains_key(&package_req) { // skip analyzing this package, as there's already a matching top level package @@ -400,7 +402,24 @@ impl NpmResolution { } // no existing best version, so resolve the current packages - let info = self.api.package_info(&package_req.name).await?; + let api = self.api.clone(); + let maybe_info = if should_sync_download() { + // for deterministic test output + Some(api.package_info(&package_req.name).await) + } else { + None + }; + unresolved_tasks.push(tokio::task::spawn(async move { + let info = match maybe_info { + Some(info) => info?, + None => api.package_info(&package_req.name).await?, + }; + Result::<_, AnyError>::Ok((package_req, info)) + })); + } + + for result in futures::future::join_all(unresolved_tasks).await { + let (package_req, info) = result??; let version_and_info = get_resolved_package_version_and_info( &package_req.name, &package_req, @@ -449,9 +468,8 @@ impl NpmResolution { ordering => ordering, }); - // cache all the dependencies' registry infos in parallel when this env var isn't set - if std::env::var("DENO_UNSTABLE_NPM_SYNC_DOWNLOAD") != Ok("1".to_string()) - { + // cache all the dependencies' registry infos in parallel if should + if !should_sync_download() { let handles = deps .iter() .map(|dep| { |