minor GC API cleanup

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

1 files changed, 13 insertions, 13 deletions

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);
 }