Merged main.

6 files changed, 100 insertions, 149 deletions

diff --git a/zenserver/upstream/jupiter.cpp b/zenserver/upstream/jupiter.cpp
index f9be068ec..177184591 100644
--- a/zenserver/upstream/jupiter.cpp
+++ b/zenserver/upstream/jupiter.cpp
@@ -2,7 +2,6 @@
 
 #include "jupiter.h"
 
-#include "cache/structuredcachestore.h"
 #include "diag/formatters.h"
 #include "diag/logging.h"
 
@@ -58,7 +57,7 @@ namespace detail {
 		cpr::Session& GetSession() { return Session; }
 
 	private:
-		friend class CloudCacheClient;
+		friend class zen::CloudCacheClient;
 
 		CloudCacheClient&	  OwnerClient;
 		CloudCacheAccessToken AccessToken;
@@ -116,11 +115,7 @@ CloudCacheSession::GetDerivedData(std::string_view BucketId, std::string_view Ke
 	const bool	   Success = Response.status_code == 200;
 	const IoBuffer Buffer  = Success ? IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()) : IoBuffer();
 
-	return {.Response		= Buffer,
-			.Bytes			= Response.downloaded_bytes,
-			.ElapsedSeconds = Response.elapsed,
-			.ErrorCode		= !Success ? Response.status_code : 0,
-			.Success		= Success};
+	return {.Response = Buffer, .Bytes = Response.downloaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Success};
 }
 
 CloudCacheResult
@@ -165,11 +160,7 @@ CloudCacheSession::GetRef(std::string_view BucketId, const IoHash& Key, ZenConte
 	const bool	   Success = Response.status_code == 200;
 	const IoBuffer Buffer  = Success ? IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()) : IoBuffer();
 
-	return {.Response		= Buffer,
-			.Bytes			= Response.downloaded_bytes,
-			.ElapsedSeconds = Response.elapsed,
-			.ErrorCode		= !Success ? Response.status_code : 0,
-			.Success		= Success};
+	return {.Response = Buffer, .Bytes = Response.downloaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Success};
 }
 
 CloudCacheResult
@@ -206,11 +197,7 @@ CloudCacheSession::GetBlob(const IoHash& Key)
 	const IoBuffer Buffer =
 		Success && Response.text.size() > 0 ? IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()) : IoBuffer();
 
-	return {.Response		= Buffer,
-			.Bytes			= Response.downloaded_bytes,
-			.ElapsedSeconds = Response.elapsed,
-			.ErrorCode		= !Success ? Response.status_code : 0,
-			.Success		= Success};
+	return {.Response = Buffer, .Bytes = Response.downloaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Success};
 }
 
 CloudCacheResult
@@ -246,11 +233,7 @@ CloudCacheSession::GetCompressedBlob(const IoHash& Key)
 	const bool	   Success = Response.status_code == 200;
 	const IoBuffer Buffer  = Success ? IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()) : IoBuffer();
 
-	return {.Response		= Buffer,
-			.Bytes			= Response.downloaded_bytes,
-			.ElapsedSeconds = Response.elapsed,
-			.ErrorCode		= !Success ? Response.status_code : 0,
-			.Success		= Success};
+	return {.Response = Buffer, .Bytes = Response.downloaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Success};
 }
 
 CloudCacheResult
@@ -286,11 +269,7 @@ CloudCacheSession::GetObject(const IoHash& Key)
 	const bool	   Success = Response.status_code == 200;
 	const IoBuffer Buffer  = Success ? IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()) : IoBuffer();
 
-	return {.Response		= Buffer,
-			.Bytes			= Response.downloaded_bytes,
-			.ElapsedSeconds = Response.elapsed,
-			.ErrorCode		= !Success ? Response.status_code : 0,
-			.Success		= Success};
+	return {.Response = Buffer, .Bytes = Response.downloaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Success};
 }
 
 CloudCacheResult
@@ -327,12 +306,9 @@ CloudCacheSession::PutDerivedData(std::string_view BucketId, std::string_view Ke
 		return {.ErrorCode = 401, .Reason = std::string("Invalid access token")};
 	}
 
-	const bool Success = Response.status_code == 200 || Response.status_code == 201;
-
 	return {.Bytes			= Response.uploaded_bytes,
 			.ElapsedSeconds = Response.elapsed,
-			.ErrorCode		= !Success ? Response.status_code : 0,
-			.Success		= Success};
+			.Success		= (Response.status_code == 200 || Response.status_code == 201)};
 }
 
 CloudCacheResult
@@ -388,7 +364,6 @@ CloudCacheSession::PutRef(std::string_view BucketId, const IoHash& Key, IoBuffer
 
 	PutRefResult Result;
 	Result.Success		  = (Response.status_code == 200 || Response.status_code == 201);
-	Result.ErrorCode	  = !Result.Success ? Response.status_code : 0;
 	Result.Bytes		  = Response.uploaded_bytes;
 	Result.ElapsedSeconds = Response.elapsed;
 
@@ -453,7 +428,6 @@ CloudCacheSession::FinalizeRef(std::string_view BucketId, const IoHash& Key, con
 
 	FinalizeRefResult Result;
 	Result.Success		  = (Response.status_code == 200 || Response.status_code == 201);
-	Result.ErrorCode	  = !Result.Success ? Response.status_code : 0;
 	Result.Bytes		  = Response.uploaded_bytes;
 	Result.ElapsedSeconds = Response.elapsed;
 
@@ -504,12 +478,9 @@ CloudCacheSession::PutBlob(const IoHash& Key, IoBuffer Blob)
 		return {.ErrorCode = 401, .Reason = std::string("Invalid access token")};
 	}
 
-	const bool Success = Response.status_code == 200 || Response.status_code == 201;
-
 	return {.Bytes			= Response.uploaded_bytes,
 			.ElapsedSeconds = Response.elapsed,
-			.ErrorCode		= !Success ? Response.status_code : 0,
-			.Success		= Success};
+			.Success		= (Response.status_code == 200 || Response.status_code == 201)};
 }
 
 CloudCacheResult
@@ -542,12 +513,9 @@ CloudCacheSession::PutCompressedBlob(const IoHash& Key, IoBuffer Blob)
 		return {.ErrorCode = 401, .Reason = std::string("Invalid access token")};
 	}
 
-	const bool Success = Response.status_code == 200 || Response.status_code == 201;
-
 	return {.Bytes			= Response.uploaded_bytes,
 			.ElapsedSeconds = Response.elapsed,
-			.ErrorCode		= !Success ? Response.status_code : 0,
-			.Success		= Success};
+			.Success		= (Response.status_code == 200 || Response.status_code == 201)};
 }
 
 CloudCacheResult
@@ -580,12 +548,9 @@ CloudCacheSession::PutObject(const IoHash& Key, IoBuffer Object)
 		return {.ErrorCode = 401, .Reason = std::string("Invalid access token")};
 	}
 
-	const bool Success = Response.status_code == 200 || Response.status_code == 201;
-
 	return {.Bytes			= Response.uploaded_bytes,
 			.ElapsedSeconds = Response.elapsed,
-			.ErrorCode		= !Success ? Response.status_code : 0,
-			.Success		= Success};
+			.Success		= (Response.status_code == 200 || Response.status_code == 201)};
 }
 
 CloudCacheResult
@@ -619,9 +584,7 @@ CloudCacheSession::RefExists(std::string_view BucketId, const IoHash& Key)
 		return {.ErrorCode = 401, .Reason = std::string("Invalid access token")};
 	}
 
-	const bool Success = Response.status_code == 200;
-
-	return {.ElapsedSeconds = Response.elapsed, .ErrorCode = !Success ? Response.status_code : 0, .Success = Success};
+	return {.ElapsedSeconds = Response.elapsed, .Success = Response.status_code == 200};
 }
 
 CloudCacheResult
@@ -690,9 +653,7 @@ CloudCacheSession::PostComputeTasks(std::string_view ChannelId, IoBuffer TasksDa
 		return {.ErrorCode = 401, .Reason = std::string("Invalid access token")};
 	}
 
-	const bool Success = Response.status_code == 200;
-
-	return {.ElapsedSeconds = Response.elapsed, .ErrorCode = !Success ? Response.status_code : 0, .Success = Success};
+	return {.ElapsedSeconds = Response.elapsed, .Success = Response.status_code == 200};
 }
 
 CloudCacheResult
@@ -728,11 +689,7 @@ CloudCacheSession::GetComputeUpdates(std::string_view ChannelId, const uint32_t
 	const bool	   Success = Response.status_code == 200;
 	const IoBuffer Buffer  = Success ? IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()) : IoBuffer();
 
-	return {.Response		= Buffer,
-			.Bytes			= Response.downloaded_bytes,
-			.ElapsedSeconds = Response.elapsed,
-			.ErrorCode		= !Success ? Response.status_code : 0,
-			.Success		= Success};
+	return {.Response = Buffer, .Bytes = Response.downloaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Success};
 }
 
 CloudCacheResult
@@ -768,11 +725,7 @@ CloudCacheSession::GetObjectTree(const IoHash& Key)
 	const bool	   Success = Response.status_code == 200;
 	const IoBuffer Buffer  = Success ? IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()) : IoBuffer();
 
-	return {.Response		= Buffer,
-			.Bytes			= Response.downloaded_bytes,
-			.ElapsedSeconds = Response.elapsed,
-			.ErrorCode		= !Success ? Response.status_code : 0,
-			.Success		= Success};
+	return {.Response = Buffer, .Bytes = Response.downloaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Success};
 }
 
 std::vector<IoHash>
diff --git a/zenserver/upstream/upstreamapply.cpp b/zenserver/upstream/upstreamapply.cpp
index 05be5f65c..f8a8c3e62 100644
--- a/zenserver/upstream/upstreamapply.cpp
+++ b/zenserver/upstream/upstreamapply.cpp
@@ -1,37 +1,40 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
 #include "upstreamapply.h"
-#include "jupiter.h"
-#include "zen.h"
-
-#include <zencore/blockingqueue.h>
-#include <zencore/compactbinary.h>
-#include <zencore/compactbinarybuilder.h>
-#include <zencore/compactbinarypackage.h>
-#include <zencore/compactbinaryvalidation.h>
-#include <zencore/compress.h>
-#include <zencore/fmtutils.h>
-#include <zencore/session.h>
-#include <zencore/stats.h>
-#include <zencore/stream.h>
-#include <zencore/thread.h>
-#include <zencore/timer.h>
-
-#include <zenstore/cas.h>
-#include <zenstore/cidstore.h>
-
-#include "cache/structuredcachestore.h"
-#include "diag/logging.h"
-
-#include <fmt/format.h>
-
-#include <algorithm>
-#include <atomic>
-#include <map>
-#include <set>
-#include <stack>
-#include <thread>
-#include <unordered_map>
+
+#if ZEN_WITH_COMPUTE_SERVICES
+
+#	include "jupiter.h"
+#	include "zen.h"
+
+#	include <zencore/blockingqueue.h>
+#	include <zencore/compactbinary.h>
+#	include <zencore/compactbinarybuilder.h>
+#	include <zencore/compactbinarypackage.h>
+#	include <zencore/compactbinaryvalidation.h>
+#	include <zencore/compress.h>
+#	include <zencore/fmtutils.h>
+#	include <zencore/session.h>
+#	include <zencore/stats.h>
+#	include <zencore/stream.h>
+#	include <zencore/thread.h>
+#	include <zencore/timer.h>
+
+#	include <zenstore/cas.h>
+#	include <zenstore/cidstore.h>
+
+#	include "cache/structuredcachestore.h"
+#	include "diag/logging.h"
+
+#	include <fmt/format.h>
+
+#	include <algorithm>
+#	include <atomic>
+#	include <map>
+#	include <set>
+#	include <stack>
+#	include <thread>
+#	include <unordered_map>
 
 namespace zen {
 
@@ -1569,3 +1572,5 @@ MakeHordeUpstreamEndpoint(const CloudCacheClientOptions& Options, CasStore& CasS
 }
 
 }  // namespace zen
+
+#endif	// ZEN_WITH_COMPUTE_SERVICES
diff --git a/zenserver/upstream/upstreamapply.h b/zenserver/upstream/upstreamapply.h
index 98f193c02..ed73ec7f8 100644
--- a/zenserver/upstream/upstreamapply.h
+++ b/zenserver/upstream/upstreamapply.h
@@ -2,16 +2,20 @@
 
 #pragma once
 
-#include <zencore/compactbinarypackage.h>
-#include <zencore/iobuffer.h>
-#include <zencore/iohash.h>
-#include <zencore/zencore.h>
+#include "compute/apply.h"
 
-#include <atomic>
-#include <chrono>
-#include <memory>
-#include <unordered_map>
-#include <unordered_set>
+#if ZEN_WITH_COMPUTE_SERVICES
+
+#	include <zencore/compactbinarypackage.h>
+#	include <zencore/iobuffer.h>
+#	include <zencore/iohash.h>
+#	include <zencore/zencore.h>
+
+#	include <atomic>
+#	include <chrono>
+#	include <memory>
+#	include <unordered_map>
+#	include <unordered_set>
 
 namespace zen {
 
@@ -170,3 +174,5 @@ std::unique_ptr<UpstreamApplyEndpoint> MakeHordeUpstreamEndpoint(const CloudCach
 																 CidStore&						CidStore);
 
 }  // namespace zen
+
+#endif	// ZEN_WITH_COMPUTE_SERVICES
diff --git a/zenserver/upstream/upstreamcache.cpp b/zenserver/upstream/upstreamcache.cpp
index e2dc09872..6283457e3 100644
--- a/zenserver/upstream/upstreamcache.cpp
+++ b/zenserver/upstream/upstreamcache.cpp
@@ -195,7 +195,7 @@ namespace detail {
 					}
 				}
 
-				OnComplete({.CacheKey = CacheKey, .KeyIndex = Index, .Record = Record, .Package = Package});
+				OnComplete({.Key = CacheKey, .KeyIndex = Index, .Record = Record, .Package = Package});
 			}
 
 			return Result;
@@ -271,18 +271,15 @@ namespace detail {
 				if (CacheRecord.Type == ZenContentType::kBinary)
 				{
 					CloudCacheResult Result;
-					for (int32_t Attempt = 0; Attempt < MaxAttempts && !Result.Success; Attempt++)
+					for (uint32_t Attempt = 0; Attempt < MaxAttempts && !Result.Success; Attempt++)
 					{
 						if (m_UseLegacyDdc)
 						{
-							Result = Session.PutDerivedData(CacheRecord.CacheKey.Bucket, CacheRecord.CacheKey.Hash, RecordValue);
+							Result = Session.PutDerivedData(CacheRecord.Key.Bucket, CacheRecord.Key.Hash, RecordValue);
 						}
 						else
 						{
-							Result = Session.PutRef(CacheRecord.CacheKey.Bucket,
-													CacheRecord.CacheKey.Hash,
-													RecordValue,
-													ZenContentType::kBinary);
+							Result = Session.PutRef(CacheRecord.Key.Bucket, CacheRecord.Key.Hash, RecordValue, ZenContentType::kBinary);
 						}
 					}
 
@@ -335,16 +332,15 @@ namespace detail {
 					PutRefResult RefResult;
 					for (int32_t Attempt = 0; Attempt < MaxAttempts && !RefResult.Success; Attempt++)
 					{
-						RefResult =
-							Session.PutRef(CacheRecord.CacheKey.Bucket, CacheRecord.CacheKey.Hash, RecordValue, ZenContentType::kCbObject);
+						RefResult = Session.PutRef(CacheRecord.Key.Bucket, CacheRecord.Key.Hash, RecordValue, ZenContentType::kCbObject);
 					}
 
 					m_HealthOk = RefResult.ErrorCode == 0;
 
 					if (!RefResult.Success)
 					{
-						return {.Reason	 = "upload cache record '{}/{}' FAILED, reason '{}'"_format(CacheRecord.CacheKey.Bucket,
-																									CacheRecord.CacheKey.Hash,
+						return {.Reason	 = "upload cache record '{}/{}' FAILED, reason '{}'"_format(CacheRecord.Key.Bucket,
+																									CacheRecord.Key.Hash,
 																									RefResult.Reason),
 								.Success = false};
 					}
@@ -359,13 +355,13 @@ namespace detail {
 					}
 
 					const IoHash	  RefHash		 = IoHash::HashBuffer(RecordValue);
-					FinalizeRefResult FinalizeResult = Session.FinalizeRef(CacheRecord.CacheKey.Bucket, CacheRecord.CacheKey.Hash, RefHash);
+					FinalizeRefResult FinalizeResult = Session.FinalizeRef(CacheRecord.Key.Bucket, CacheRecord.Key.Hash, RefHash);
 					m_HealthOk						 = FinalizeResult.ErrorCode == 0;
 
 					if (!FinalizeResult.Success)
 					{
-						return {.Reason	 = "finalize cache record '{}/{}' FAILED, reason '{}'"_format(CacheRecord.CacheKey.Bucket,
-																									  CacheRecord.CacheKey.Hash,
+						return {.Reason	 = "finalize cache record '{}/{}' FAILED, reason '{}'"_format(CacheRecord.Key.Bucket,
+																									  CacheRecord.Key.Hash,
 																									  FinalizeResult.Reason),
 								.Success = false};
 					}
@@ -377,13 +373,13 @@ namespace detail {
 							return {.Reason = std::move(Reason), .Success = false};
 						}
 
-						FinalizeResult = Session.FinalizeRef(CacheRecord.CacheKey.Bucket, CacheRecord.CacheKey.Hash, RefHash);
+						FinalizeResult = Session.FinalizeRef(CacheRecord.Key.Bucket, CacheRecord.Key.Hash, RefHash);
 						m_HealthOk	   = FinalizeResult.ErrorCode == 0;
 
 						if (!FinalizeResult.Success)
 						{
-							return {.Reason	 = "finalize '{}/{}' FAILED, reason '{}'"_format(CacheRecord.CacheKey.Bucket,
-																							 CacheRecord.CacheKey.Hash,
+							return {.Reason	 = "finalize '{}/{}' FAILED, reason '{}'"_format(CacheRecord.Key.Bucket,
+																							 CacheRecord.Key.Hash,
 																							 FinalizeResult.Reason),
 									.Success = false};
 						}
@@ -396,8 +392,8 @@ namespace detail {
 								Sb << MissingHash.ToHexString() << ",";
 							}
 
-							return {.Reason	 = "finalize '{}/{}' FAILED, still needs payload(s) '{}'"_format(CacheRecord.CacheKey.Bucket,
-																											 CacheRecord.CacheKey.Hash,
+							return {.Reason	 = "finalize '{}/{}' FAILED, still needs payload(s) '{}'"_format(CacheRecord.Key.Bucket,
+																											 CacheRecord.Key.Hash,
 																											 Sb.ToString()),
 									.Success = false};
 						}
@@ -606,8 +602,7 @@ namespace detail {
 					for (size_t LocalIndex = 0; CbFieldView Record : BatchResponse.GetObject()["Result"sv])
 					{
 						const size_t Index = IndexMap[LocalIndex++];
-						OnComplete(
-							{.CacheKey = CacheKeys[Index], .KeyIndex = Index, .Record = Record.AsObjectView(), .Package = BatchResponse});
+						OnComplete({.Key = CacheKeys[Index], .KeyIndex = Index, .Record = Record.AsObjectView(), .Package = BatchResponse});
 					}
 
 					return {.Bytes = Result.Bytes, .ElapsedSeconds = Result.ElapsedSeconds, .Success = true};
@@ -620,7 +615,7 @@ namespace detail {
 
 			for (size_t Index : KeyIndex)
 			{
-				OnComplete({.CacheKey = CacheKeys[Index], .KeyIndex = Index, .Record = CbObjectView(), .Package = CbPackage()});
+				OnComplete({.Key = CacheKeys[Index], .KeyIndex = Index, .Record = CbObjectView(), .Package = CbPackage()});
 			}
 
 			return {.Error{.ErrorCode = Result.ErrorCode, .Reason = std::move(Result.Reason)}};
@@ -772,12 +767,9 @@ namespace detail {
 					Package.Save(MemStream);
 					IoBuffer PackagePayload(IoBuffer::Wrap, MemStream.Data(), MemStream.Size());
 
-					for (int32_t Attempt = 0; Attempt < MaxAttempts && !Result.Success; Attempt++)
+					for (uint32_t Attempt = 0; Attempt < MaxAttempts && !Result.Success; Attempt++)
 					{
-						Result = Session.PutCacheRecord(CacheRecord.CacheKey.Bucket,
-														CacheRecord.CacheKey.Hash,
-														PackagePayload,
-														CacheRecord.Type);
+						Result = Session.PutCacheRecord(CacheRecord.Key.Bucket, CacheRecord.Key.Hash, PackagePayload, CacheRecord.Type);
 
 						m_HealthOk = Result.ErrorCode == 0;
 					}
@@ -790,10 +782,10 @@ namespace detail {
 					for (size_t Idx = 0, Count = Payloads.size(); Idx < Count; Idx++)
 					{
 						Result.Success = false;
-						for (int32_t Attempt = 0; Attempt < MaxAttempts && !Result.Success; Attempt++)
+						for (uint32_t Attempt = 0; Attempt < MaxAttempts && !Result.Success; Attempt++)
 						{
-							Result = Session.PutCachePayload(CacheRecord.CacheKey.Bucket,
-															 CacheRecord.CacheKey.Hash,
+							Result = Session.PutCachePayload(CacheRecord.Key.Bucket,
+															 CacheRecord.Key.Hash,
 															 CacheRecord.PayloadIds[Idx],
 															 Payloads[Idx]);
 
@@ -813,10 +805,9 @@ namespace detail {
 					}
 
 					Result.Success = false;
-					for (int32_t Attempt = 0; Attempt < MaxAttempts && !Result.Success; Attempt++)
+					for (uint32_t Attempt = 0; Attempt < MaxAttempts && !Result.Success; Attempt++)
 					{
-						Result =
-							Session.PutCacheRecord(CacheRecord.CacheKey.Bucket, CacheRecord.CacheKey.Hash, RecordValue, CacheRecord.Type);
+						Result = Session.PutCacheRecord(CacheRecord.Key.Bucket, CacheRecord.Key.Hash, RecordValue, CacheRecord.Type);
 
 						m_HealthOk = Result.ErrorCode == 0;
 					}
@@ -1099,7 +1090,7 @@ public:
 
 		for (size_t Index : MissingKeys)
 		{
-			OnComplete({.CacheKey = CacheKeys[Index], .KeyIndex = Index, .Record = CbObjectView(), .Package = CbPackage()});
+			OnComplete({.Key = CacheKeys[Index], .KeyIndex = Index, .Record = CbObjectView(), .Package = CbPackage()});
 		}
 	}
 
@@ -1236,11 +1227,9 @@ private:
 		ZenCacheValue		  CacheValue;
 		std::vector<IoBuffer> Payloads;
 
-		if (!m_CacheStore.Get(CacheRecord.CacheKey.Bucket, CacheRecord.CacheKey.Hash, CacheValue))
+		if (!m_CacheStore.Get(CacheRecord.Key.Bucket, CacheRecord.Key.Hash, CacheValue))
 		{
-			ZEN_WARN("process upstream FAILED, '{}/{}', cache record doesn't exist",
-					 CacheRecord.CacheKey.Bucket,
-					 CacheRecord.CacheKey.Hash);
+			ZEN_WARN("process upstream FAILED, '{}/{}', cache record doesn't exist", CacheRecord.Key.Bucket, CacheRecord.Key.Hash);
 			return;
 		}
 
@@ -1253,8 +1242,8 @@ private:
 			else
 			{
 				ZEN_WARN("process upstream FAILED, '{}/{}/{}', payload doesn't exist in CAS",
-						 CacheRecord.CacheKey.Bucket,
-						 CacheRecord.CacheKey.Hash,
+						 CacheRecord.Key.Bucket,
+						 CacheRecord.Key.Hash,
 						 PayloadId);
 				return;
 			}
@@ -1270,8 +1259,8 @@ private:
 				if (!Result.Success)
 				{
 					ZEN_WARN("upload cache record '{}/{}' FAILED, endpoint '{}', reason '{}'",
-							 CacheRecord.CacheKey.Bucket,
-							 CacheRecord.CacheKey.Hash,
+							 CacheRecord.Key.Bucket,
+							 CacheRecord.Key.Hash,
 							 Endpoint->GetEndpointInfo().Url,
 							 Result.Reason);
 				}
@@ -1292,10 +1281,7 @@ private:
 				}
 				catch (std::exception& Err)
 				{
-					ZEN_ERROR("upload cache record '{}/{}' FAILED, reason '{}'",
-							  CacheRecord.CacheKey.Bucket,
-							  CacheRecord.CacheKey.Hash,
-							  Err.what());
+					ZEN_ERROR("upload cache record '{}/{}' FAILED, reason '{}'", CacheRecord.Key.Bucket, CacheRecord.Key.Hash, Err.what());
 				}
 			}
 
diff --git a/zenserver/upstream/upstreamcache.h b/zenserver/upstream/upstreamcache.h
index 12287198d..c463c4996 100644
--- a/zenserver/upstream/upstreamcache.h
+++ b/zenserver/upstream/upstreamcache.h
@@ -25,7 +25,7 @@ struct ZenStructuredCacheClientOptions;
 struct UpstreamCacheRecord
 {
 	ZenContentType		Type = ZenContentType::kBinary;
-	CacheKey			CacheKey;
+	CacheKey			Key;
 	std::vector<IoHash> PayloadIds;
 };
 
@@ -83,7 +83,7 @@ struct UpstreamEndpointStats
 
 struct CacheRecordGetCompleteParams
 {
-	const CacheKey&		CacheKey;
+	const CacheKey&		Key;
 	size_t				KeyIndex = ~size_t(0);
 	const CbObjectView& Record;
 	const CbPackage&	Package;
diff --git a/zenserver/upstream/zen.h b/zenserver/upstream/zen.h
index df975df1f..e97ce755d 100644
--- a/zenserver/upstream/zen.h
+++ b/zenserver/upstream/zen.h
@@ -16,6 +16,7 @@ ZEN_THIRD_PARTY_INCLUDES_START
 ZEN_THIRD_PARTY_INCLUDES_END
 
 #include <chrono>
+#include <list>
 
 struct ZenCacheValue;