per namespace/project cas prep refactor (#470)

- Refactor so we can have more than one cas store for project store and cache.
- Refactor `UpstreamCacheClient` so it is not tied to a specific CidStore
- Refactor scrub to keep the GC interface ScrubStorage function separate from scrub accessor functions (renamed to Scrub).
- Refactor storage size to keep GC interface StorageSize function separate from size accessor functions (renamed to TotalSize)
- Refactor cache storage so  `ZenCacheDiskLayer::CacheBucket` implements GcStorage interface rather than `ZenCacheNamespace`

1 files changed, 14 insertions, 15 deletions

diff --git a/src/zenserver/zenserver.h b/src/zenserver/zenserver.h
index 0dcab6ec4..0a17446ae 100644
--- a/src/zenserver/zenserver.h
+++ b/src/zenserver/zenserver.h
@@ -82,7 +82,6 @@ public:
 	void CheckStateExitFlag();
 	void CheckOwnerPid();
 	bool UpdateProcessMonitor();
-	void ScrubStorage();
 	void Flush();
 
 	virtual void HandleStatusRequest(HttpServerRequest& Request) override;
@@ -116,20 +115,20 @@ private:
 	inline void				SetNewState(ServerState NewState) { m_CurrentState = NewState; }
 	static std::string_view ToString(ServerState Value);
 
-	StatsReporter					  m_StatsReporter;
-	Ref<HttpServer>					  m_Http;
-	std::unique_ptr<AuthMgr>		  m_AuthMgr;
-	std::unique_ptr<HttpAuthService>  m_AuthService;
-	HttpStatusService				  m_StatusService;
-	HttpStatsService				  m_StatsService;
-	GcManager						  m_GcManager;
-	GcScheduler						  m_GcScheduler{m_GcManager};
-	std::unique_ptr<CidStore>		  m_CidStore;
-	Ref<ZenCacheStore>				  m_CacheStore;
-	std::unique_ptr<OpenProcessCache> m_OpenProcessCache;
-	HttpTestService					  m_TestService;
-	std::unique_ptr<CidStore>		  m_BuildCidStore;
-	std::unique_ptr<BuildStore>		  m_BuildStore;
+	StatsReporter										   m_StatsReporter;
+	Ref<HttpServer>										   m_Http;
+	std::unique_ptr<AuthMgr>							   m_AuthMgr;
+	std::unique_ptr<HttpAuthService>					   m_AuthService;
+	HttpStatusService									   m_StatusService;
+	HttpStatsService									   m_StatsService;
+	GcManager											   m_GcManager;
+	GcScheduler											   m_GcScheduler{m_GcManager};
+	tsl::robin_map<std::string, std::unique_ptr<CidStore>> m_CidStores;
+	Ref<ZenCacheStore>									   m_CacheStore;
+	std::unique_ptr<OpenProcessCache>					   m_OpenProcessCache;
+	HttpTestService										   m_TestService;
+	std::unique_ptr<CidStore>							   m_BuildCidStore;
+	std::unique_ptr<BuildStore>							   m_BuildStore;
 
 #if ZEN_WITH_TESTS
 	HttpTestingService m_TestingService;