Resolved merge from main

1 files changed, 37 insertions, 21 deletions

diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp
index b3867bbc3..84522748e 100644
--- a/zenserver/cache/structuredcache.cpp
+++ b/zenserver/cache/structuredcache.cpp
@@ -333,6 +333,18 @@ HttpStructuredCacheService::HandleCacheRecordRequest(HttpServerRequest& Request,
 								if (FoundCount == AttachmentCount)
 								{
 									m_CacheStore.Put(Ref.BucketSegment, Ref.HashKey, {.Value = CacheRecord.GetBuffer().AsIoBuffer()});
+
+									if (zen::CachePolicy::SkipAttachments == (Policy & zen::CachePolicy::SkipAttachments))
+									{
+										CbPackage PackageWithoutAttachments;
+										PackageWithoutAttachments.SetObject(CacheRecord);
+
+										MemoryOutStream MemStream;
+										BinaryWriter	Writer(MemStream);
+										PackageWithoutAttachments.Save(Writer);
+
+										Value.Value = IoBuffer(IoBuffer::Clone, MemStream.Data(), MemStream.Size());
+									}
 								}
 								else
 								{
@@ -376,32 +388,36 @@ HttpStructuredCacheService::HandleCacheRecordRequest(HttpServerRequest& Request,
 						return Request.WriteResponse(HttpResponseCode::NotFound, HttpContentType::kText, "Invalid cache record"sv);
 					}
 
-					uint32_t AttachmentCount = 0;
-					uint32_t FoundCount		 = 0;
-					uint64_t AttachmentBytes = 0ull;
+					const bool SkipAttachments = zen::CachePolicy::SkipAttachments == (Policy & zen::CachePolicy::SkipAttachments);
+					uint32_t   AttachmentCount = 0;
+					uint32_t   FoundCount	   = 0;
+					uint64_t   AttachmentBytes = 0ull;
 
 					CbPackage Package;
 
-					CacheRecord.IterateAttachments(
-						[this, &Ref, &Package, &AttachmentCount, &FoundCount, &AttachmentBytes](CbFieldView AttachmentHash) {
-							if (IoBuffer Chunk = m_CidStore.FindChunkByCid(AttachmentHash.AsHash()))
-							{
-								Package.AddAttachment(CbAttachment(CompressedBuffer::FromCompressed(SharedBuffer(Chunk))));
-								AttachmentBytes += Chunk.Size();
-								FoundCount++;
-							}
-							AttachmentCount++;
-						});
-
-					if (FoundCount != AttachmentCount)
+					if (!SkipAttachments)
 					{
-						ZEN_WARN("GET - cache record '{}/{}' FAILED, found '{}' of '{}' attachments",
-								 Ref.BucketSegment,
-								 Ref.HashKey,
-								 FoundCount,
-								 AttachmentCount);
+						CacheRecord.IterateAttachments(
+							[this, &Ref, &Package, &AttachmentCount, &FoundCount, &AttachmentBytes](CbFieldView AttachmentHash) {
+								if (IoBuffer Chunk = m_CidStore.FindChunkByCid(AttachmentHash.AsHash()))
+								{
+									Package.AddAttachment(CbAttachment(CompressedBuffer::FromCompressed(SharedBuffer(Chunk))));
+									AttachmentBytes += Chunk.Size();
+									FoundCount++;
+								}
+								AttachmentCount++;
+							});
 
-						return Request.WriteResponse(HttpResponseCode::NotFound, HttpContentType::kText, "Missing attachments"sv);
+						if (FoundCount != AttachmentCount)
+						{
+							ZEN_WARN("GET - cache record '{}/{}' FAILED, found '{}' of '{}' attachments",
+									 Ref.BucketSegment,
+									 Ref.HashKey,
+									 FoundCount,
+									 AttachmentCount);
+
+							return Request.WriteResponse(HttpResponseCode::NotFound, HttpContentType::kText, "Missing attachments"sv);
+						}
 					}
 
 					Package.SetObject(LoadCompactBinaryObject(Value.Value));