Merge pull request #150 from fjall-rs/fix/lockless-ranges

2.7.2

Author: marvin-j97

Cargo.toml

@@ -2,7 +2,7 @@
 name = "fjall"
 description = "LSM-based key-value storage engine"
 license = "MIT OR Apache-2.0"
-version = "2.7.1"
+version = "2.7.2"
 edition = "2021"
 rust-version = "1.75.0"
 readme = "README.md"
@@ -28,7 +28,7 @@ __internal_whitebox = []
 [dependencies]
 byteorder = "1.5.0"
 byteview = "0.6.1"
-lsm-tree = { version = "2.7.1", default-features = false, features = [] }
+lsm-tree = { version = "2.7.2", default-features = false, features = [] }
 log = "0.4.21"
 std-semaphore = "0.1.0"
 tempfile = "3.10.1"

src/batch/mod.rs

@@ -147,6 +147,9 @@ impl Batch {
             .fetch_max(batch_seqno + 1, Ordering::AcqRel);
 
         drop(journal_writer);
+
+        log::trace!("batch: Freed journal writer");
+
         drop(partitions);
 
         // IMPORTANT: Add batch size to current write buffer size

src/recovery.rs

@@ -190,7 +190,7 @@ pub fn recover_sealed_memtables(
                 partition_lsn.is_some_and(|partition_lsn| partition_lsn >= handle.lsn);
 
             if should_skip_sealed_memtable {
-                handle.partition.tree.lock_active_memtable().clear();
+                handle.partition.tree.clear_active_memtable();
 
                 log::trace!(
                     "Partition {} has higher seqno ({partition_lsn:?}), skipping",

tests/write_during_read.rs

@@ -0,0 +1,26 @@
+use fjall::{Config, PartitionCreateOptions};
+use test_log::test;
+
+#[test]
+fn write_during_read() -> fjall::Result<()> {
+    let folder = tempfile::tempdir()?;
+
+    let keyspace = Config::new(&folder).open()?;
+
+    let tree = keyspace.open_partition(
+        "default",
+        PartitionCreateOptions::default().max_memtable_size(128_000),
+    )?;
+
+    for x in 0u64..50_000 {
+        tree.insert(x.to_be_bytes(), x.to_be_bytes())?;
+    }
+    tree.rotate_memtable_and_wait()?;
+
+    for kv in tree.iter() {
+        let (k, v) = kv?;
+        tree.insert(k, v.repeat(4))?;
+    }
+
+    Ok(())
+}