adapt to changes in gix-pack

Author: Byron

gix-odb/src/store_impls/dynamic/find.rs

@@ -75,6 +75,7 @@ pub(crate) mod error {
     }
 }
 pub use error::Error;
+use gix_features::zlib;
 
 use crate::{store::types::PackId, Find};
 
@@ -86,6 +87,7 @@ where
         &'b self,
         mut id: &'b gix_hash::oid,
         buffer: &'a mut Vec<u8>,
+        inflate: &mut zlib::Inflate,
         pack_cache: &mut impl DecodeEntry,
         snapshot: &mut load_index::Snapshot,
         recursion: Option<error::DeltaBaseRecursion<'_>>,
@@ -147,6 +149,7 @@ where
                         let res = match pack.decode_entry(
                             entry,
                             buffer,
+                            inflate,
                             |id, _out| {
                                 index_file.pack_offset_by_id(id).map(|pack_offset| {
                                     gix_pack::data::decode::entry::ResolvedBase::InPack(pack.entry(pack_offset))
@@ -182,6 +185,7 @@ where
                                     .try_find_cached_inner(
                                         &base_id,
                                         &mut buf,
+                                        inflate,
                                         pack_cache,
                                         snapshot,
                                         recursion
@@ -231,6 +235,7 @@ where
                                 pack.decode_entry(
                                     entry,
                                     buffer,
+                                    inflate,
                                     |id, out| {
                                         index_file
                                             .pack_offset_by_id(id)
@@ -347,7 +352,8 @@ where
     ) -> Result<Option<(gix_object::Data<'a>, Option<gix_pack::data::entry::Location>)>, Self::Error> {
         let id = id.as_ref();
         let mut snapshot = self.snapshot.borrow_mut();
-        self.try_find_cached_inner(id, buffer, pack_cache, &mut snapshot, None)
+        let mut inflate = self.inflate.borrow_mut();
+        self.try_find_cached_inner(id, buffer, &mut inflate, pack_cache, &mut snapshot, None)
     }
 
     fn location_by_oid(
@@ -364,6 +370,7 @@ where
 
         let id = id.as_ref();
         let mut snapshot = self.snapshot.borrow_mut();
+        let mut inflate = self.inflate.borrow_mut();
         'outer: loop {
             {
                 let marker = snapshot.marker;
@@ -404,13 +411,14 @@ where
                         buf.resize(entry.decompressed_size.try_into().expect("representable size"), 0);
                         assert_eq!(pack.id, pack_id.to_intrinsic_pack_id(), "both ids must always match");
 
-                        let res = pack.decompress_entry(&entry, buf).ok().map(|entry_size_past_header| {
-                            gix_pack::data::entry::Location {
+                        let res = pack
+                            .decompress_entry(&entry, &mut inflate, buf)
+                            .ok()
+                            .map(|entry_size_past_header| gix_pack::data::entry::Location {
                                 pack_id: pack.id,
                                 pack_offset,
                                 entry_size: entry.header_size() + entry_size_past_header,
-                            }
-                        });
+                            });
 
                         if idx != 0 {
                             snapshot.indices.swap(0, idx);

gix-odb/src/store_impls/dynamic/handle.rs

@@ -257,6 +257,7 @@ impl super::Store {
             refresh: RefreshMode::default(),
             ignore_replacements: false,
             token: Some(token),
+            inflate: RefCell::new(Default::default()),
             snapshot: RefCell::new(self.collect_snapshot()),
             max_recursion_depth: Self::INITIAL_MAX_RECURSION_DEPTH,
             packed_object_count: Default::default(),
@@ -273,6 +274,7 @@ impl super::Store {
             refresh: Default::default(),
             ignore_replacements: false,
             token: Some(token),
+            inflate: RefCell::new(Default::default()),
             snapshot: RefCell::new(self.collect_snapshot()),
             max_recursion_depth: Self::INITIAL_MAX_RECURSION_DEPTH,
             packed_object_count: Default::default(),
@@ -391,6 +393,7 @@ where
                 }
                 .into()
             },
+            inflate: RefCell::new(Default::default()),
             snapshot: RefCell::new(self.store.collect_snapshot()),
             max_recursion_depth: self.max_recursion_depth,
             packed_object_count: Default::default(),

gix-odb/src/store_impls/dynamic/header.rs

@@ -1,3 +1,4 @@
+use gix_features::zlib;
 use std::ops::Deref;
 
 use gix_hash::oid;
@@ -15,6 +16,7 @@ where
     fn try_header_inner<'b>(
         &'b self,
         mut id: &'b gix_hash::oid,
+        inflate: &mut zlib::Inflate,
         snapshot: &mut load_index::Snapshot,
         recursion: Option<DeltaBaseRecursion<'_>>,
     ) -> Result<Option<Header>, Error> {
@@ -71,7 +73,7 @@ where
                             },
                         };
                         let entry = pack.entry(pack_offset);
-                        let res = match pack.decode_header(entry, |id| {
+                        let res = match pack.decode_header(entry, inflate, |id| {
                             index_file.pack_offset_by_id(id).map(|pack_offset| {
                                 gix_pack::data::decode::header::ResolvedBase::InPack(pack.entry(pack_offset))
                             })
@@ -85,6 +87,7 @@ where
                                 let hdr = self
                                     .try_header_inner(
                                         &base_id,
+                                        inflate,
                                         snapshot,
                                         recursion
                                             .map(DeltaBaseRecursion::inc_depth)
@@ -127,7 +130,7 @@ where
                                     .as_ref()
                                     .expect("pack to still be available like just now");
                                 let entry = pack.entry(pack_offset);
-                                pack.decode_header(entry, |id| {
+                                pack.decode_header(entry, inflate, |id| {
                                     index_file
                                         .pack_offset_by_id(id)
                                         .map(|pack_offset| {
@@ -184,6 +187,7 @@ where
     fn try_header(&self, id: impl AsRef<oid>) -> Result<Option<Header>, Self::Error> {
         let id = id.as_ref();
         let mut snapshot = self.snapshot.borrow_mut();
-        self.try_header_inner(id, &mut snapshot, None)
+        let mut inflate = self.inflate.borrow_mut();
+        self.try_header_inner(id, &mut inflate, &mut snapshot, None)
     }
 }

gix-odb/src/store_impls/dynamic/mod.rs

@@ -1,4 +1,5 @@
 //! The standard object store which should fit all needs.
+use gix_features::zlib;
 use std::{cell::RefCell, ops::Deref};
 
 use crate::Store;
@@ -24,6 +25,7 @@ where
 
     pub(crate) token: Option<handle::Mode>,
     snapshot: RefCell<load_index::Snapshot>,
+    inflate: RefCell<zlib::Inflate>,
     packed_object_count: RefCell<Option<u64>>,
 }