minor GC API cleanup

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

2 files changed, 8 insertions, 8 deletions

diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp
index 7fd9bcae0..381f163aa 100644
--- a/src/zenserver/projectstore/projectstore.cpp
+++ b/src/zenserver/projectstore/projectstore.cpp
@@ -642,7 +642,7 @@ ProjectStore::Oplog::Flush()
 }
 
 void
-ProjectStore::Oplog::Scrub(ScrubContext& Ctx) const
+ProjectStore::Oplog::ScrubStorage(ScrubContext& Ctx) const
 {
 	ZEN_UNUSED(Ctx);
 }
@@ -1535,7 +1535,7 @@ ProjectStore::Project::Flush()
 }
 
 void
-ProjectStore::Project::Scrub(ScrubContext& Ctx)
+ProjectStore::Project::ScrubStorage(ScrubContext& Ctx)
 {
 	// Scrubbing needs to check all existing oplogs
 	std::vector<std::string> OpLogs = ScanForOplogs();
@@ -1546,7 +1546,7 @@ ProjectStore::Project::Scrub(ScrubContext& Ctx)
 	IterateOplogs([&](const Oplog& Ops) {
 		if (!IsExpired(GcClock::TimePoint::max(), Ops))
 		{
-			Ops.Scrub(Ctx);
+			Ops.ScrubStorage(Ctx);
 		}
 	});
 }
@@ -1753,7 +1753,7 @@ ProjectStore::Flush()
 }
 
 void
-ProjectStore::Scrub(ScrubContext& Ctx)
+ProjectStore::ScrubStorage(ScrubContext& Ctx)
 {
 	DiscoverProjects();
 
@@ -1773,7 +1773,7 @@ ProjectStore::Scrub(ScrubContext& Ctx)
 	}
 	for (const Ref<Project>& Project : Projects)
 	{
-		Project->Scrub(Ctx);
+		Project->ScrubStorage(Ctx);
 	}
 }
 
diff --git a/src/zenserver/projectstore/projectstore.h b/src/zenserver/projectstore/projectstore.h
index b446de543..37093c0fb 100644
--- a/src/zenserver/projectstore/projectstore.h
+++ b/src/zenserver/projectstore/projectstore.h
@@ -111,7 +111,7 @@ public:
 
 		spdlog::logger& Log() { return m_OuterProject->Log(); }
 		void			Flush();
-		void			Scrub(ScrubContext& Ctx) const;
+		void			ScrubStorage(ScrubContext& Ctx) const;
 		void			GatherReferences(GcContext& GcCtx);
 		static uint64_t TotalSize(const std::filesystem::path& BasePath);
 		uint64_t		TotalSize() const;
@@ -220,7 +220,7 @@ public:
 		void					  Write();
 		[[nodiscard]] static bool Exists(const std::filesystem::path& BasePath);
 		void					  Flush();
-		void					  Scrub(ScrubContext& Ctx);
+		void					  ScrubStorage(ScrubContext& Ctx);
 		spdlog::logger&			  Log();
 		void					  GatherReferences(GcContext& GcCtx);
 		uint64_t				  TotalSize() const;
@@ -253,7 +253,7 @@ public:
 	bool		 DeleteProject(std::string_view ProjectId);
 	bool		 Exists(std::string_view ProjectId);
 	void		 Flush();
-	void		 Scrub(ScrubContext& Ctx);
+	void		 ScrubStorage(ScrubContext& Ctx);
 	void		 DiscoverProjects();
 	void		 IterateProjects(std::function<void(Project& Prj)>&& Fn);