Removed legacy key-value cache (may be reinstated in another form in the future)

1 files changed, 0 insertions, 21 deletions

diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index 5f8b23efa..3adae0acc 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -52,7 +52,6 @@
 //
 
 #include "admin/admin.h"
-#include "cache/kvcache.h"
 #include "cache/structuredcache.h"
 #include "cache/structuredcachestore.h"
 #include "compute/apply.h"
@@ -128,16 +127,6 @@ public:
 		zen::CreateDirectories(ApplySandboxDir);
 		m_HttpFunctionService = std::make_unique<zen::HttpFunctionService>(*m_CasStore, *m_CidStore, ApplySandboxDir);
 
-		if (ServiceConfig.LegacyCacheEnabled)
-		{
-			spdlog::info("instantiating legacy cache service");
-			m_CacheService.reset(new zen::HttpKvCacheService());
-		}
-		else
-		{
-			spdlog::info("NOT instantiating legacy cache service");
-		}
-
 		if (ServiceConfig.StructuredCacheEnabled)
 		{
 			using namespace std::literals;
@@ -230,12 +219,6 @@ public:
 
 		m_Http.AddEndpoint(m_CasService);
 
-		if (m_CacheService)
-		{
-			spdlog::info("instantiating legacy cache service");
-			m_Http.AddEndpoint(*m_CacheService);
-		}
-
 		if (m_StructuredCacheService)
 		{
 			m_Http.AddEndpoint(*m_StructuredCacheService);
@@ -342,9 +325,6 @@ public:
 		if (m_CidStore)
 			m_CidStore->Flush();
 
-		if (m_CacheService)
-			m_CacheService->Flush();
-
 		if (m_StructuredCacheService)
 			m_StructuredCacheService->Flush();
 
@@ -369,7 +349,6 @@ private:
 	zen::CasScrubber								 m_Scrubber{*m_CasStore};
 	HttpTestService									 m_TestService;
 	zen::HttpCasService								 m_CasService{*m_CasStore};
-	std::unique_ptr<zen::HttpKvCacheService>		 m_CacheService;
 	zen::RefPtr<zen::ProjectStore>					 m_ProjectStore;
 	zen::Ref<zen::LocalProjectService>				 m_LocalProjectService;
 	std::unique_ptr<zen::HttpLaunchService>			 m_HttpLaunchService;