Merged main into linux-mac

1 files changed, 6 insertions, 5 deletions

diff --git a/zenserver/cache/structuredcache.h b/zenserver/cache/structuredcache.h
index 8289fd700..bd163dd1d 100644
--- a/zenserver/cache/structuredcache.h
+++ b/zenserver/cache/structuredcache.h
@@ -10,13 +10,13 @@ namespace spdlog {
 class logger;
 }
 
-class ZenCacheStore;
-
 namespace zen {
 
 class CasStore;
 class CidStore;
 class UpstreamCache;
+class ZenCacheStore;
+enum class CachePolicy : uint8_t;
 
 /**
  * Structured cache service. Imposes constraints on keys, supports blobs and
@@ -60,6 +60,7 @@ public:
 	virtual void HandleRequest(zen::HttpServerRequest& Request) override;
 
 	void Flush();
+	void Scrub(ScrubContext& Ctx);
 
 private:
 	struct CacheRef
@@ -70,13 +71,13 @@ private:
 	};
 
 	[[nodiscard]] bool ValidateKeyUri(zen::HttpServerRequest& Request, CacheRef& OutRef);
-	void			   HandleCacheRecordRequest(zen::HttpServerRequest& Request, CacheRef& Ref);
-	void			   HandleCachePayloadRequest(zen::HttpServerRequest& Request, CacheRef& Ref);
+	void			   HandleCacheRecordRequest(zen::HttpServerRequest& Request, CacheRef& Ref, CachePolicy Policy);
+	void			   HandleCachePayloadRequest(zen::HttpServerRequest& Request, CacheRef& Ref, CachePolicy Policy);
 	void			   HandleCacheBucketRequest(zen::HttpServerRequest& Request, std::string_view Bucket);
 
 	spdlog::logger&				   Log() { return m_Log; }
 	spdlog::logger&				   m_Log;
-	ZenCacheStore&				   m_CacheStore;
+	zen::ZenCacheStore&			   m_CacheStore;
 	zen::CasStore&				   m_CasStore;
 	zen::CidStore&				   m_CidStore;
 	std::unique_ptr<UpstreamCache> m_UpstreamCache;