change!: Remove deprecated compound and linked object databases

The dynamic/general store is the only maintained can-do-it-all
DB now.

Author: Byron

experiments/object-access/src/main.rs

@@ -1,4 +1,4 @@
-use std::{path::Path, sync::Arc, time::Instant};
+use std::{path::Path, time::Instant};
 
 use anyhow::anyhow;
 use git_repository::{hash::ObjectId, odb, threading::OwnShared, ThreadSafeRepository};
@@ -67,21 +67,6 @@ fn main() -> anyhow::Result<()> {
         objs_per_sec(elapsed)
     );
 
-    let start = Instant::now();
-    do_gitoxide_in_parallel_through_arc(
-        &hashes,
-        repo.objects_dir(),
-        odb::pack::cache::Never::default,
-        AccessMode::ObjectExists,
-    )?;
-    let elapsed = start.elapsed();
-    println!(
-        "parallel gitoxide (Arc): confirmed {} objects exists in {:?} ({:0.0} objects/s)",
-        hashes.len(),
-        elapsed,
-        objs_per_sec(elapsed)
-    );
-
     let start = Instant::now();
     do_parallel_git2(hashes.as_slice(), repo.git_dir(), AccessMode::ObjectExists)?;
     let elapsed = start.elapsed();
@@ -161,21 +146,6 @@ fn main() -> anyhow::Result<()> {
         objs_per_sec(elapsed)
     );
 
-    let start = Instant::now();
-    let bytes = do_gitoxide_in_parallel_through_arc(
-        &hashes,
-        repo.objects_dir(),
-        odb::pack::cache::Never::default,
-        AccessMode::ObjectData,
-    )?;
-    let elapsed = start.elapsed();
-    println!(
-        "parallel gitoxide (uncached, Arc): confirmed {} bytes in {:?} ({:0.0} objects/s)",
-        bytes,
-        elapsed,
-        objs_per_sec(elapsed)
-    );
-
     let start = Instant::now();
     let bytes = do_gitoxide_in_parallel_sync(
         &hashes,
@@ -430,49 +400,3 @@ where
     )?;
     Ok((store, bytes.load(std::sync::atomic::Ordering::Acquire)))
 }
-
-fn do_gitoxide_in_parallel_through_arc<C>(
-    hashes: &[ObjectId],
-    objects_dir: &Path,
-    new_cache: impl Fn() -> C + Send + Sync + Clone + 'static,
-    mode: AccessMode,
-) -> anyhow::Result<u64>
-where
-    C: odb::pack::cache::DecodeEntry + Send + 'static,
-{
-    use git_repository::prelude::FindExt;
-    let bytes = std::sync::atomic::AtomicU64::default();
-    #[allow(deprecated)]
-    let odb = Arc::new(odb::linked::Store::at(objects_dir)?);
-
-    git_repository::parallel::in_parallel(
-        hashes.chunks(1000),
-        None,
-        move |_| {
-            (
-                Vec::new(),
-                odb.to_cache_arc().with_pack_cache({
-                    let new_cache = new_cache.clone();
-                    move || Box::new(new_cache())
-                }),
-            )
-        },
-        |hashes, (buf, odb)| {
-            for hash in hashes {
-                match mode {
-                    AccessMode::ObjectData => {
-                        let obj = odb.find(hash, buf)?;
-                        bytes.fetch_add(obj.data.len() as u64, std::sync::atomic::Ordering::Relaxed);
-                    }
-                    AccessMode::ObjectExists => {
-                        use git_repository::prelude::Find;
-                        assert!(odb.contains(hash), "each traversed object exists");
-                    }
-                }
-            }
-            Ok(())
-        },
-        git_repository::parallel::reduce::IdentityWithResult::<(), anyhow::Error>::default(),
-    )?;
-    Ok(bytes.load(std::sync::atomic::Ordering::Acquire))
-}

git-diff/tests/visit/mod.rs

@@ -4,14 +4,14 @@ mod changes {
         use git_diff::tree::{recorder, recorder::Change::*};
         use git_hash::{oid, ObjectId};
         use git_object::{bstr::ByteSlice, tree::EntryMode, TreeRefIter};
-        use git_odb::{linked, pack::Find};
+        use git_odb::pack::Find;
 
         use crate::hex_to_id;
 
         type Changes = Vec<recorder::Change>;
 
-        fn db(args: impl IntoIterator<Item = &'static str>) -> crate::Result<linked::Store> {
-            linked::Store::at(
+        fn db(args: impl IntoIterator<Item = &'static str>) -> crate::Result<git_odb::Handle> {
+            git_odb::at(
                 git_testtools::scripted_fixture_repo_read_only_with_args("make_diff_repo.sh", args)?
                     .join(".git")
                     .join("objects"),
@@ -20,7 +20,7 @@ mod changes {
         }
 
         fn locate_tree_by_commit<'a>(
-            db: &linked::Store,
+            db: &git_odb::Handle,
             commit: &oid,
             buf: &'a mut Vec<u8>,
         ) -> crate::Result<TreeRefIter<'a>> {
@@ -41,7 +41,7 @@ mod changes {
                 .expect("id to be a tree"))
         }
 
-        fn diff_commits(db: &linked::Store, lhs: impl Into<Option<ObjectId>>, rhs: &oid) -> crate::Result<Changes> {
+        fn diff_commits(db: &git_odb::Handle, lhs: impl Into<Option<ObjectId>>, rhs: &oid) -> crate::Result<Changes> {
             let mut buf = Vec::new();
             let lhs_tree = lhs
                 .into()
@@ -63,7 +63,7 @@ mod changes {
             Ok(recorder.records)
         }
 
-        fn diff_with_previous_commit_from(db: &linked::Store, commit_id: &oid) -> crate::Result<Changes> {
+        fn diff_with_previous_commit_from(db: &git_odb::Handle, commit_id: &oid) -> crate::Result<Changes> {
             let mut buf = Vec::new();
             let (main_tree_id, parent_commit_id) = {
                 let commit = db
@@ -111,11 +111,10 @@ mod changes {
             Ok(recorder.records)
         }
 
-        fn head_of(db: &linked::Store) -> ObjectId {
+        fn head_of(db: &git_odb::Handle) -> ObjectId {
             ObjectId::from_hex(
                 std::fs::read(
-                    db.dbs[0]
-                        .loose
+                    db.store_ref()
                         .path()
                         .parent()
                         .unwrap()
@@ -130,7 +129,7 @@ mod changes {
             .expect("valid hex id")
         }
 
-        fn all_commits(db: &linked::Store) -> Vec<ObjectId> {
+        fn all_commits(db: &git_odb::Handle) -> Vec<ObjectId> {
             use git_traverse::commit;
 
             let head = head_of(db);

git-odb/src/lib.rs

@@ -9,8 +9,6 @@
 //! * loose object reading and writing
 //! * access to packed objects
 //! * multiple loose objects and pack locations as gathered from `alternates` files.
-// TODO: actually remove the deprecated items and remove thos allow
-#![allow(deprecated)]
 
 use std::{
     cell::RefCell,
@@ -23,7 +21,7 @@ use git_features::{threading::OwnShared, zlib::stream::deflate};
 pub use git_pack as pack;
 
 mod store_impls;
-pub use store_impls::{compound, dynamic as store, linked, loose};
+pub use store_impls::{dynamic as store, loose};
 
 pub mod alternate;
 

git-odb/src/store_impls/compound/find.rs

@@ -1,7 +1,8 @@
 use crate::Store;
 
 impl Store {
-    /// The root path at which we expect to find all objects and packs.
+    /// The root path at which we expect to find all objects and packs, and which is the source of the
+    /// alternate file traversal in case there are linked repositories.
     pub fn path(&self) -> &std::path::Path {
         &self.path
     }