Merge pull request #142 from fjall-rs/fix/recovery/mac-underscore-files

Fix recovery with mac underscore file

Author: marvin-j97

src/tree/mod.rs

@@ -920,10 +920,16 @@ impl Tree {
 
             let file_name = dirent.file_name();
 
+            // https://en.wikipedia.org/wiki/.DS_Store
             if file_name == ".DS_Store" {
                 continue;
             }
 
+            // https://en.wikipedia.org/wiki/AppleSingle_and_AppleDouble_formats
+            if file_name.to_string_lossy().starts_with("._") {
+                continue;
+            }
+
             let segment_file_name = file_name.to_str().ok_or_else(|| {
                 log::error!("invalid segment file name {file_name:?}");
                 crate::Error::Unrecoverable

tests/recovery_mac_underscore.rs

@@ -0,0 +1,26 @@
+use lsm_tree::{AbstractTree, Config};
+use test_log::test;
+
+#[test]
+fn recovery_mac_underscore_file() -> lsm_tree::Result<()> {
+    let folder = tempfile::tempdir()?.into_path();
+
+    {
+        let tree = Config::new(&folder).open()?;
+        tree.insert("a", "a", 0);
+        tree.flush_active_memtable(0)?;
+        assert_eq!(1, tree.segment_count());
+    }
+
+    let ds_store = folder.join("segments").join("._0");
+    std::fs::File::create(&ds_store)?;
+    assert!(ds_store.try_exists()?);
+
+    {
+        let tree = Config::new(&folder).open()?;
+        assert_eq!(1, tree.segment_count());
+    }
+    assert!(ds_store.try_exists()?);
+
+    Ok(())
+}