ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

working copy: use MergedTree::diff_stream()

Browse source 
This will make it a little faster to update the working copy at Google
once we've made `MergedTree::diff_stream()` fetch trees
concurrently. (It only makes it a little faster because we still fetch
files serially.)
This commit is contained in:
Martin von Zweigbergk 2023-11-01 21:36:13 -07:00 committed by Martin von Zweigbergk
parent 72245cfac5
commit 904c37d36d
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/src/local_working_copy.rs
View file

@ -30,6 +30,7 @@ use std::sync::mpsc::{channel, Sender};
use std::sync::Arc; use std::sync::Arc;
use std::time::UNIX_EPOCH; use std::time::UNIX_EPOCH;
use futures::StreamExt;
use itertools::Itertools; use itertools::Itertools;
use once_cell::unsync::OnceCell; use once_cell::unsync::OnceCell;
use pollster::FutureExt; use pollster::FutureExt;
@ -1099,7 +1100,9 @@ impl TreeState {
}, },
other => CheckoutError::InternalBackendError(other), other => CheckoutError::InternalBackendError(other),
})?; })?;
let stats = self.update(&old_tree, new_tree, self.sparse_matcher().as_ref())?; let stats = self
.update(&old_tree, new_tree, self.sparse_matcher().as_ref())
.block_on()?;
self.tree_id = new_tree.id(); self.tree_id = new_tree.id();
Ok(stats) Ok(stats)
} }
@ -1119,8 +1122,10 @@ impl TreeState {
let added_matcher = DifferenceMatcher::new(&new_matcher, &old_matcher); let added_matcher = DifferenceMatcher::new(&new_matcher, &old_matcher);
let removed_matcher = DifferenceMatcher::new(&old_matcher, &new_matcher); let removed_matcher = DifferenceMatcher::new(&old_matcher, &new_matcher);
let empty_tree = MergedTree::resolved(Tree::null(self.store.clone(), RepoPath::root())); let empty_tree = MergedTree::resolved(Tree::null(self.store.clone(), RepoPath::root()));
let added_stats = self.update(&empty_tree, &tree, &added_matcher)?; let added_stats = self.update(&empty_tree, &tree, &added_matcher).block_on()?;
let removed_stats = self.update(&tree, &empty_tree, &removed_matcher)?; let removed_stats = self
.update(&tree, &empty_tree, &removed_matcher)
.block_on()?;
self.sparse_patterns = sparse_patterns; self.sparse_patterns = sparse_patterns;
assert_eq!(added_stats.updated_files, 0); assert_eq!(added_stats.updated_files, 0);
assert_eq!(added_stats.removed_files, 0); assert_eq!(added_stats.removed_files, 0);
@ -1135,7 +1140,7 @@ impl TreeState {
}) })
} }
fn update( async fn update(
&mut self, &mut self,
old_tree: &MergedTree, old_tree: &MergedTree,
new_tree: &MergedTree, new_tree: &MergedTree,
@ -1149,7 +1154,8 @@ impl TreeState {
removed_files: 0, removed_files: 0,
skipped_files: 0, skipped_files: 0,
}; };
for (path, diff) in old_tree.diff(new_tree, matcher) { let mut diff_stream = old_tree.diff_stream(new_tree, matcher);
while let Some((path, diff)) = diff_stream.next().await {
let (before, after) = diff?; let (before, after) = diff?;
if after.is_absent() { if after.is_absent() {
stats.removed_files += 1; stats.removed_files += 1;
@ -1216,7 +1222,7 @@ impl TreeState {
Ok(stats) Ok(stats)
} }
pub fn reset(&mut self, new_tree: &MergedTree) -> Result<(), ResetError> { pub async fn reset(&mut self, new_tree: &MergedTree) -> Result<(), ResetError> {
let old_tree = self.current_tree().map_err(|err| match err { let old_tree = self.current_tree().map_err(|err| match err {
err @ BackendError::ObjectNotFound { .. } => ResetError::SourceNotFound { err @ BackendError::ObjectNotFound { .. } => ResetError::SourceNotFound {
source: Box::new(err), source: Box::new(err),
@ -1224,7 +1230,9 @@ impl TreeState {
other => ResetError::InternalBackendError(other), other => ResetError::InternalBackendError(other),
})?; })?;
for (path, diff) in old_tree.diff(new_tree, self.sparse_matcher().as_ref()) { let matcher = self.sparse_matcher();
let mut diff_stream = old_tree.diff_stream(new_tree, matcher.as_ref());
while let Some((path, diff)) = diff_stream.next().await {
let (_before, after) = diff?; let (_before, after) = diff?;
if after.is_absent() { if after.is_absent() {
self.file_states.remove(&path); self.file_states.remove(&path);
@ -1547,7 +1555,8 @@ impl LockedWorkingCopy for LockedLocalWorkingCopy {
message: "Failed to read the working copy state".to_string(), message: "Failed to read the working copy state".to_string(),
err: err.into(), err: err.into(),
})? })?
.reset(new_tree)?; .reset(new_tree)
.block_on()?;
self.tree_state_dirty = true; self.tree_state_dirty = true;
Ok(()) Ok(())
} }