fix rebase quirks

Author: MarinPostma

sqld/src/namespace/fork.rs

@@ -82,7 +82,8 @@ impl ForkTask<'_> {
         let end_frame_no = *logger.new_frame_notifier.borrow();
         let mut next_frame_no = 0;
         while next_frame_no < end_frame_no {
-            let mut streamer = FrameStream::new(logger.clone(), next_frame_no, false);
+            let mut streamer = FrameStream::new(logger.clone(), next_frame_no, false)
+                .map_err(|e| ForkError::Internal(e.into()))?;
             while let Some(res) = streamer.next().await {
                 match res {
                     Ok(frame) => {

sqld/src/namespace/mod.rs

@@ -173,7 +173,7 @@ impl MakeNamespace for ReplicaNamespaceMaker {
         _from: &Namespace<Self::Database>,
         _to: Bytes,
     ) -> crate::Result<Namespace<Self::Database>> {
-        return Err(ForkError::ForkReplica.into())
+        return Err(ForkError::ForkReplica.into());
     }
 }
 
@@ -257,12 +257,15 @@ impl<F: MakeNamespace> NamespaceStore<F> {
             Entry::Occupied(e) => e.into_mut(),
             Entry::Vacant(e) => {
                 // we just want to load the namespace into memory, so we refuse creation.
-                let ns = self.factory.create(from.clone(), None, false).await?;
+                let ns = self
+                    .make_namespace
+                    .create(from.clone(), None, false)
+                    .await?;
                 e.insert(ns)
             }
         };
 
-        let forked = self.factory.fork(from_ns, to.clone()).await?;
+        let forked = self.make_namespace.fork(from_ns, to.clone()).await?;
         lock.insert(to.clone(), forked);
 
         Ok(())