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, 9 deletions

diff --git a/src/zenserver/admin/admin.h b/src/zenserver/admin/admin.h
index e7821dead..9a49f5120 100644
--- a/src/zenserver/admin/admin.h
+++ b/src/zenserver/admin/admin.h
@@ -4,15 +4,13 @@
 
 #include <zencore/compactbinary.h>
 #include <zenhttp/httpserver.h>
+#include <functional>
 
 namespace zen {
 
 class GcScheduler;
 class JobQueue;
 class ZenCacheStore;
-class CidStore;
-class ProjectStore;
-class BuildStore;
 struct ZenServerOptions;
 
 class HttpAdminService : public zen::HttpService
@@ -27,9 +25,7 @@ public:
 	HttpAdminService(GcScheduler&			 Scheduler,
 					 JobQueue&				 BackgroundJobQueue,
 					 ZenCacheStore*			 CacheStore,
-					 CidStore*				 CidStore,
-					 ProjectStore*			 ProjectStore,
-					 BuildStore*			 BuildStore,
+					 std::function<void()>&& FlushFunction,
 					 const LogPaths&		 LogPaths,
 					 const ZenServerOptions& ServerOptions);
 	~HttpAdminService();
@@ -42,9 +38,7 @@ private:
 	GcScheduler&			m_GcScheduler;
 	JobQueue&				m_BackgroundJobQueue;
 	ZenCacheStore*			m_CacheStore;
-	CidStore*				m_CidStore;
-	ProjectStore*			m_ProjectStore;
-	BuildStore*				m_BuildStore;
+	std::function<void()>	m_FlushFunction;
 	LogPaths				m_LogPaths;
 	const ZenServerOptions& m_ServerOptions;
 };