Added support for skipping package attachments.

2 files changed, 78 insertions, 21 deletions

diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index a556d896e..3ca5747f5 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -1682,6 +1682,59 @@ TEST_CASE("zcache.policy")
 			CHECK(Result.status_code == 200);
 		}
 	}
+
+	SUBCASE("skip - 'attachments' does not return attachments")
+	{
+		ZenConfig		  LocalCfg = ZenConfig::New();
+		ZenServerInstance LocalInst(TestEnv);
+		const auto		  Bucket = "texture"sv;
+
+		LocalCfg.Spawn(LocalInst);
+
+		zen::IoHash	   Key;
+		zen::CbPackage Package = GeneratePackage(Key);
+		auto		   Buf	   = ToBuffer(Package);
+
+		// Store package locally
+		{
+			CHECK(Package.GetAttachments().size() != 0);
+			cpr::Response Result = cpr::Put(cpr::Url{"{}/{}/{}"_format(LocalCfg.BaseUri, Bucket, Key)},
+											cpr::Body{(const char*)Buf.GetData(), Buf.GetSize()},
+											cpr::Header{{"Content-Type", "application/x-ue-cbpkg"}});
+			CHECK(Result.status_code == 201);
+		}
+
+		{
+			cpr::Response Result = cpr::Get(cpr::Url{"{}/{}/{}?skip=attachments"_format(LocalCfg.BaseUri, Bucket, Key)},
+											cpr::Header{{"Accept", "application/x-ue-cbpkg"}});
+			CHECK(Result.status_code == 200);
+
+			zen::IoBuffer  Body(zen::IoBuffer::Wrap, Result.text.data(), Result.text.size());
+			zen::CbPackage Package;
+			const bool	   Ok = Package.TryLoad(Body);
+
+			CbObject			CacheRecord = Package.GetObject();
+			std::vector<IoHash> AttachmentKeys;
+
+			CacheRecord.IterateAttachments(
+				[&AttachmentKeys](CbFieldView AttachmentKey) { AttachmentKeys.push_back(AttachmentKey.AsHash()); });
+
+			CHECK(AttachmentKeys.size() != 0);
+			CHECK(Package.GetAttachments().size() == 0);
+		}
+
+		{
+			cpr::Response Result =
+				cpr::Get(cpr::Url{"{}/{}/{}"_format(LocalCfg.BaseUri, Bucket, Key)}, cpr::Header{{"Accept", "application/x-ue-cbpkg"}});
+			CHECK(Result.status_code == 200);
+
+			zen::IoBuffer  Body(zen::IoBuffer::Wrap, Result.text.data(), Result.text.size());
+			zen::CbPackage Package;
+			const bool	   Ok = Package.TryLoad(Body);
+
+			CHECK(Package.GetAttachments().size() != 0);
+		}
+	}
 }
 
 struct RemoteExecutionRequest
diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp
index c66b1f98d..469e39bd4 100644
--- a/zenserver/cache/structuredcache.cpp
+++ b/zenserver/cache/structuredcache.cpp
@@ -376,32 +376,36 @@ HttpStructuredCacheService::HandleCacheRecordRequest(zen::HttpServerRequest& Req
 						return Request.WriteResponse(zen::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++;
+							});
+
+						if (FoundCount != AttachmentCount)
+						{
+							ZEN_WARN("GET - cache record '{}/{}' FAILED, found '{}' of '{}' attachments",
+									 Ref.BucketSegment,
+									 Ref.HashKey,
+									 FoundCount,
+									 AttachmentCount);
 
-						return Request.WriteResponse(zen::HttpResponseCode::NotFound, HttpContentType::kText, "Missing attachments"sv);
+							return Request.WriteResponse(zen::HttpResponseCode::NotFound, HttpContentType::kText, "Missing attachments"sv);
+						}
 					}
 
 					Package.SetObject(LoadCompactBinaryObject(Value.Value));