Store dirs cache in transaction

Author: LMG

src/cache.rs

@@ -51,6 +51,7 @@ struct Transaction2 {
     commit_map: HashMap<git2::Oid, HashMap<git2::Oid, git2::Oid>>,
     apply_map: HashMap<git2::Oid, HashMap<git2::Oid, git2::Oid>>,
     unapply_map: HashMap<git2::Oid, HashMap<git2::Oid, git2::Oid>>,
+    dir_map: HashMap<(git2::Oid, String), git2::Oid>,
     sled_trees: HashMap<git2::Oid, sled::Tree>,
     missing: Vec<(filter::Filter, git2::Oid)>,
     misses: usize,
@@ -84,6 +85,7 @@ impl Transaction {
                 commit_map: HashMap::new(),
                 apply_map: HashMap::new(),
                 unapply_map: HashMap::new(),
+                dir_map: HashMap::new(),
                 sled_trees: HashMap::new(),
                 missing: vec![],
                 misses: 0,
@@ -153,6 +155,11 @@ impl Transaction {
             .insert(from, to);
     }
 
+    pub fn insert_dir(&self, tree: (git2::Oid, String), result: git2::Oid) {
+        let mut t2 = self.t2.borrow_mut();
+        t2.dir_map.entry(tree).or_insert(result);
+    }
+
     pub fn insert_ref(
         &self,
         filter: filter::Filter,
@@ -194,6 +201,11 @@ impl Transaction {
         return None;
     }
 
+    pub fn get_dir(&self, tree: (git2::Oid, String)) -> Option<git2::Oid> {
+        let t2 = self.t2.borrow_mut();
+        return t2.dir_map.get(&tree).cloned();
+    }
+
     pub fn insert(
         &self,
         filter: filter::Filter,

src/filter/mod.rs

@@ -497,12 +497,7 @@ fn apply2<'a>(
             Ok(repo.find_tree(tree::subtract(&repo, af.id(), ba.id())?)?)
         }
 
-        Op::Dirs => tree::dirtree(
-            &repo,
-            "",
-            tree.id(),
-            &mut std::collections::HashMap::new(),
-        ),
+        Op::Dirs => tree::dirtree("", tree.id(), transaction),
 
         Op::Workspace(path) => {
             let base = to_filter(Op::Subdir(path.to_owned()));

src/filter/tree.rs

@@ -1,13 +1,13 @@
 use super::*;
 
 pub fn dirtree<'a>(
-    repo: &'a git2::Repository,
     root: &str,
     input: git2::Oid,
-    cache: &mut std::collections::HashMap<(git2::Oid, String), git2::Oid>,
+    transaction: &'a cache::Transaction,
 ) -> super::JoshResult<git2::Tree<'a>> {
-    if let Some(cached) = cache.get(&(input, root.to_string())) {
-        return Ok(repo.find_tree(*cached)?);
+    let repo = transaction.repo();
+    if let Some(cached) = transaction.get_dir((input, root.to_string())) {
+        return Ok(repo.find_tree(cached)?);
     }
 
     let tree = repo.find_tree(input)?;
@@ -32,15 +32,14 @@ pub fn dirtree<'a>(
 
         if entry.kind() == Some(git2::ObjectType::Tree) {
             let s = dirtree(
-                &repo,
                 &format!(
                     "{}{}{}",
                     root,
                     if root == "" { "" } else { "/" },
                     entry.name().ok_or(super::josh_error("no name"))?
                 ),
                 entry.id(),
-                cache,
+                transaction,
             )?
             .id();
 
@@ -72,7 +71,7 @@ pub fn dirtree<'a>(
             &result,
         )?;
     }
-    cache.insert((input, root.to_string()), result.id());
+    transaction.insert_dir((input, root.to_string()), result.id());
     return Ok(result);
 }