move cachedisklayer and structuredcachestore into zenstore (#624)

12 files changed, 27 insertions, 28 deletions

diff --git a/src/zen/xmake.lua b/src/zen/xmake.lua
index e8d6fe122..78b2a3c2b 100644
--- a/src/zen/xmake.lua
+++ b/src/zen/xmake.lua
@@ -5,7 +5,7 @@ target("zen")
     add_headerfiles("**.h")
     add_files("**.cpp")
     add_files("zen.cpp", {unity_ignored  = true })
-    add_deps("zencore", "zenhttp", "zenutil")
+    add_deps("zencore", "zenhttp", "zenstore", "zenutil")
     add_includedirs(".")
     set_symbols("debug")
 
diff --git a/src/zenserver/admin/admin.cpp b/src/zenserver/admin/admin.cpp
index cc1ffdcdc..36ea8c0f1 100644
--- a/src/zenserver/admin/admin.cpp
+++ b/src/zenserver/admin/admin.cpp
@@ -20,7 +20,7 @@
 #include <zenstore/cidstore.h>
 #include <zenstore/gc.h>
 
-#include "cache/structuredcachestore.h"
+#include <zenstore/structuredcachestore.h>
 #include "config.h"
 #include "projectstore/projectstore.h"
 
diff --git a/src/zenserver/cache/httpstructuredcache.cpp b/src/zenserver/cache/httpstructuredcache.cpp
index f61fbd8bc..f9cd7ae13 100644
--- a/src/zenserver/cache/httpstructuredcache.cpp
+++ b/src/zenserver/cache/httpstructuredcache.cpp
@@ -19,10 +19,10 @@
 #include <zenhttp/httpshared.h>
 #include <zenhttp/httpstats.h>
 #include <zenstore/gc.h>
+#include <zenstore/structuredcachestore.h>
 #include <zenutil/cache/cache.h>
 #include <zenutil/cache/rpcrecording.h>
 
-#include "structuredcachestore.h"
 #include "upstream/jupiter.h"
 #include "upstream/upstreamcache.h"
 #include "upstream/zen.h"
diff --git a/src/zenserver/upstream/upstreamcache.cpp b/src/zenserver/upstream/upstreamcache.cpp
index 8e00f86b0..6dde0a701 100644
--- a/src/zenserver/upstream/upstreamcache.cpp
+++ b/src/zenserver/upstream/upstreamcache.cpp
@@ -19,8 +19,8 @@
 #include <zenhttp/httpshared.h>
 #include <zenstore/cidstore.h>
 
+#include <zenstore/structuredcachestore.h>
 #include "cache/httpstructuredcache.h"
-#include "cache/structuredcachestore.h"
 #include "diag/logging.h"
 
 #include <fmt/format.h>
diff --git a/src/zenserver/upstream/zen.cpp b/src/zenserver/upstream/zen.cpp
index 2d52236b3..afc3b8438 100644
--- a/src/zenserver/upstream/zen.cpp
+++ b/src/zenserver/upstream/zen.cpp
@@ -12,7 +12,7 @@
 #include <zenhttp/httpcommon.h>
 #include <zenhttp/httpshared.h>
 
-#include "cache/structuredcachestore.h"
+#include <zenstore/structuredcachestore.h>
 #include "diag/logging.h"
 
 ZEN_THIRD_PARTY_INCLUDES_START
diff --git a/src/zenserver/vfs/vfsimpl.cpp b/src/zenserver/vfs/vfsimpl.cpp
index 3a107cace..69b9bb356 100644
--- a/src/zenserver/vfs/vfsimpl.cpp
+++ b/src/zenserver/vfs/vfsimpl.cpp
@@ -3,11 +3,11 @@
 #include "vfsimpl.h"
 #include "vfsservice.h"
 
-#include "cache/structuredcachestore.h"
 #include "projectstore/projectstore.h"
 
 #include <zencore/fmtutils.h>
 #include <zencore/logging.h>
+#include <zenstore/structuredcachestore.h>
 #include <zenvfs/projfs.h>
 #include <zenvfs/vfs.h>
 
diff --git a/src/zenserver/zenserver.h b/src/zenserver/zenserver.h
index 1afd70b3e..a53e16821 100644
--- a/src/zenserver/zenserver.h
+++ b/src/zenserver/zenserver.h
@@ -23,9 +23,9 @@ ZEN_THIRD_PARTY_INCLUDES_END
 #include <zenhttp/httpstatus.h>
 #include <zenhttp/httptest.h>
 #include <zenstore/gc.h>
+#include <zenstore/structuredcachestore.h>
 #include "admin/admin.h"
 #include "cache/httpstructuredcache.h"
-#include "cache/structuredcachestore.h"
 #include "diag/diagsvcs.h"
 #include "frontend/frontend.h"
 #include "objectstore/objectstore.h"
diff --git a/src/zenserver/cache/cachedisklayer.cpp b/src/zenstore/cache/cachedisklayer.cpp
index 8d046105d..82f190caa 100644
--- a/src/zenserver/cache/cachedisklayer.cpp
+++ b/src/zenstore/cache/cachedisklayer.cpp
@@ -1,6 +1,6 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include "cachedisklayer.h"
+#include "zenstore/cachedisklayer.h"
 
 #include <zencore/compactbinary.h>
 #include <zencore/compactbinarybuilder.h>
@@ -21,6 +21,22 @@
 //////////////////////////////////////////////////////////////////////////
 
 namespace zen {
+
+bool
+IsKnownBadBucketName(std::string_view Bucket)
+{
+	if (Bucket.size() == 32)
+	{
+		uint8_t BucketHex[16];
+		if (ParseHexBytes(Bucket, BucketHex))
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
 namespace {
 
 #pragma pack(push)
diff --git a/src/zenserver/cache/structuredcachestore.cpp b/src/zenstore/cache/structuredcachestore.cpp
index 9155e209c..f92baaf0b 100644
--- a/src/zenserver/cache/structuredcachestore.cpp
+++ b/src/zenstore/cache/structuredcachestore.cpp
@@ -1,6 +1,6 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include "structuredcachestore.h"
+#include "zenstore/structuredcachestore.h"
 
 #include <zencore/compactbinarybuilder.h>
 #include <zencore/compactbinarypackage.h>
@@ -16,7 +16,6 @@
 #include <zencore/timer.h>
 #include <zencore/trace.h>
 #include <zencore/workthreadpool.h>
-#include <zennet/statsdclient.h>
 #include <zenstore/scrubcontext.h>
 #include <zenutil/cache/cache.h>
 
@@ -45,21 +44,6 @@ ZEN_THIRD_PARTY_INCLUDES_END
 
 namespace zen {
 
-bool
-IsKnownBadBucketName(std::string_view Bucket)
-{
-	if (Bucket.size() == 32)
-	{
-		uint8_t BucketHex[16];
-		if (ParseHexBytes(Bucket, BucketHex))
-		{
-			return true;
-		}
-	}
-
-	return false;
-}
-
 ZenCacheNamespace::ZenCacheNamespace(GcManager& Gc, JobQueue& JobQueue, const std::filesystem::path& RootDir, const Configuration& Config)
 : m_Gc(Gc)
 , m_JobQueue(JobQueue)
diff --git a/src/zenserver/cache/cachedisklayer.h b/src/zenstore/include/zenstore/cachedisklayer.h
index 6997a12e4..6997a12e4 100644
--- a/src/zenserver/cache/cachedisklayer.h
+++ b/src/zenstore/include/zenstore/cachedisklayer.h
diff --git a/src/zenserver/cache/cacheshared.h b/src/zenstore/include/zenstore/cacheshared.h
index e3e8a2f84..e3e8a2f84 100644
--- a/src/zenserver/cache/cacheshared.h
+++ b/src/zenstore/include/zenstore/cacheshared.h
diff --git a/src/zenserver/cache/structuredcachestore.h b/src/zenstore/include/zenstore/structuredcachestore.h
index 4ab8f90f0..56b2105a9 100644
--- a/src/zenserver/cache/structuredcachestore.h
+++ b/src/zenstore/include/zenstore/structuredcachestore.h
@@ -2,14 +2,13 @@
 
 #pragma once
 
-#include "cachedisklayer.h"
-#include "stats/statsreporter.h"
-
 #include <zencore/compactbinary.h>
 #include <zencore/iohash.h>
 #include <zencore/stats.h>
+#include <zenstore/cachedisklayer.h>
 #include <zenstore/gc.h>
 #include <zenutil/cache/cache.h>
+#include <zenutil/statsreporter.h>
 
 #include <atomic>
 #include <compare>