merge disk and memory layers (#493)

- Feature: Added `--cache-memlayer-sizethreshold` option to zenserver to control at which size cache entries get cached in memory
- Changed: Merged cache memory layer with cache disk layer to reduce memory and cpu overhead

1 files changed, 11 insertions, 12 deletions

diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp
index 6a937089d..d53b602c1 100644
--- a/src/zenserver/zenserver.cpp
+++ b/src/zenserver/zenserver.cpp
@@ -421,18 +421,17 @@ ZenServer::InitializeStructuredCache(const ZenServerOptions& ServerOptions)
 	using namespace std::literals;
 
 	ZEN_INFO("instantiating structured cache service");
-	m_CacheStore = new ZenCacheStore(
-		m_GcManager,
-		*m_JobQueue,
-		ZenCacheStore::Configuration{.BasePath							 = m_DataRoot / "cache",
-									 .AllowAutomaticCreationOfNamespaces = true,
-									 .EnableReferenceCaching			 = ServerOptions.StructuredCacheConfig.EnableReferenceCaching,
-									 .MemLayerConfig = {.TargetFootprintBytes = ServerOptions.StructuredCacheConfig.MemTargetFootprintBytes,
-														.TrimIntervalSeconds  = ServerOptions.StructuredCacheConfig.MemTrimIntervalSeconds,
-														.MaxAgeSeconds		  = ServerOptions.StructuredCacheConfig.MemMaxAgeSeconds},
-									 .Logging		 = {.EnableWriteLog	 = ServerOptions.StructuredCacheConfig.WriteLogEnabled,
-														.EnableAccessLog = ServerOptions.StructuredCacheConfig.AccessLogEnabled}},
-		m_GcManager.GetDiskWriteBlocker());
+	ZenCacheStore::Configuration Config;
+	Config.AllowAutomaticCreationOfNamespaces = true;
+	Config.Logging							  = {.EnableWriteLog  = ServerOptions.StructuredCacheConfig.WriteLogEnabled,
+												 .EnableAccessLog = ServerOptions.StructuredCacheConfig.AccessLogEnabled};
+	Config.NamespaceConfig.DiskLayerConfig.BucketConfig.EnableReferenceCaching = ServerOptions.StructuredCacheConfig.EnableReferenceCaching;
+	Config.NamespaceConfig.DiskLayerConfig.BucketConfig.MemCacheSizeThreshold  = ServerOptions.StructuredCacheConfig.MemCacheSizeThreshold,
+	Config.NamespaceConfig.DiskLayerConfig.MemCacheTargetFootprintBytes = ServerOptions.StructuredCacheConfig.MemTargetFootprintBytes;
+	Config.NamespaceConfig.DiskLayerConfig.MemCacheTrimIntervalSeconds	= ServerOptions.StructuredCacheConfig.MemTrimIntervalSeconds;
+	Config.NamespaceConfig.DiskLayerConfig.MemCacheMaxAgeSeconds		= ServerOptions.StructuredCacheConfig.MemMaxAgeSeconds;
+
+	m_CacheStore = new ZenCacheStore(m_GcManager, *m_JobQueue, m_DataRoot / "cache", Config, m_GcManager.GetDiskWriteBlocker());
 
 	const ZenUpstreamCacheConfig& UpstreamConfig = ServerOptions.UpstreamCacheConfig;