make sure to drop before fs remove

agourlay · agourlay · commit 34d031dde1d3 · 2025-11-27T11:44:27.000+01:00
diff --git a/lib/segment/src/index/field_index/null_index/mutable_null_index.rs b/lib/segment/src/index/field_index/null_index/mutable_null_index.rs
@@ -220,8 +220,11 @@ impl PayloadFieldIndex for MutableNullIndex {
     }
 
     fn cleanup(self) -> OperationResult<()> {
-        if self.base_dir.is_dir() {
-            fs::remove_dir_all(&self.base_dir)?;
+        let base_dir = self.base_dir.clone();
+        // drop mmap handles before deleting files
+        drop(self);
+        if base_dir.is_dir() {
+            fs::remove_dir_all(&base_dir)?;
         }
         Ok(())
     }

Original file line number	Diff line number	Diff line change
`@@ -220,8 +220,11 @@ impl PayloadFieldIndex for MutableNullIndex {`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`fn cleanup(self) -> OperationResult<()> {`
`223`		`- if self.base_dir.is_dir() {`
`224`		`- fs::remove_dir_all(&self.base_dir)?;`
	`223`	`+ let base_dir = self.base_dir.clone();`
	`224`	`+ // drop mmap handles before deleting files`
	`225`	`+ drop(self);`
	`226`	`+ if base_dir.is_dir() {`
	`227`	`+ fs::remove_dir_all(&base_dir)?;`
`225`	`228`	`}`
`226`	`229`	`Ok(())`
`227`	`230`	`}`