Merge remote-tracking branch 'origin/main' into wasm

Author: ethe

src/compaction/mod.rs

@@ -6,7 +6,6 @@ use futures_util::StreamExt;
 use parquet::arrow::{AsyncArrowWriter, ProjectionMask};
 use thiserror::Error;
 use tokio::sync::oneshot;
-use ulid::Ulid;
 
 use crate::{
     fs::{manager::StoreManager, FileId, FileType},
@@ -546,7 +545,7 @@ where
         debug_assert!(min.is_some());
         debug_assert!(max.is_some());
 
-        let gen = Ulid::new();
+        let gen = FileId::new();
         let columns = builder.finish(None);
         let schema = instance.arrow_schema::<R>().clone();
         #[cfg(feature = "opfs")]

src/inmem/mutable.rs

@@ -6,7 +6,6 @@ use crossbeam_skiplist::{
     SkipMap,
 };
 use fusio::{buffered::BufWriter, DynFs, DynWrite};
-use ulid::Ulid;
 
 use crate::{
     fs::{DynWriteWrapper, FileId, FileType},
@@ -52,7 +51,7 @@ where
     ) -> Result<Self, fusio::Error> {
         let mut wal = None;
         if option.use_wal {
-            let file_id = Ulid::new();
+            let file_id = FileId::new();
 
             let file = Box::new(BufWriter::new(
                 fs.open_options(

src/lib.rs

@@ -618,14 +618,15 @@ where
 }
 
 /// scan configuration intermediate structure
-pub struct Scan<'scan, R>
+pub struct Scan<'scan, 'range, R>
 where
     R: Record,
+    'range: 'scan,
 {
     schema: &'scan Schema<R>,
     manager: Arc<StoreManager>,
-    lower: Bound<&'scan R::Key>,
-    upper: Bound<&'scan R::Key>,
+    lower: Bound<&'range R::Key>,
+    upper: Bound<&'range R::Key>,
     ts: Timestamp,
 
     version: &'scan Version<R>,
@@ -637,14 +638,14 @@ where
     projection: ProjectionMask,
 }
 
-impl<'scan, R> Scan<'scan, R>
+impl<'scan, 'range, R> Scan<'scan, 'range, R>
 where
     R: Record + Send,
 {
     fn new(
         schema: &'scan Schema<R>,
         manager: Arc<StoreManager>,
-        (lower, upper): (Bound<&'scan R::Key>, Bound<&'scan R::Key>),
+        (lower, upper): (Bound<&'range R::Key>, Bound<&'range R::Key>),
         ts: Timestamp,
         version: &'scan Version<R>,
         fn_pre_stream: Box<

src/scope.rs

@@ -160,16 +160,15 @@ where
 mod test {
     use std::ops::Bound;
 
-    use ulid::Ulid;
-
     use super::Scope;
+    use crate::fs::FileId;
 
     #[tokio::test]
     async fn test_meets_range() {
         let scope = Scope {
             min: 100,
             max: 200,
-            gen: Ulid::new(),
+            gen: FileId::new(),
             wal_ids: None,
         };
 

src/snapshot.rs

@@ -39,10 +39,10 @@ impl<'s, R: Record> Snapshot<'s, R> {
             }))
     }
 
-    pub fn scan<'scan>(
+    pub fn scan<'scan, 'range>(
         &'scan self,
-        range: (Bound<&'scan R::Key>, Bound<&'scan R::Key>),
-    ) -> Scan<'scan, R> {
+        range: (Bound<&'range R::Key>, Bound<&'range R::Key>),
+    ) -> Scan<'scan, 'range, R> {
         Scan::new(
             &self.share,
             self.manager.clone(),
@@ -78,13 +78,13 @@ impl<'s, R: Record> Snapshot<'s, R> {
         &self.share
     }
 
-    pub(crate) fn _scan<'scan>(
+    pub(crate) fn _scan<'scan, 'range>(
         &'scan self,
-        range: (Bound<&'scan R::Key>, Bound<&'scan R::Key>),
+        range: (Bound<&'range R::Key>, Bound<&'range R::Key>),
         fn_pre_stream: Box<
             dyn FnOnce(Option<ProjectionMask>) -> Option<ScanStream<'scan, R>> + Send + 'scan,
         >,
-    ) -> Scan<'scan, R> {
+    ) -> Scan<'scan, 'range, R> {
         Scan::new(
             &self.share,
             self.manager.clone(),

src/transaction.rs

@@ -81,10 +81,10 @@ where
     }
 
     /// scan records with primary keys in the `range`
-    pub fn scan<'scan>(
+    pub fn scan<'scan, 'range>(
         &'scan self,
-        range: (Bound<&'scan R::Key>, Bound<&'scan R::Key>),
-    ) -> Scan<'scan, R> {
+        range: (Bound<&'range R::Key>, Bound<&'range R::Key>),
+    ) -> Scan<'scan, 'range, R> {
         self.snapshot._scan(
             range,
             Box::new(move |projection_mask: Option<ProjectionMask>| {