dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-24 12:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

perf(resolver): cache canonicalized path (#584)

Browse source
This commit is contained in:
Boshen 2023-07-22 21:13:59 +08:00 committed by GitHub
parent 585e48fe9b
commit 2bb8edb13c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
crates/oxc_resolver/src/cache.rs
View file

@ -1,7 +1,7 @@
use std::{
hash::BuildHasherDefault,
path::{Path, PathBuf},
sync::Arc,
sync::{Arc, OnceLock},
};
use dashmap::DashMap;
@ -9,6 +9,12 @@ use rustc_hash::FxHasher;
use crate::{package_json::PackageJson, FileMetadata, FileSystem, ResolveError};
#[derive(Debug, Clone, Default)]
pub struct PathData {
meta: OnceLock<Option<FileMetadata>>,
symlink: OnceLock<Option<PathBuf>>,
}
pub type PackageJsonCache = DashMap<
Box<Path>,
Result<Option<Arc<PackageJson>>, ResolveError>,
@ -17,7 +23,7 @@ pub type PackageJsonCache = DashMap<
pub struct Cache<Fs> {
fs: Fs,
cache: DashMap<Box<Path>, Option<FileMetadata>, BuildHasherDefault<FxHasher>>,
cache: DashMap<PathBuf, PathData, BuildHasherDefault<FxHasher>>,
package_json_cache: PackageJsonCache,
}
@ -37,20 +43,25 @@ impl<Fs: FileSystem> Cache<Fs> {
}
fn metadata_cached(&self, path: &Path) -> Option<FileMetadata> {
if let Some(result) = self.cache.get(path) {
return *result;
}
let file_metadata = self.fs.metadata(path).ok();
self.cache.insert(path.to_path_buf().into_boxed_path(), file_metadata);
file_metadata
*self
.cache
.entry(path.to_path_buf())
.or_default()
.meta
.get_or_init(|| self.fs.metadata(path).ok())
}
pub fn is_file(&self, path: &Path) -> bool {
self.metadata_cached(path).is_some_and(|m| m.is_file)
}
pub fn canonicalize(&self, path: PathBuf) -> PathBuf {
self.fs.canonicalize(&path).unwrap_or(path)
pub fn canonicalize(&self, path: &Path) -> Option<PathBuf> {
self.cache
.entry(path.to_path_buf())
.or_default()
.symlink
.get_or_init(|| self.fs.canonicalize(path).ok())
.clone()
}
/// # Errors

6
crates/oxc_resolver/src/lib.rs
View file

@ -89,7 +89,7 @@ impl<Fs: FileSystem> ResolverGeneric<Fs> {
result?
}
};
let path = self.load_symlink(path);
let path = self.load_symlink(&path).unwrap_or(path);
Ok(Resolution {
path,
query: request.query.map(ToString::to_string),
@ -183,8 +183,8 @@ impl<Fs: FileSystem> ResolverGeneric<Fs> {
Ok(None)
}
fn load_symlink(&self, path: PathBuf) -> PathBuf {
if self.options.symlinks { self.cache.canonicalize(path) } else { path }
fn load_symlink(&self, path: &Path) -> Option<PathBuf> {
if self.options.symlinks { self.cache.canonicalize(path) } else { None }
}
#[allow(clippy::unnecessary_wraps)]