Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix FS-related issues that were causing a test failure on linux (#13072)

Browse source 
This fixes `project_tests::rescan_and_remote_updates` .

That test was actually correctly failing, revealing two bugs on Linux.

Release Notes:

- Fixed an issue where file renames were not detected on Linux.
- Fixed performance problems caused by excessive file system events on
Linux.

---------

Co-authored-by: Mikayla <mikayla@zed.dev>
This commit is contained in:
Max Brunsfeld 2024-06-14 16:03:34 -07:00 • committed by GitHub
parent fab4b01655
commit af45db6d1e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 37 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

25
crates/worktree/src/worktree.rs
View file

@ -303,7 +303,7 @@ struct BackgroundScannerState {
/// as part of the current update. These entry ids may be re-used
/// if the same inode is discovered at a new path, or if the given
/// path is re-created after being deleted.
removed_entry_ids: HashMap<u64, ProjectEntryId>,
removed_entry_ids: HashMap<(u64, SystemTime), ProjectEntryId>,
changed_paths: Vec<Arc<Path>>,
prev_snapshot: Snapshot,
}
@ -2638,10 +2638,13 @@ impl BackgroundScannerState {
}
fn reuse_entry_id(&mut self, entry: &mut Entry) {
if let Some(removed_entry_id) = self.removed_entry_ids.remove(&entry.inode) {
entry.id = removed_entry_id;
} else if let Some(existing_entry) = self.snapshot.entry_for_path(&entry.path) {
entry.id = existing_entry.id;
if let Some(mtime) = entry.mtime {
if let Some(removed_entry_id) = self.removed_entry_ids.remove(&(entry.inode, mtime)) {
eprintln!("detected that entry {entry:?} was renamed from inode and mtime reusing id {removed_entry_id:?}");
entry.id = removed_entry_id;
} else if let Some(existing_entry) = self.snapshot.entry_for_path(&entry.path) {
entry.id = existing_entry.id;
}
}
}
@ -2732,11 +2735,13 @@ impl BackgroundScannerState {
let mut entries_by_id_edits = Vec::new();
for entry in removed_entries.cursor::<()>() {
let removed_entry_id = self
.removed_entry_ids
.entry(entry.inode)
.or_insert(entry.id);
*removed_entry_id = cmp::max(*removed_entry_id, entry.id);
if let Some(mtime) = entry.mtime {
let removed_entry_id = self
.removed_entry_ids
.entry((entry.inode, mtime))
.or_insert(entry.id);
*removed_entry_id = cmp::max(*removed_entry_id, entry.id);
}
entries_by_id_edits.push(Edit::Remove(entry.id));
}
self.snapshot.entries_by_id.edit(entries_by_id_edits, &());