hook fork logic to libsql configurators

Author: MarinPostma

libsql-server/src/namespace/configurator/libsql_primary.rs

@@ -5,10 +5,8 @@ use std::sync::Arc;
 
 use futures::prelude::Future;
 use libsql_sys::name::NamespaceResolver;
-use libsql_sys::wal::either::Either;
 use libsql_wal::io::StdIO;
 use libsql_wal::registry::WalRegistry;
-use libsql_wal::storage::backend::Backend;
 use libsql_wal::wal::LibsqlWalManager;
 use tokio::task::JoinSet;
 
@@ -267,38 +265,15 @@ impl ConfigureNamespace for LibsqlPrimaryConfigurator {
         &'a self,
         from_ns: &'a Namespace,
         _from_config: MetaStoreHandle,
-        _to_ns: NamespaceName,
-        _to_config: MetaStoreHandle,
-        timestamp: Option<chrono::prelude::NaiveDateTime>,
-        _store: NamespaceStore,
+        to_ns: NamespaceName,
+        to_config: MetaStoreHandle,
+        timestamp: Option<DateTime<Utc>>,
+        store: NamespaceStore,
     ) -> Pin<Box<dyn Future<Output = crate::Result<Namespace>> + Send + 'a>> {
-        Box::pin(async move {
-            match self.registry.storage() {
-                Either::A(s) => {
-                    match timestamp {
-                        Some(ts) => {
-                            let ns: libsql_sys::name::NamespaceName = from_ns.name().clone().into();
-                            let _key = s
-                                .backend()
-                                .find_segment(
-                                    &s.backend().default_config(),
-                                    &ns,
-                                    libsql_wal::storage::backend::FindSegmentReq::Timestamp(
-                                        ts.and_utc(),
-                                    ),
-                                )
-                                .await
-                                .unwrap();
-                            todo!()
-                        }
-                        // find the most recent frame_no
-                        None => todo!("fork from most recent"),
-                    };
-                }
-                Either::B(_) => {
-                    todo!("cannot fork without storage");
-                }
-            }
-        })
+        let registry = self.registry.clone();
+        let base_path = &self.base.base_path;
+        Box::pin(super::libsql_fork::libsql_wal_fork(
+            registry, base_path, from_ns, to_ns, to_config, timestamp, store,
+        ))
     }
 }

libsql-server/src/namespace/configurator/libsql_schema.rs

@@ -160,21 +160,16 @@ impl ConfigureNamespace for LibsqlSchemaConfigurator {
     fn fork<'a>(
         &'a self,
         from_ns: &'a Namespace,
-        from_config: MetaStoreHandle,
+        _from_config: MetaStoreHandle,
         to_ns: NamespaceName,
         to_config: MetaStoreHandle,
-        timestamp: Option<chrono::prelude::NaiveDateTime>,
+        timestamp: Option<DateTime<Utc>>,
         store: NamespaceStore,
     ) -> std::pin::Pin<Box<dyn Future<Output = crate::Result<Namespace>> + Send + 'a>> {
-        Box::pin(super::fork::fork(
-            from_ns,
-            from_config,
-            to_ns,
-            to_config,
-            timestamp,
-            store,
-            &self.primary_config,
-            self.base.base_path.clone(),
+        let registry = self.registry.clone();
+        let base_path = &self.base.base_path;
+        Box::pin(super::libsql_fork::libsql_wal_fork(
+            registry, base_path, from_ns, to_ns, to_config, timestamp, store,
         ))
     }
 }