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, 3 insertions, 4 deletions

diff --git a/src/zenserver/cache/httpstructuredcache.h b/src/zenserver/cache/httpstructuredcache.h
index 13c1d6475..d46ca145d 100644
--- a/src/zenserver/cache/httpstructuredcache.h
+++ b/src/zenserver/cache/httpstructuredcache.h
@@ -70,8 +70,10 @@ namespace cache {
 class HttpStructuredCacheService : public HttpService, public IHttpStatsProvider, public IHttpStatusProvider
 {
 public:
+	typedef std::function<CidStore&(std::string_view Context)> GetCidStoreFunc;
+
 	HttpStructuredCacheService(ZenCacheStore&		   InCacheStore,
-							   CidStore&			   InCidStore,
+							   GetCidStoreFunc&&	   GetCidStore,
 							   HttpStatsService&	   StatsService,
 							   HttpStatusService&	   StatusService,
 							   UpstreamCache&		   UpstreamCache,
@@ -83,7 +85,6 @@ public:
 	virtual void		HandleRequest(HttpServerRequest& Request) override;
 
 	void Flush();
-	void ScrubStorage(ScrubContext& Ctx);
 
 private:
 	struct CacheRef
@@ -116,9 +117,7 @@ private:
 	ZenCacheStore&			 m_CacheStore;
 	HttpStatsService&		 m_StatsService;
 	HttpStatusService&		 m_StatusService;
-	CidStore&				 m_CidStore;
 	UpstreamCache&			 m_UpstreamCache;
-	uint64_t				 m_LastScrubTime = 0;
 	metrics::OperationTiming m_HttpRequests;
 	metrics::OperationTiming m_UpstreamGetRequestTiming;
 	CacheStats				 m_CacheStats;