Use rename/delete and keep pointer for dropped buckets

1 files changed, 25 insertions, 24 deletions

diff --git a/zenserver/cache/structuredcachestore.h b/zenserver/cache/structuredcachestore.h
index 13ba95f1b..bae15231b 100644
--- a/zenserver/cache/structuredcachestore.h
+++ b/zenserver/cache/structuredcachestore.h
@@ -233,17 +233,15 @@ private:
 		CacheBucket(std::string BucketName);
 		~CacheBucket();
 
-		void		OpenOrCreate(std::filesystem::path BucketDir, bool AllowCreate = true);
-		static bool Delete(std::filesystem::path BucketDir);
-		bool		Get(const IoHash& HashKey, ZenCacheValue& OutValue);
-		void		Put(const IoHash& HashKey, const ZenCacheValue& Value);
-		void		Drop();
-		void		Flush();
-		void		SaveManifest();
-		void		Scrub(ScrubContext& Ctx);
-		void		GatherReferences(GcContext& GcCtx);
-		void		CollectGarbage(GcContext& GcCtx);
-		void		UpdateAccessTimes(const std::vector<zen::access_tracking::KeyAccessTime>& AccessTimes);
+		void OpenOrCreate(std::filesystem::path BucketDir, bool AllowCreate = true);
+		bool Get(const IoHash& HashKey, ZenCacheValue& OutValue);
+		void Put(const IoHash& HashKey, const ZenCacheValue& Value);
+		void Drop();
+		void Flush();
+		void Scrub(ScrubContext& Ctx);
+		void GatherReferences(GcContext& GcCtx);
+		void CollectGarbage(GcContext& GcCtx);
+		void UpdateAccessTimes(const std::vector<zen::access_tracking::KeyAccessTime>& AccessTimes);
 
 		inline bool		IsOk() const { return m_IsOk; }
 		inline uint64_t TotalSize() const { return m_TotalSize.load(std::memory_order::relaxed); }
@@ -292,16 +290,18 @@ private:
 
 		std::atomic_uint64_t m_TotalSize{};
 
-		void	 BuildPath(PathBuilderBase& Path, const IoHash& HashKey);
-		void	 PutStandaloneCacheValue(const IoHash& HashKey, const ZenCacheValue& Value);
-		bool	 GetStandaloneCacheValue(const DiskLocation& Loc, const IoHash& HashKey, ZenCacheValue& OutValue);
-		void	 PutInlineCacheValue(const IoHash& HashKey, const ZenCacheValue& Value);
-		bool	 GetInlineCacheValue(const DiskLocation& Loc, ZenCacheValue& OutValue);
-		void	 MakeIndexSnapshot();
-		uint64_t ReadIndexFile();
-		uint64_t ReadLog(uint64_t LogPosition);
-		uint64_t MigrateLegacyData(bool CleanSource);
-		void	 OpenLog(const std::filesystem::path& BucketDir, const bool IsNew);
+		void		BuildPath(PathBuilderBase& Path, const IoHash& HashKey);
+		void		PutStandaloneCacheValue(const IoHash& HashKey, const ZenCacheValue& Value);
+		bool		GetStandaloneCacheValue(const DiskLocation& Loc, const IoHash& HashKey, ZenCacheValue& OutValue);
+		void		PutInlineCacheValue(const IoHash& HashKey, const ZenCacheValue& Value);
+		bool		GetInlineCacheValue(const DiskLocation& Loc, ZenCacheValue& OutValue);
+		void		MakeIndexSnapshot();
+		uint64_t	ReadIndexFile();
+		uint64_t	ReadLog(uint64_t LogPosition);
+		uint64_t	MigrateLegacyData(bool CleanSource);
+		void		OpenLog(const std::filesystem::path& BucketDir, const bool IsNew);
+		static bool Delete(std::filesystem::path BucketDir);
+		void		SaveManifest();
 
 		// These locks are here to avoid contention on file creation, therefore it's sufficient
 		// that we take the same lock for the same hash
@@ -314,9 +314,10 @@ private:
 		inline RwLock& LockForHash(const IoHash& Hash) { return m_ShardedLocks[Hash.Hash[19]]; }
 	};
 
-	std::filesystem::path						 m_RootDir;
-	mutable RwLock								 m_Lock;
-	std::unordered_map<std::string, CacheBucket> m_Buckets;	 // TODO: make this case insensitive
+	std::filesystem::path										  m_RootDir;
+	mutable RwLock												  m_Lock;
+	std::unordered_map<std::string, std::unique_ptr<CacheBucket>> m_Buckets;  // TODO: make this case insensitive
+	std::vector<std::unique_ptr<CacheBucket>>					  m_DroppedBuckets;
 
 	ZenCacheDiskLayer(const ZenCacheDiskLayer&) = delete;
 	ZenCacheDiskLayer& operator=(const ZenCacheDiskLayer&) = delete;