zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix unnecessary gitignore status updates due to failure to clear 'needs update' flag (#13471)

Browse Source 
I found this bug while investigating
https://github.com/zed-industries/zed/issues/13176. When running zed
with `RUST_LOG=worktree=trace`, I realized we were updating all
gitignore statuses on every file change. This was due to a logic error
where we were marking a gitignore as up-to-date on a temporary *clone*
of our snapshot, but not in the `BackgroundScanner` itself.

Release Notes:

- Fixed a bug that caused unnecessary computations to happen on every
file-system event.
This commit is contained in:
Max Brunsfeld 2024-06-24 10:39:08 -07:00 committed by GitHub
parent dea928b00c
commit c6c5907693
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
crates/worktree/src/worktree.rs
View File

@ -4154,54 +4154,53 @@ impl BackgroundScanner {
async fn update_ignore_statuses(&self, scan_job_tx: Sender<ScanJob>) { async fn update_ignore_statuses(&self, scan_job_tx: Sender<ScanJob>) {
use futures::FutureExt as _; use futures::FutureExt as _;
let mut snapshot = self.state.lock().snapshot.clone();
let mut ignores_to_update = Vec::new(); let mut ignores_to_update = Vec::new();
let mut ignores_to_delete = Vec::new();
let abs_path = snapshot.abs_path.clone();
for (parent_abs_path, (_, needs_update)) in &mut snapshot.ignores_by_parent_abs_path {
if let Ok(parent_path) = parent_abs_path.strip_prefix(&abs_path) {
if *needs_update {
*needs_update = false;
if snapshot.snapshot.entry_for_path(parent_path).is_some() {
ignores_to_update.push(parent_abs_path.clone());
}
}
let ignore_path = parent_path.join(&*GITIGNORE);
if snapshot.snapshot.entry_for_path(ignore_path).is_none() {
ignores_to_delete.push(parent_abs_path.clone());
}
}
}
for parent_abs_path in ignores_to_delete {
snapshot.ignores_by_parent_abs_path.remove(&parent_abs_path);
self.state
.lock()
.snapshot
.ignores_by_parent_abs_path
.remove(&parent_abs_path);
}
let (ignore_queue_tx, ignore_queue_rx) = channel::unbounded(); let (ignore_queue_tx, ignore_queue_rx) = channel::unbounded();
ignores_to_update.sort_unstable(); let prev_snapshot;
let mut ignores_to_update = ignores_to_update.into_iter().peekable(); {
while let Some(parent_abs_path) = ignores_to_update.next() { let snapshot = &mut self.state.lock().snapshot;
while ignores_to_update let abs_path = snapshot.abs_path.clone();
.peek() snapshot
.map_or(false, |p| p.starts_with(&parent_abs_path)) .ignores_by_parent_abs_path
{ .retain(|parent_abs_path, (_, needs_update)| {
ignores_to_update.next().unwrap(); if let Ok(parent_path) = parent_abs_path.strip_prefix(&abs_path) {
if *needs_update {
*needs_update = false;
if snapshot.snapshot.entry_for_path(parent_path).is_some() {
ignores_to_update.push(parent_abs_path.clone());
}
}
let ignore_path = parent_path.join(&*GITIGNORE);
if snapshot.snapshot.entry_for_path(ignore_path).is_none() {
return false;
}
}
true
});
ignores_to_update.sort_unstable();
let mut ignores_to_update = ignores_to_update.into_iter().peekable();
while let Some(parent_abs_path) = ignores_to_update.next() {
while ignores_to_update
.peek()
.map_or(false, |p| p.starts_with(&parent_abs_path))
{
ignores_to_update.next().unwrap();
}
let ignore_stack = snapshot.ignore_stack_for_abs_path(&parent_abs_path, true);
ignore_queue_tx
.send_blocking(UpdateIgnoreStatusJob {
abs_path: parent_abs_path,
ignore_stack,
ignore_queue: ignore_queue_tx.clone(),
scan_queue: scan_job_tx.clone(),
})
.unwrap();
} }
let ignore_stack = snapshot.ignore_stack_for_abs_path(&parent_abs_path, true); prev_snapshot = snapshot.clone();
smol::block_on(ignore_queue_tx.send(UpdateIgnoreStatusJob {
abs_path: parent_abs_path,
ignore_stack,
ignore_queue: ignore_queue_tx.clone(),
scan_queue: scan_job_tx.clone(),
}))
.unwrap();
} }
drop(ignore_queue_tx); drop(ignore_queue_tx);
@ -4223,7 +4222,7 @@ impl BackgroundScanner {
// Recursively process directories whose ignores have changed. // Recursively process directories whose ignores have changed.
job = ignore_queue_rx.recv().fuse() => { job = ignore_queue_rx.recv().fuse() => {
let Ok(job) = job else { break }; let Ok(job) = job else { break };
self.update_ignore_status(job, &snapshot).await; self.update_ignore_status(job, &prev_snapshot).await;
} }
} }
} }