minor GC API cleanup

Scrub -> ScrubStorage
Trigger -> TriggerGc (to make relationship to TriggerScrub clearer)

4 files changed, 23 insertions, 23 deletions

diff --git a/src/zenserver/cache/structuredcache.cpp b/src/zenserver/cache/structuredcache.cpp
index 9f2a448bb..c9f942033 100644
--- a/src/zenserver/cache/structuredcache.cpp
+++ b/src/zenserver/cache/structuredcache.cpp
@@ -356,7 +356,7 @@ HttpStructuredCacheService::Flush()
 }
 
 void
-HttpStructuredCacheService::Scrub(ScrubContext& Ctx)
+HttpStructuredCacheService::ScrubStorage(ScrubContext& Ctx)
 {
 	if (m_LastScrubTime == Ctx.ScrubTimestamp())
 	{
@@ -365,8 +365,8 @@ HttpStructuredCacheService::Scrub(ScrubContext& Ctx)
 
 	m_LastScrubTime = Ctx.ScrubTimestamp();
 
-	m_CidStore.Scrub(Ctx);
-	m_CacheStore.Scrub(Ctx);
+	m_CidStore.ScrubStorage(Ctx);
+	m_CacheStore.ScrubStorage(Ctx);
 }
 
 void
diff --git a/src/zenserver/cache/structuredcache.h b/src/zenserver/cache/structuredcache.h
index 77a0aee6a..add3eb281 100644
--- a/src/zenserver/cache/structuredcache.h
+++ b/src/zenserver/cache/structuredcache.h
@@ -79,7 +79,7 @@ public:
 	virtual const char* BaseUri() const override;
 	virtual void		HandleRequest(HttpServerRequest& Request) override;
 	void				Flush();
-	void				Scrub(ScrubContext& Ctx);
+	void				ScrubStorage(ScrubContext& Ctx);
 
 private:
 	struct CacheRef
diff --git a/src/zenserver/cache/structuredcachestore.cpp b/src/zenserver/cache/structuredcachestore.cpp
index 59a047c08..e07a597e3 100644
--- a/src/zenserver/cache/structuredcachestore.cpp
+++ b/src/zenserver/cache/structuredcachestore.cpp
@@ -295,7 +295,7 @@ ZenCacheNamespace::Flush()
 }
 
 void
-ZenCacheNamespace::Scrub(ScrubContext& Ctx)
+ZenCacheNamespace::ScrubStorage(ScrubContext& Ctx)
 {
 	if (m_LastScrubTime == Ctx.ScrubTimestamp())
 	{
@@ -304,8 +304,8 @@ ZenCacheNamespace::Scrub(ScrubContext& Ctx)
 
 	m_LastScrubTime = Ctx.ScrubTimestamp();
 
-	m_DiskLayer.Scrub(Ctx);
-	m_MemLayer.Scrub(Ctx);
+	m_DiskLayer.ScrubStorage(Ctx);
+	m_MemLayer.ScrubStorage(Ctx);
 }
 
 void
@@ -478,13 +478,13 @@ ZenCacheMemoryLayer::Drop()
 }
 
 void
-ZenCacheMemoryLayer::Scrub(ScrubContext& Ctx)
+ZenCacheMemoryLayer::ScrubStorage(ScrubContext& Ctx)
 {
 	RwLock::SharedLockScope _(m_Lock);
 
 	for (auto& Kv : m_Buckets)
 	{
-		Kv.second->Scrub(Ctx);
+		Kv.second->ScrubStorage(Ctx);
 	}
 }
 
@@ -551,7 +551,7 @@ ZenCacheMemoryLayer::GetBucketInfo(std::string_view Bucket) const
 }
 
 void
-ZenCacheMemoryLayer::CacheBucket::Scrub(ScrubContext& Ctx)
+ZenCacheMemoryLayer::CacheBucket::ScrubStorage(ScrubContext& Ctx)
 {
 	RwLock::SharedLockScope _(m_BucketLock);
 
@@ -1297,7 +1297,7 @@ ZenCacheDiskLayer::CacheBucket::SaveManifest()
 }
 
 void
-ZenCacheDiskLayer::CacheBucket::Scrub(ScrubContext& Ctx)
+ZenCacheDiskLayer::CacheBucket::ScrubStorage(ScrubContext& Ctx)
 {
 	std::vector<IoHash>				BadKeys;
 	uint64_t						ChunkCount{0}, ChunkBytes{0};
@@ -2413,14 +2413,14 @@ ZenCacheDiskLayer::Flush()
 }
 
 void
-ZenCacheDiskLayer::Scrub(ScrubContext& Ctx)
+ZenCacheDiskLayer::ScrubStorage(ScrubContext& Ctx)
 {
 	RwLock::SharedLockScope _(m_Lock);
 
 	for (auto& Kv : m_Buckets)
 	{
 		CacheBucket& Bucket = *Kv.second;
-		Bucket.Scrub(Ctx);
+		Bucket.ScrubStorage(Ctx);
 	}
 }
 
@@ -2669,9 +2669,9 @@ ZenCacheStore::Flush()
 }
 
 void
-ZenCacheStore::Scrub(ScrubContext& Ctx)
+ZenCacheStore::ScrubStorage(ScrubContext& Ctx)
 {
-	IterateNamespaces([&](std::string_view, ZenCacheNamespace& Store) { Store.Scrub(Ctx); });
+	IterateNamespaces([&](std::string_view, ZenCacheNamespace& Store) { Store.ScrubStorage(Ctx); });
 }
 
 CacheValueDetails
@@ -3756,8 +3756,8 @@ TEST_CASE("z$.scrub")
 	CreateRecords(true, "mybucket"sv, StructuredCids, AttachmentSizes);
 
 	ScrubContext ScrubCtx;
-	Zcs.Scrub(ScrubCtx);
-	CidStore.Scrub(ScrubCtx);
+	Zcs.ScrubStorage(ScrubCtx);
+	CidStore.ScrubStorage(ScrubCtx);
 	CHECK(ScrubCtx.ScrubbedChunks() == (StructuredCids.size() + StructuredCids.size() * AttachmentSizes.size()) + UnstructuredCids.size());
 	CHECK(ScrubCtx.BadCids().GetSize() == 0);
 }
diff --git a/src/zenserver/cache/structuredcachestore.h b/src/zenserver/cache/structuredcachestore.h
index f94babb64..5ae8b97a0 100644
--- a/src/zenserver/cache/structuredcachestore.h
+++ b/src/zenserver/cache/structuredcachestore.h
@@ -229,7 +229,7 @@ public:
 	void	 Put(std::string_view Bucket, const IoHash& HashKey, const ZenCacheValue& Value);
 	void	 Drop();
 	bool	 DropBucket(std::string_view Bucket);
-	void	 Scrub(ScrubContext& Ctx);
+	void	 ScrubStorage(ScrubContext& Ctx);
 	void	 GatherAccessTimes(zen::access_tracking::AccessTimes& AccessTimes);
 	void	 Reset();
 	uint64_t TotalSize() const;
@@ -265,7 +265,7 @@ private:
 		bool			Get(const IoHash& HashKey, ZenCacheValue& OutValue);
 		void			Put(const IoHash& HashKey, const ZenCacheValue& Value);
 		void			Drop();
-		void			Scrub(ScrubContext& Ctx);
+		void			ScrubStorage(ScrubContext& Ctx);
 		void			GatherAccessTimes(std::vector<zen::access_tracking::KeyAccessTime>& AccessTimes);
 		inline uint64_t TotalSize() const { return m_TotalSize; }
 		uint64_t		EntryCount() const;
@@ -310,7 +310,7 @@ public:
 	bool Drop();
 	bool DropBucket(std::string_view Bucket);
 	void Flush();
-	void Scrub(ScrubContext& Ctx);
+	void ScrubStorage(ScrubContext& Ctx);
 	void GatherReferences(GcContext& GcCtx);
 	void CollectGarbage(GcContext& GcCtx);
 	void UpdateAccessTimes(const zen::access_tracking::AccessTimes& AccessTimes);
@@ -337,7 +337,7 @@ private:
 		void Put(const IoHash& HashKey, const ZenCacheValue& Value);
 		bool Drop();
 		void Flush();
-		void Scrub(ScrubContext& Ctx);
+		void ScrubStorage(ScrubContext& Ctx);
 		void GatherReferences(GcContext& GcCtx);
 		void CollectGarbage(GcContext& GcCtx);
 		void UpdateAccessTimes(const std::vector<zen::access_tracking::KeyAccessTime>& AccessTimes);
@@ -444,7 +444,7 @@ public:
 	bool					  Drop();
 	bool					  DropBucket(std::string_view Bucket);
 	void					  Flush();
-	void					  Scrub(ScrubContext& Ctx);
+	void					  ScrubStorage(ScrubContext& Ctx);
 	uint64_t				  DiskLayerThreshold() const { return m_DiskLayerSizeThreshold; }
 	virtual void			  GatherReferences(GcContext& GcCtx) override;
 	virtual void			  CollectGarbage(GcContext& GcCtx) override;
@@ -497,7 +497,7 @@ public:
 	bool DropBucket(std::string_view Namespace, std::string_view Bucket);
 	bool DropNamespace(std::string_view Namespace);
 	void Flush();
-	void Scrub(ScrubContext& Ctx);
+	void ScrubStorage(ScrubContext& Ctx);
 
 	CacheValueDetails GetValueDetails(const std::string_view NamespaceFilter,
 									  const std::string_view BucketFilter,