From 55225621f018904abf7e212320bb784dc64f8ac3 Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Fri, 18 Nov 2022 11:35:13 +0100 Subject: Add `import-project` and `export-project` (#183) * Add `import-project` and `export-project` command line parsing --- zenserver/cache/structuredcache.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'zenserver/cache/structuredcache.cpp') diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp index c5beef4b3..dfb69c0fe 100644 --- a/zenserver/cache/structuredcache.cpp +++ b/zenserver/cache/structuredcache.cpp @@ -530,7 +530,8 @@ HttpStructuredCacheService::HandleGetCacheRecord(zen::HttpServerRequest& Request { if (IoBuffer Chunk = m_CidStore.FindChunkByCid(AttachmentHash.AsHash())) { - Package.AddAttachment(CbAttachment(CompressedBuffer::FromCompressed(SharedBuffer(Chunk)))); + Package.AddAttachment( + CbAttachment(CompressedBuffer::FromCompressed(SharedBuffer(Chunk)), AttachmentHash.AsHash())); } else { @@ -681,7 +682,8 @@ HttpStructuredCacheService::HandleGetCacheRecord(zen::HttpServerRequest& Request { if (IoBuffer Chunk = m_CidStore.FindChunkByCid(HashView.AsHash())) { - Package.AddAttachment(CbAttachment(CompressedBuffer::FromCompressed(SharedBuffer(Chunk)))); + Package.AddAttachment( + CbAttachment(CompressedBuffer::FromCompressed(SharedBuffer(Chunk)), HashView.AsHash())); Count.Valid++; } } @@ -1605,7 +1607,7 @@ HttpStructuredCacheService::HandleRpcGetCacheRecords(zen::HttpServerRequest& Htt { if (!EnumHasAllFlags(Value.DownstreamPolicy, CachePolicy::SkipData) && Value.Payload) { - ResponsePackage.AddAttachment(CbAttachment(Value.Payload)); + ResponsePackage.AddAttachment(CbAttachment(Value.Payload, IoHash::FromBLAKE3(Value.Payload.GetRawHash()))); } } @@ -1959,10 +1961,11 @@ HttpStructuredCacheService::HandleRpcGetCacheValues(zen::HttpServerRequest& Http const CompressedBuffer& Result = Request.Result; if (Result) { - ResponseObject.AddHash("RawHash"sv, IoHash::FromBLAKE3(Result.GetRawHash())); + IoHash Hash = IoHash::FromBLAKE3(Result.GetRawHash()); + ResponseObject.AddHash("RawHash"sv, Hash); if (!EnumHasAllFlags(Request.Policy, CachePolicy::SkipData)) { - RpcResponse.AddAttachment(CbAttachment(Result)); + RpcResponse.AddAttachment(CbAttachment(Result, Hash)); } else { @@ -2475,7 +2478,7 @@ HttpStructuredCacheService::WriteGetCacheChunksResponse(uint32_t Accept Writer.AddHash("RawHash"sv, Request.Key->ChunkId); if (Request.Value && !EnumHasAllFlags(Request.DownstreamPolicy, CachePolicy::SkipData)) { - RpcResponse.AddAttachment(CbAttachment(Request.Value)); + RpcResponse.AddAttachment(CbAttachment(Request.Value, Request.Key->ChunkId)); } else { -- cgit v1.2.3