remove find_segments

Author: MarinPostma

libsql-wal/src/storage/backend/mod.rs

@@ -84,15 +84,6 @@ pub trait Backend: Send + Sync + 'static {
         key: SegmentKey,
     ) -> impl Future<Output = Result<impl FileExt>> + Send;
 
-    // /// Fetch a segment for `namespace` containing `frame_no`, and writes it to `dest`.
-    async fn fetch_segment(
-        &self,
-        config: &Self::Config,
-        namespace: &NamespaceName,
-        frame_no: u64,
-        dest_path: &Path,
-    ) -> Result<Map<Arc<[u8]>>>;
-
     /// Fetch meta for `namespace`
     fn meta(
         &self,
@@ -133,18 +124,6 @@ impl<T: Backend> Backend for Arc<T> {
             .store(config, meta, segment_data, segment_index)
     }
 
-    async fn fetch_segment(
-        &self,
-        config: &Self::Config,
-        namespace: &NamespaceName,
-        frame_no: u64,
-        dest_path: &Path,
-    ) -> Result<fst::Map<Arc<[u8]>>> {
-        self.as_ref()
-            .fetch_segment(config, namespace, frame_no, dest_path)
-            .await
-    }
-
     async fn meta(&self, config: &Self::Config, namespace: &NamespaceName) -> Result<DbMeta> {
         self.as_ref().meta(config, namespace).await
     }

libsql-wal/src/storage/backend/s3.rs

@@ -38,9 +38,7 @@ pub struct S3Backend<IO> {
     client: Client,
     default_config: Arc<S3Config>,
     io: IO,
-}
-
-impl S3Backend<StdIO> {
+} impl S3Backend<StdIO> {
     pub async fn from_sdk_config(
         aws_config: SdkConfig,
         bucket: String,
@@ -581,35 +579,6 @@ where
         Ok(())
     }
 
-    async fn fetch_segment(
-        &self,
-        config: &Self::Config,
-        namespace: &NamespaceName,
-        frame_no: u64,
-        dest_path: &Path,
-    ) -> Result<fst::Map<Arc<[u8]>>> {
-        let folder_key = FolderKey {
-            cluster_id: &config.cluster_id,
-            namespace: &namespace,
-        };
-
-        let Some(segment_key) = self
-            .find_segment_by_frame_no(config, &folder_key, frame_no)
-            .await?
-        else {
-            return Err(Error::FrameNotFound(frame_no));
-        };
-
-        if segment_key.includes(frame_no) {
-            // TODO: make open async
-            let file = self.io.open(false, false, true, dest_path)?;
-            self.fetch_segment_from_key(config, &folder_key, &segment_key, &file)
-                .await
-        } else {
-            return Err(Error::FrameNotFound(frame_no));
-        }
-    }
-
     async fn meta(
         &self,
         config: &Self::Config,
@@ -832,7 +801,6 @@ mod tests {
     use fst::MapBuilder;
     use s3s::auth::SimpleAuth;
     use s3s::service::{S3ServiceBuilder, SharedS3Service};
-    use tempfile::NamedTempFile;
     use uuid::Uuid;
 
     use crate::io::StdIO;
@@ -902,7 +870,7 @@ mod tests {
                 SegmentMeta {
                     namespace: ns.clone(),
                     segment_id: Uuid::new_v4(),
-                    start_frame_no: 0u64.into(),
+                    start_frame_no: 1u64.into(),
                     end_frame_no: 64u64.into(),
                     segment_timestamp: Utc::now(),
                 },
@@ -937,30 +905,14 @@ mod tests {
         let db_meta = storage.meta(&s3_config, &ns).await.unwrap();
         assert_eq!(db_meta.max_frame_no, 128);
 
-        let tmp = NamedTempFile::new().unwrap();
-
-        let index = storage
-            .fetch_segment(&s3_config, &ns, 1, tmp.path())
+        let key = storage
+            .find_segment(&s3_config, &ns, FindSegmentReq::EndFrameNoLessThan(65))
             .await
             .unwrap();
+        assert_eq!(key.start_frame_no, 1);
+        assert_eq!(key.end_frame_no, 64);
+        
+        let index = storage.fetch_segment_index(&s3_config, &ns, &key).await.unwrap();
         assert_eq!(index.get(42u32.to_be_bytes()).unwrap(), 42);
-
-        let index = storage
-            .fetch_segment(&s3_config, &ns, 63, tmp.path())
-            .await
-            .unwrap();
-        assert_eq!(index.get(42u32.to_be_bytes()).unwrap(), 42);
-
-        let index = storage
-            .fetch_segment(&s3_config, &ns, 64, tmp.path())
-            .await
-            .unwrap();
-        assert_eq!(index.get(44u32.to_be_bytes()).unwrap(), 44);
-
-        let index = storage
-            .fetch_segment(&s3_config, &ns, 65, tmp.path())
-            .await
-            .unwrap();
-        assert_eq!(index.get(44u32.to_be_bytes()).unwrap(), 44);
     }
 }

libsql-wal/src/storage/job.rs

@@ -266,16 +266,6 @@ mod test {
                 Ok(std::fs::File::open("").unwrap())
             }
 
-            async fn fetch_segment(
-                &self,
-                _config: &Self::Config,
-                _namespace: &NamespaceName,
-                _frame_no: u64,
-                _dest_path: &std::path::Path,
-            ) -> Result<fst::Map<Arc<[u8]>>> {
-                todo!()
-            }
-
             fn list_segments<'a>(
                 &'a self,
                 _config: Self::Config,