f: remove gc

Need to keep the last written version

Author: joostjager

lightning-persister/src/fs_store.rs

@@ -30,14 +30,10 @@ fn path_to_windows_str<T: AsRef<OsStr>>(path: &T) -> Vec<u16> {
 	path.as_ref().encode_wide().chain(Some(0)).collect()
 }
 
-// The number of read/write/remove/list operations after which we clean up our `locks` HashMap.
-const GC_LOCK_INTERVAL: usize = 25;
-
 /// A [`KVStoreSync`] implementation that writes to and reads from the file system.
 pub struct FilesystemStore {
 	data_dir: PathBuf,
 	tmp_file_counter: AtomicUsize,
-	gc_counter: AtomicUsize,
 
 	// Per path lock that ensures that we don't have concurrent writes to the same file. The lock also encapsulates the
 	// latest written version per key.
@@ -49,27 +45,14 @@ impl FilesystemStore {
 	pub fn new(data_dir: PathBuf) -> Self {
 		let locks = Mutex::new(HashMap::new());
 		let tmp_file_counter = AtomicUsize::new(0);
-		let gc_counter = AtomicUsize::new(1);
-		Self { data_dir, tmp_file_counter, gc_counter, locks }
+		Self { data_dir, tmp_file_counter, locks }
 	}
 
 	/// Returns the data directory.
 	pub fn get_data_dir(&self) -> PathBuf {
 		self.data_dir.clone()
 	}
 
-	fn garbage_collect_locks(&self) {
-		let gc_counter = self.gc_counter.fetch_add(1, Ordering::AcqRel);
-
-		if gc_counter % GC_LOCK_INTERVAL == 0 {
-			// Take outer lock for the cleanup.
-			let mut outer_lock = self.locks.lock().unwrap();
-
-			// Garbage collect all lock entries that are not referenced anymore.
-			outer_lock.retain(|_, v| Arc::strong_count(&v) > 1);
-		}
-	}
-
 	fn get_dest_dir_path(
 		&self, primary_namespace: &str, secondary_namespace: &str,
 	) -> std::io::Result<PathBuf> {
@@ -190,8 +173,6 @@ impl FilesystemStore {
 			}
 		};
 
-		self.garbage_collect_locks();
-
 		res
 	}
 }
@@ -217,8 +198,6 @@ impl KVStoreSync for FilesystemStore {
 			f.read_to_end(&mut buf)?;
 		}
 
-		self.garbage_collect_locks();
-
 		Ok(buf)
 	}
 
@@ -318,8 +297,6 @@ impl KVStoreSync for FilesystemStore {
 			}
 		}
 
-		self.garbage_collect_locks();
-
 		Ok(())
 	}
 
@@ -348,8 +325,6 @@ impl KVStoreSync for FilesystemStore {
 			keys.push(key);
 		}
 
-		self.garbage_collect_locks();
-
 		Ok(keys)
 	}
 }