moving and small refactor of chunk blocks to prepare for builds api (#282)

1 files changed, 20 insertions, 57 deletions

diff --git a/src/zenserver/projectstore/buildsremoteprojectstore.cpp b/src/zenserver/projectstore/buildsremoteprojectstore.cpp
index 302b81729..412769174 100644
--- a/src/zenserver/projectstore/buildsremoteprojectstore.cpp
+++ b/src/zenserver/projectstore/buildsremoteprojectstore.cpp
@@ -3,6 +3,7 @@
 #include "buildsremoteprojectstore.h"
 
 #include <zencore/compactbinarybuilder.h>
+#include <zencore/compactbinaryvalidation.h>
 #include <zencore/compress.h>
 #include <zencore/fmtutils.h>
 
@@ -114,7 +115,9 @@ public:
 		return Result;
 	}
 
-	virtual SaveAttachmentResult SaveAttachment(const CompositeBuffer& Payload, const IoHash& RawHash, Block&& Block) override
+	virtual SaveAttachmentResult SaveAttachment(const CompositeBuffer&	Payload,
+												const IoHash&			RawHash,
+												ChunkBlockDescription&& Block) override
 	{
 		ZEN_ASSERT(m_OplogBuildPartId != Oid::Zero);
 		JupiterSession Session(m_JupiterClient->Logger(), m_JupiterClient->Client());
@@ -139,44 +142,10 @@ public:
 
 		if (Block.BlockHash == RawHash)
 		{
-			ZEN_ASSERT(Block.ChunkLengths.size() == Block.ChunkHashes.size());
-			CbObjectWriter Writer;
-			Writer.AddHash("rawHash"sv, RawHash);
-			Writer.BeginArray("rawHashes"sv);
-			{
-				for (const IoHash& ChunkHash : Block.ChunkHashes)
-				{
-					Writer.AddHash(ChunkHash);
-				}
-			}
-			Writer.EndArray();
-			Writer.BeginArray("chunkLengths");
-			{
-				for (uint32_t ChunkSize : Block.ChunkLengths)
-				{
-					Writer.AddInteger(ChunkSize);
-				}
-			}
-			Writer.EndArray();
-			Writer.BeginArray("chunkOffsets");
-			{
-				ZEN_ASSERT(Block.FirstChunkOffset != (uint32_t)-1);
-				uint32_t Offset = Block.FirstChunkOffset;
-				for (uint32_t ChunkSize : Block.ChunkLengths)
-				{
-					Writer.AddInteger(Offset);
-					Offset += ChunkSize;
-				}
-			}
-			Writer.EndArray();
+			CbObjectWriter BlockMetaData;
+			BlockMetaData.AddString("createdBy", GetRunningExecutablePath().stem().string());
 
-			Writer.BeginObject("metadata"sv);
-			{
-				Writer.AddString("createdBy", "zenserver");
-			}
-			Writer.EndObject();
-
-			IoBuffer MetaPayload = Writer.Save().GetBuffer().AsIoBuffer();
+			IoBuffer MetaPayload = BuildChunkBlockDescription(Block, BlockMetaData.Save()).GetBuffer().AsIoBuffer();
 			MetaPayload.SetContentType(ZenContentType::kCbObject);
 			JupiterResult PutMetaResult =
 				Session.PutBlockMetadata(m_Namespace, m_Bucket, m_BuildId, m_OplogBuildPartId, RawHash, MetaPayload);
@@ -357,8 +326,7 @@ public:
 										   Result.Reason);
 			return Result;
 		}
-		CbObject BlocksObject = LoadCompactBinaryObject(FindResult.Response);
-		if (!BlocksObject)
+		if (ValidateCompactBinary(FindResult.Response.GetView(), CbValidateMode::Default) != CbValidateError::None)
 		{
 			Result.ErrorCode = gsl::narrow<int32_t>(HttpResponseCode::InternalServerError);
 			Result.Reason	 = fmt::format("The block list {}/{}/{}/{} is not formatted as a compact binary object"sv,
@@ -369,25 +337,20 @@ public:
 										   m_OplogBuildPartId);
 			return Result;
 		}
-
-		CbArrayView Blocks = BlocksObject["blocks"].AsArrayView();
-		Result.Blocks.reserve(Blocks.Num());
-		for (CbFieldView BlockView : Blocks)
+		std::optional<std::vector<ChunkBlockDescription>> Blocks =
+			ParseChunkBlockDescriptionList(LoadCompactBinaryObject(FindResult.Response));
+		if (!Blocks)
 		{
-			CbObjectView BlockObject = BlockView.AsObjectView();
-			IoHash		 BlockHash	 = BlockObject["rawHash"sv].AsHash();
-			if (BlockHash != IoHash::Zero)
-			{
-				CbArrayView			ChunksArray = BlockObject["rawHashes"sv].AsArrayView();
-				std::vector<IoHash> ChunkHashes;
-				ChunkHashes.reserve(ChunksArray.Num());
-				for (CbFieldView ChunkView : ChunksArray)
-				{
-					ChunkHashes.push_back(ChunkView.AsHash());
-				}
-				Result.Blocks.emplace_back(Block{.BlockHash = BlockHash, .ChunkHashes = ChunkHashes});
-			}
+			Result.ErrorCode = gsl::narrow<int32_t>(HttpResponseCode::InternalServerError);
+			Result.Reason	 = fmt::format("The block list {}/{}/{}/{} is not formatted as a list of blocks"sv,
+										   m_JupiterClient->ServiceUrl(),
+										   m_Namespace,
+										   m_Bucket,
+										   m_BuildId,
+										   m_OplogBuildPartId);
+			return Result;
 		}
+		Result.Blocks = std::move(Blocks.value());
 		return Result;
 	}