itsscb/walkdir
1
0
Fork 0
mirror of https://github.com/BurntSushi/walkdir.git synced 2025-09-29 22:50:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

performance: fix regression

Browse Source 
This commit fixes a performance regression introduced in commit 0f4441,
which aimed to fix OneDrive traversals. In particular, we added an
additional stat call to every directory entry, which can be quite
disastrous for performance. We fix this by being more fastidious about
reusing the Metadata that comes from fs::DirEntry, which is, conveniently,
cheap to acquire specifically on Windows.

The performance regression was reported against ripgrep:
https://github.com/BurntSushi/ripgrep/issues/820
This commit is contained in:
Andrew Gallant 2018-02-20 19:07:29 -05:00
parent e3223962fe
commit ddac44a82a
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib.rs
View File

@ -1005,6 +1005,20 @@ impl DirEntry {
/// [`std::fs::metadata`]: https://doc.rust-lang.org/std/fs/fn.metadata.html
/// [`std::fs::symlink_metadata`]: https://doc.rust-lang.org/stable/std/fs/fn.symlink_metadata.html
pub fn metadata(&self) -> Result<fs::Metadata> {
self.metadata_internal()
}
#[cfg(windows)]
fn metadata_internal(&self) -> Result<fs::Metadata> {
if self.follow_link {
fs::metadata(&self.path)
} else {
Ok(self.metadata.clone())
}.map_err(|err| Error::from_entry(self, err))
}
#[cfg(not(windows))]
fn metadata_internal(&self) -> Result<fs::Metadata> {
if self.follow_link {
fs::metadata(&self.path)
} else {
@ -1064,7 +1078,7 @@ impl DirEntry {
let ty = ent.file_type().map_err(|err| {
Error::from_path(depth, path.clone(), err)
})?;
let md = fs::metadata(&path).map_err(|err| {
let md = ent.metadata().map_err(|err| {
Error::from_path(depth, path.clone(), err)
})?;
Ok(DirEntry {