GCC does not like CacheKey member being named the same as its type

3 files changed, 45 insertions, 45 deletions

diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp
index 6fba7648f..ed20e5294 100644
--- a/zenserver/cache/structuredcache.cpp
+++ b/zenserver/cache/structuredcache.cpp
@@ -448,7 +448,7 @@ HttpStructuredCacheService::HandlePutCacheRecord(zen::HttpServerRequest& Request
 		if (StoreUpstream)
 		{
 			ZEN_ASSERT(m_UpstreamCache);
-			m_UpstreamCache->EnqueueUpstream({.Type = ZenContentType::kBinary, .CacheKey = {Ref.BucketSegment, Ref.HashKey}});
+			m_UpstreamCache->EnqueueUpstream({.Type = ZenContentType::kBinary, .Key = {Ref.BucketSegment, Ref.HashKey}});
 		}
 
 		Request.WriteResponse(HttpResponseCode::Created);
@@ -492,9 +492,9 @@ HttpStructuredCacheService::HandlePutCacheRecord(zen::HttpServerRequest& Request
 		if (StoreUpstream && !IsPartialRecord)
 		{
 			ZEN_ASSERT(m_UpstreamCache);
-			m_UpstreamCache->EnqueueUpstream({.Type		= ZenContentType::kCbObject,
-															.CacheKey	= {Ref.BucketSegment, Ref.HashKey},
-															.PayloadIds = std::move(ValidAttachments)});
+			m_UpstreamCache->EnqueueUpstream({.Type		  = ZenContentType::kCbObject,
+											  .Key		  = {Ref.BucketSegment, Ref.HashKey},
+											  .PayloadIds = std::move(ValidAttachments)});
 		}
 
 		Request.WriteResponse(HttpResponseCode::Created);
@@ -575,7 +575,7 @@ HttpStructuredCacheService::HandlePutCacheRecord(zen::HttpServerRequest& Request
 		{
 			ZEN_ASSERT(m_UpstreamCache);
 			m_UpstreamCache->EnqueueUpstream({.Type		  = ZenContentType::kCbPackage,
-											  .CacheKey	  = {Ref.BucketSegment, Ref.HashKey},
+											  .Key		  = {Ref.BucketSegment, Ref.HashKey},
 											  .PayloadIds = std::move(ValidAttachments)});
 		}
 
@@ -931,8 +931,8 @@ HttpStructuredCacheService::HandleRpcGetCacheRecords(zen::HttpServerRequest& Req
 							{
 								ZEN_DEBUG("Uncompressed payload '{}' from upstream cache record '{}/{}'",
 										  HashView.AsHash(),
-										  Params.CacheKey.Bucket,
-										  Params.CacheKey.Hash);
+										  Params.Key.Bucket,
+										  Params.Key.Hash);
 								Count.Invalid++;
 							}
 						}
@@ -952,8 +952,8 @@ HttpStructuredCacheService::HandleRpcGetCacheRecords(zen::HttpServerRequest& Req
 				if (CacheValue)
 				{
 					ZEN_DEBUG("HIT - '{}/{}' {} '{}' attachments '{}/{}/{}' (new/valid/total) (UPSTREAM)",
-							  Params.CacheKey.Bucket,
-							  Params.CacheKey.Hash,
+							  Params.Key.Bucket,
+							  Params.Key.Hash,
 							  NiceBytes(CacheValue.GetSize()),
 							  ToString(HttpContentType::kCbPackage),
 							  Count.New,
@@ -963,7 +963,7 @@ HttpStructuredCacheService::HandleRpcGetCacheRecords(zen::HttpServerRequest& Req
 					CacheValue.SetContentType(ZenContentType::kCbObject);
 
 					CacheValues[Params.KeyIndex] = CacheValue;
-					m_CacheStore.Put(Params.CacheKey.Bucket, Params.CacheKey.Hash, {.Value = CacheValue});
+					m_CacheStore.Put(Params.Key.Bucket, Params.Key.Hash, {.Value = CacheValue});
 
 					m_CacheStats.HitCount++;
 					m_CacheStats.UpstreamHitCount++;
@@ -971,7 +971,7 @@ HttpStructuredCacheService::HandleRpcGetCacheRecords(zen::HttpServerRequest& Req
 				else
 				{
 					const bool IsPartial = Count.Valid != Count.Total;
-					ZEN_DEBUG("MISS - '{}/{}' {}", Params.CacheKey.Bucket, Params.CacheKey.Hash, IsPartial ? "(partial)"sv : ""sv);
+					ZEN_DEBUG("MISS - '{}/{}' {}", Params.Key.Bucket, Params.Key.Hash, IsPartial ? "(partial)"sv : ""sv);
 					m_CacheStats.MissCount++;
 				}
 			};
diff --git a/zenserver/upstream/upstreamcache.cpp b/zenserver/upstream/upstreamcache.cpp
index ade71c5d2..1655f2b68 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;
@@ -275,12 +275,12 @@ namespace detail {
 					{
 						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,
+							Result = Session.PutRef(CacheRecord.Key.Bucket,
+													CacheRecord.Key.Hash,
 													RecordValue,
 													ZenContentType::kBinary);
 						}
@@ -329,13 +329,13 @@ namespace detail {
 					for (int32_t Attempt = 0; Attempt < MaxAttempts && !RefResult.Success; Attempt++)
 					{
 						RefResult =
-							Session.PutRef(CacheRecord.CacheKey.Bucket, CacheRecord.CacheKey.Hash, RecordValue, ZenContentType::kCbObject);
+							Session.PutRef(CacheRecord.Key.Bucket, CacheRecord.Key.Hash, RecordValue, ZenContentType::kCbObject);
 					}
 
 					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};
 					}
@@ -350,12 +350,12 @@ 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);
 
 					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};
 					}
@@ -367,12 +367,12 @@ 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);
 
 						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};
 						}
@@ -385,8 +385,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};
 						}
@@ -591,7 +591,7 @@ namespace detail {
 					{
 						const size_t Index = IndexMap[LocalIndex++];
 						OnComplete(
-							{.CacheKey = CacheKeys[Index], .KeyIndex = Index, .Record = Record.AsObjectView(), .Package = BatchResponse});
+							{.Key = CacheKeys[Index], .KeyIndex = Index, .Record = Record.AsObjectView(), .Package = BatchResponse});
 					}
 
 					return {.Bytes = Result.Bytes, .ElapsedSeconds = Result.ElapsedSeconds, .Success = true};
@@ -604,7 +604,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)}};
@@ -758,8 +758,8 @@ namespace detail {
 
 					for (uint32_t Attempt = 0; Attempt < MaxAttempts && !Result.Success; Attempt++)
 					{
-						Result = Session.PutCacheRecord(CacheRecord.CacheKey.Bucket,
-														CacheRecord.CacheKey.Hash,
+						Result = Session.PutCacheRecord(CacheRecord.Key.Bucket,
+														CacheRecord.Key.Hash,
 														PackagePayload,
 														CacheRecord.Type);
 
@@ -776,8 +776,8 @@ namespace detail {
 						Result.Success = false;
 						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]);
 
@@ -800,7 +800,7 @@ namespace detail {
 					for (uint32_t Attempt = 0; Attempt < MaxAttempts && !Result.Success; Attempt++)
 					{
 						Result =
-							Session.PutCacheRecord(CacheRecord.CacheKey.Bucket, CacheRecord.CacheKey.Hash, RecordValue, CacheRecord.Type);
+							Session.PutCacheRecord(CacheRecord.Key.Bucket, CacheRecord.Key.Hash, RecordValue, CacheRecord.Type);
 
 						m_HealthOk = Result.ErrorCode == 0;
 					}
@@ -1061,7 +1061,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()});
 		}
 	}
 
@@ -1180,11 +1180,11 @@ 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);
+					 CacheRecord.Key.Bucket,
+					 CacheRecord.Key.Hash);
 			return;
 		}
 
@@ -1197,8 +1197,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;
 			}
@@ -1214,8 +1214,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->DisplayName(),
 							 Result.Reason);
 				}
@@ -1237,8 +1237,8 @@ private:
 				catch (std::exception& e)
 				{
 					ZEN_WARN("upload cache record '{}/{}' FAILED, reason '{}'",
-							 CacheRecord.CacheKey.Bucket,
-							 CacheRecord.CacheKey.Hash,
+							 CacheRecord.Key.Bucket,
+							 CacheRecord.Key.Hash,
 							 e.what());
 				}
 			}
diff --git a/zenserver/upstream/upstreamcache.h b/zenserver/upstream/upstreamcache.h
index e5c3521b9..4b0c17181 100644
--- a/zenserver/upstream/upstreamcache.h
+++ b/zenserver/upstream/upstreamcache.h
@@ -24,7 +24,7 @@ struct CloudCacheClientOptions;
 struct UpstreamCacheRecord
 {
 	ZenContentType		Type = ZenContentType::kBinary;
-	CacheKey			CacheKey;
+	CacheKey			Key;
 	std::vector<IoHash> PayloadIds;
 };
 
@@ -82,7 +82,7 @@ struct UpstreamEndpointStats
 
 struct CacheRecordGetCompleteParams
 {
-	const CacheKey&		CacheKey;
+	const CacheKey&		Key;
 	size_t				KeyIndex = ~size_t(0);
 	const CbObjectView& Record;
 	const CbPackage&	Package;