From 4c05d1041461b630cd5770dae5e8d03147d5674b Mon Sep 17 00:00:00 2001
From: Dan Engelbrecht <dan.engelbrecht@epicgames.com>
Date: Wed, 20 Aug 2025 12:33:03 +0200
Subject: 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`
---
 src/zenserver/admin/admin.cpp | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

(limited to 'src/zenserver/admin/admin.cpp')

diff --git a/src/zenserver/admin/admin.cpp b/src/zenserver/admin/admin.cpp
index 9d982678a..8c2e6d771 100644
--- a/src/zenserver/admin/admin.cpp
+++ b/src/zenserver/admin/admin.cpp
@@ -17,14 +17,11 @@
 #	include <mimalloc.h>
 #endif
 
-#include <zenstore/cidstore.h>
 #include <zenstore/gc.h>
 
-#include <zenstore/buildstore/buildstore.h>
 #include <zenstore/cache/structuredcachestore.h>
 #include <zenutil/workerpools.h>
 #include "config.h"
-#include "projectstore/projectstore.h"
 
 #include <chrono>
 
@@ -104,17 +101,13 @@ GetStatsForStateDirectory(std::filesystem::path StateDir)
 HttpAdminService::HttpAdminService(GcScheduler&			   Scheduler,
 								   JobQueue&			   BackgroundJobQueue,
 								   ZenCacheStore*		   CacheStore,
-								   CidStore*			   CidStore,
-								   ProjectStore*		   ProjectStore,
-								   BuildStore*			   BuildStore,
+								   std::function<void()>&& FlushFunction,
 								   const LogPaths&		   LogPaths,
 								   const ZenServerOptions& ServerOptions)
 : m_GcScheduler(Scheduler)
 , m_BackgroundJobQueue(BackgroundJobQueue)
 , m_CacheStore(CacheStore)
-, m_CidStore(CidStore)
-, m_ProjectStore(ProjectStore)
-, m_BuildStore(BuildStore)
+, m_FlushFunction(std::move(FlushFunction))
 , m_LogPaths(LogPaths)
 , m_ServerOptions(ServerOptions)
 {
@@ -783,22 +776,7 @@ HttpAdminService::HttpAdminService(GcScheduler&			   Scheduler,
 		"flush",
 		[this](HttpRouterRequest& Req) {
 			HttpServerRequest& HttpReq = Req.ServerRequest();
-			if (m_CidStore)
-			{
-				m_CidStore->Flush();
-			}
-			if (m_CacheStore)
-			{
-				m_CacheStore->Flush();
-			}
-			if (m_ProjectStore)
-			{
-				m_ProjectStore->Flush();
-			}
-			if (m_BuildStore)
-			{
-				m_BuildStore->Flush();
-			}
+			m_FlushFunction();
 			HttpReq.WriteResponse(HttpResponseCode::OK);
 		},
 		HttpVerb::kPost);
-- 
cgit v1.2.3