Merged main.

1 files changed, 32 insertions, 46 deletions

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());
 				}
 			}