adjust for changes in lsm-tree

src/flush/worker.rs

@@ -23,9 +23,18 @@ fn run_flush_worker(
         task.id,
         &task.sealed_memtable,
         eviction_threshold,
-    )?;
+    );
+
+    // TODO: test this after a failed flush
+    if segment.is_err() {
+        // IMPORTANT: Need to decrement pending segments counter
+        if let crate::AnyTree::Blob(tree) = &task.partition.tree {
+            tree.pending_segments
+                .fetch_sub(1, std::sync::atomic::Ordering::Release);
+        }
+    }
 
-    Ok(segment)
+    Ok(segment?)
 }
 
 struct MultiFlushResultItem {

src/journal/marker.rs

@@ -208,7 +208,7 @@ mod tests {
             value_type: ValueType::Value,
         };
 
-        let serialized_data = item.encode_into_vec()?;
+        let serialized_data = item.encode_into_vec();
         let mut reader = &serialized_data[..];
         let deserialized_item = Marker::decode_from(&mut reader)?;
 

tests/partition_recover.rs

@@ -25,13 +25,13 @@ fn reload_partition_config() -> fjall::Result<()> {
                 ),
         )?;
 
-        tree.config.encode_into_vec()?
+        tree.config.encode_into_vec()
     };
 
     {
         let keyspace = Config::new(&folder).open()?;
         let tree = keyspace.open_partition("default", PartitionCreateOptions::default())?;
-        assert_eq!(serialized_config, tree.config.encode_into_vec()?);
+        assert_eq!(serialized_config, tree.config.encode_into_vec());
     }
 
     Ok(())