fix: Avoid the dashmap being cloned for each thread (#67)

Intead, share it by reference, it's sync after all. This issue was introduced when switching to a `Send + Clone` model, instead of `Send + Sync`, to allow thread-local caches in database handles of all kinds.
Byron · Dec 6, 2021 · 6d3f52d · 6d3f52d
1 parent bcb3d37
commit 6d3f52d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/git-pack/src/data/output/count/objects/mod.rs b/git-pack/src/data/output/count/objects/mod.rs
@@ -86,17 +86,18 @@ where
             }
         },
         {
+            let seen_objs = &seen_objs;
             move |oids: Vec<std::result::Result<Oid, IterErr>>, (buf1, buf2, progress)| {
                 expand::this(
                     &db,
                     input_object_expansion,
-                    &seen_objs,
+                    seen_objs,
                     oids,
                     buf1,
                     buf2,
                     progress,
                     should_interrupt,
-                    true,
+                    true, /*allow pack lookups*/
                 )
             }
         },
@@ -129,7 +130,7 @@ where
         &mut buf2,
         &mut progress,
         should_interrupt,
-        false,
+        false, /*allow pack lookups*/
     )
 }
 

diff --git a/gitoxide-core/src/pack/create.rs b/gitoxide-core/src/pack/create.rs
@@ -185,8 +185,7 @@ where
     let counts = {
         let mut progress = progress.add_child("counting");
         progress.init(None, progress::count("objects"));
-        let may_use_multiple_threads = (nondeterministic_count || matches!(expansion, ObjectExpansion::None))
-            && !matches!(expansion, ObjectExpansion::TreeDiff);
+        let may_use_multiple_threads = nondeterministic_count || matches!(expansion, ObjectExpansion::None);
         let thread_limit = if may_use_multiple_threads {
             thread_limit
         } else {