derive inactivity floor from last commit, not range.start

Author: roberto-bayardo

storage/src/qmdb/any/sync/mod.rs

@@ -13,6 +13,7 @@ use crate::{
         self,
         any::{
             db::Db,
+            operation::{update::Update, Operation},
             ordered::{
                 fixed::{
                     Db as OrderedFixedDb, Operation as OrderedFixedOp, Update as OrderedFixedUpdate,
@@ -34,12 +35,12 @@ use crate::{
             },
             FixedConfig, FixedValue, VariableConfig, VariableValue,
         },
-        operation::{Committable, Key, Operation},
+        operation::{Committable, Key},
     },
     translator::Translator,
-    Context,
+    Context, Persistable,
 };
-use commonware_codec::{CodecShared, Read as CodecRead};
+use commonware_codec::{Codec, CodecShared, Read as CodecRead};
 use commonware_cryptography::Hasher;
 use commonware_utils::{range::NonEmptyRange, Array};
 
@@ -81,7 +82,7 @@ where
 }
 
 /// Shared helper to build a [Db] from sync components.
-async fn build_db<F, E, O, I, H, U, C, T>(
+async fn build_db<F, E, U, I, H, C, T>(
     context: E,
     merkle_config: journaled::Config,
     log: C,
@@ -93,12 +94,12 @@ async fn build_db<F, E, O, I, H, U, C, T>(
 where
     F: merkle::Family,
     E: Context,
-    O: Operation<F> + Committable + CodecShared + Send + Sync + 'static,
+    U: Update + Send + Sync + 'static,
     I: IndexFactory<T, Value = Location<F>>,
     H: Hasher,
-    U: Send + Sync + 'static,
     T: Translator,
-    C: Mutable<Item = O>,
+    C: Mutable<Item = Operation<F, U>> + Persistable<Error = crate::journal::Error>,
+    Operation<F, U>: Codec + Committable + CodecShared,
 {
     let hasher = StandardHasher::<H>::new();
 
@@ -122,7 +123,7 @@ where
         apply_batch_size as u64,
     )
     .await?;
-    let db = Db::from_components(range.start(), log, index).await?;
+    let db = Db::init_from_log(index, log, Some(range.start()), |_, _| {}).await?;
 
     Ok(db)
 }
@@ -160,7 +161,7 @@ macro_rules! impl_sync_database {
             ) -> Result<Self, qmdb::Error<F>> {
                 let merkle_config = config.merkle_config.clone();
                 let translator = config.translator.clone();
-                build_db::<F, _, Self::Op, _, H, $update<K, V>, _, T>(
+                build_db::<F, _, $update<K, V>, _, H, _, T>(
                     context,
                     merkle_config,
                     log,

storage/src/qmdb/any/unordered/mod.rs

@@ -2,15 +2,11 @@
 use crate::qmdb::any::traits::PersistableMutableLog;
 use crate::{
     index::Unordered as Index,
-    journal::contiguous::{Contiguous, Mutable, Reader},
+    journal::contiguous::{Contiguous, Reader},
     merkle::{Family, Location},
     qmdb::{
-        any::{
-            db::{AuthenticatedLog, Db},
-            ValueEncoding,
-        },
-        build_snapshot_from_log,
-        operation::{Committable, Key, Operation as OperationTrait},
+        any::{db::Db, ValueEncoding},
+        operation::Key,
     },
     Context,
 };
@@ -59,51 +55,6 @@ where
     }
 }
 
-impl<
-        F: Family,
-        E: Context,
-        C: Mutable<Item = O>,
-        O: OperationTrait<F> + Codec + Committable + Send + Sync,
-        I: Index<Value = Location<F>>,
-        H: Hasher,
-        U: Send + Sync,
-    > Db<F, E, C, I, H, U>
-{
-    /// Returns an [Db] initialized directly from the given components. The log is
-    /// replayed from `inactivity_floor_loc` to build the snapshot, and that value is used as the
-    /// inactivity floor. The last operation is assumed to be a commit.
-    pub(crate) async fn from_components(
-        inactivity_floor_loc: Location<F>,
-        log: AuthenticatedLog<F, E, C, H>,
-        mut snapshot: I,
-    ) -> Result<Self, crate::qmdb::Error<F>> {
-        let (active_keys, last_commit_loc) = {
-            let reader = log.reader().await;
-            let active_keys =
-                build_snapshot_from_log(inactivity_floor_loc, &reader, &mut snapshot, |_, _| {})
-                    .await?;
-            let last_commit_loc = Location::new(
-                reader
-                    .bounds()
-                    .end
-                    .checked_sub(1)
-                    .expect("commit should exist"),
-            );
-            assert!(reader.read(*last_commit_loc).await?.is_commit());
-            (active_keys, last_commit_loc)
-        };
-
-        Ok(Self {
-            log,
-            inactivity_floor_loc,
-            snapshot,
-            last_commit_loc,
-            active_keys,
-            _update: core::marker::PhantomData,
-        })
-    }
-}
-
 #[cfg(any(test, feature = "test-traits"))]
 crate::qmdb::any::traits::impl_db_any! {
     [E, K, V, C, I, H] Db<crate::merkle::mmr::Family, E, C, I, H, Update<K, V>>