这是indexloc提供的服务，不要输入任何密码
Skip to content

perf: cache canonicalization results at every recursion level #843

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
merged 1 commit into from
Nov 17, 2025
Merged

perf: cache canonicalization results at every recursion level #843

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
45 changes: 25 additions & 20 deletions src/cache/cache_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ impl<Fs: FileSystem> Cache<Fs> {
.map_err(ResolveError::Json)
})
.cloned();

// https://github.com/webpack/enhanced-resolve/blob/58464fc7cb56673c9aa849e68e6300239601e615/lib/DescriptionFileUtils.js#L68-L82
match &result {
Ok(Some(package_json)) => {
Expand Down Expand Up @@ -225,27 +226,17 @@ impl<Fs: FileSystem> Cache<Fs> {
///
/// <https://github.com/parcel-bundler/parcel/blob/4d27ec8b8bd1792f536811fef86e74a31fa0e704/crates/parcel-resolver/src/cache.rs#L232>
pub(crate) fn canonicalize_impl(&self, path: &CachedPath) -> Result<CachedPath, ResolveError> {
// Use get_or_init to allow multiple threads to safely canonicalize the same path.
// Only one thread will perform the actual canonicalization, others will wait for the result.
// The Result is stored inside the OnceLock to cache both success and failure cases.
let result = path.canonicalized.get_or_init(|| {
// Each canonicalization chain gets its own visited set for circular symlink detection
let mut visited =
StdHashSet::with_hasher(BuildHasherDefault::<IdentityHasher>::default());
self.canonicalize_with_visited(path, &mut visited).map(|cp| Arc::downgrade(&cp.0))
});
// Each canonicalization chain gets its own visited set for circular symlink detection
let mut visited = StdHashSet::with_hasher(BuildHasherDefault::<IdentityHasher>::default());

result.as_ref().map_err(Clone::clone).and_then(|weak| {
weak.upgrade()
.map(CachedPath)
.or_else(|| {
// Cache was cleared while canonicalizing. Fall back to direct FS canonicalize
// without caching the result to ensure we still return the resolved path.
self.fs.canonicalize(path.path()).ok().map(|canonical| self.value(&canonical))
})
.ok_or_else(|| {
io::Error::new(io::ErrorKind::NotFound, "Path no longer exists").into()
})
// canonicalize_with_visited now handles caching at every recursion level
self.canonicalize_with_visited(path, &mut visited).or_else(|err| {
// Fallback: if canonicalization fails and path's cache was cleared,
// try direct FS canonicalize without caching the result
self.fs
.canonicalize(path.path())
.map(|canonical| self.value(&canonical))
.map_err(|_| err)
})
}

Expand All @@ -255,6 +246,15 @@ impl<Fs: FileSystem> Cache<Fs> {
path: &CachedPath,
visited: &mut StdHashSet<u64, BuildHasherDefault<IdentityHasher>>,
) -> Result<CachedPath, ResolveError> {
// Check cache first - if this path was already canonicalized, return the cached result
if let Some(cached) = path.canonicalized.get() {
return cached.as_ref().map_err(Clone::clone).and_then(|weak| {
weak.upgrade().map(CachedPath).ok_or_else(|| {
io::Error::new(io::ErrorKind::NotFound, "Cached path no longer exists").into()
})
});
}

// Check for circular symlink by tracking visited paths in the current canonicalization chain
if !visited.insert(path.hash) {
return Err(io::Error::new(io::ErrorKind::NotFound, "Circular symlink").into());
Expand Down Expand Up @@ -294,6 +294,11 @@ impl<Fs: FileSystem> Cache<Fs> {
},
);

// Cache the result before removing from visited set
// This ensures parent canonicalization results are cached and reused
path.canonicalized
.get_or_init(|| res.as_ref().map(|cp| Arc::downgrade(&cp.0)).map_err(Clone::clone));

// Remove from visited set when unwinding the recursion
visited.remove(&path.hash);
res
Expand Down