Merge branch 'test/drop-segments'

src/compaction/fifo.rs

@@ -163,7 +163,7 @@ mod tests {
     }
 
     #[test]
-    fn ttl() -> crate::Result<()> {
+    fn fifo_ttl() -> crate::Result<()> {
         let tempdir = tempfile::tempdir()?;
         let compactor = Strategy::new(u64::MAX, Some(5_000));
 
@@ -181,7 +181,7 @@ mod tests {
     }
 
     #[test]
-    fn empty_levels() -> crate::Result<()> {
+    fn fifo_empty_levels() -> crate::Result<()> {
         let tempdir = tempfile::tempdir()?;
         let compactor = Strategy::new(1, None);
 
@@ -196,7 +196,7 @@ mod tests {
     }
 
     #[test]
-    fn below_limit() -> crate::Result<()> {
+    fn fifo_below_limit() -> crate::Result<()> {
         let tempdir = tempfile::tempdir()?;
         let compactor = Strategy::new(4, None);
 
@@ -230,7 +230,7 @@ mod tests {
     }
 
     #[test]
-    fn more_than_limit() -> crate::Result<()> {
+    fn fifo_more_than_limit() -> crate::Result<()> {
         let tempdir = tempfile::tempdir()?;
         let compactor = Strategy::new(2, None);
 

src/compaction/maintenance.rs

@@ -131,7 +131,7 @@ mod tests {
     }
 
     #[test]
-    fn empty_level() -> crate::Result<()> {
+    fn maintenance_empty_level() -> crate::Result<()> {
         let tempdir = tempfile::tempdir()?;
         let compactor = Strategy;
 
@@ -146,7 +146,7 @@ mod tests {
     }
 
     #[test]
-    fn below_limit() -> crate::Result<()> {
+    fn maintenance_below_limit() -> crate::Result<()> {
         let tempdir = tempfile::tempdir()?;
         let compactor = Strategy;
 
@@ -164,7 +164,7 @@ mod tests {
     }
 
     #[test]
-    fn l0_too_large() -> crate::Result<()> {
+    fn maintenance_l0_too_large() -> crate::Result<()> {
         let tempdir = tempfile::tempdir()?;
         let compactor = Strategy;
 

src/compaction/tiered.rs

@@ -165,7 +165,7 @@ mod tests {
     }
 
     #[test]
-    fn empty_levels() -> crate::Result<()> {
+    fn tiered_empty_levels() -> crate::Result<()> {
         let tempdir = tempfile::tempdir()?;
         let compactor = Strategy {
             base_size: 8 * 1_024 * 1_024,
@@ -182,7 +182,7 @@ mod tests {
     }
 
     #[test]
-    fn default_l0() -> crate::Result<()> {
+    fn tiered_default_l0() -> crate::Result<()> {
         let tempdir = tempfile::tempdir()?;
         let compactor = Strategy {
             base_size: 8 * 1_024 * 1_024,
@@ -215,7 +215,7 @@ mod tests {
     }
 
     #[test]
-    fn ordering() -> crate::Result<()> {
+    fn tiered_ordering() -> crate::Result<()> {
         let tempdir = tempfile::tempdir()?;
         let compactor = Strategy {
             base_size: 8 * 1_024 * 1_024,
@@ -242,7 +242,7 @@ mod tests {
     }
 
     #[test]
-    fn more_than_min() -> crate::Result<()> {
+    fn tiered_more_than_min() -> crate::Result<()> {
         let tempdir = tempfile::tempdir()?;
         let compactor = Strategy {
             base_size: 8 * 1_024 * 1_024,
@@ -273,7 +273,7 @@ mod tests {
     }
 
     #[test]
-    fn many_segments() -> crate::Result<()> {
+    fn tiered_many_segments() -> crate::Result<()> {
         let tempdir = tempfile::tempdir()?;
         let compactor = Strategy {
             base_size: 8 * 1_024 * 1_024,
@@ -299,7 +299,7 @@ mod tests {
     }
 
     #[test]
-    fn deeper_level() -> crate::Result<()> {
+    fn tiered_deeper_level() -> crate::Result<()> {
         let tempdir = tempfile::tempdir()?;
         let compactor = Strategy {
             base_size: 8 * 1_024 * 1_024,
@@ -340,7 +340,7 @@ mod tests {
     }
 
     #[test]
-    fn last_level() -> crate::Result<()> {
+    fn tiered_last_level() -> crate::Result<()> {
         let tempdir = tempfile::tempdir()?;
         let compactor = Strategy {
             base_size: 8 * 1_024 * 1_024,

src/compaction/worker.rs

@@ -393,3 +393,31 @@ fn drop_segments(
 
     Ok(())
 }
+
+#[cfg(test)]
+mod tests {
+    use std::sync::Arc;
+    use test_log::test;
+
+    #[test]
+    fn compaction_drop_segments() -> crate::Result<()> {
+        let folder = tempfile::tempdir()?;
+
+        let tree = crate::Config::new(folder).open()?;
+
+        tree.insert("a", "a", 0);
+        tree.flush_active_memtable()?;
+        tree.insert("a", "a", 1);
+        tree.flush_active_memtable()?;
+        tree.insert("a", "a", 2);
+        tree.flush_active_memtable()?;
+
+        assert_eq!(3, tree.approximate_len());
+
+        tree.compact(Arc::new(crate::compaction::Fifo::new(1, None)))?;
+
+        assert_eq!(0, tree.segment_count());
+
+        Ok(())
+    }
+}