4 files changed, 145 insertions, 2 deletions
diff --git a/src/zenstore/cache/cachedisklayer.cpp b/src/zenstore/cache/cachedisklayer.cpp
index fd92dfa5a..c2e811003 100644
--- a/src/zenstore/cache/cachedisklayer.cpp
+++ b/src/zenstore/cache/cachedisklayer.cpp
@@ -15,9 +15,10 @@
 #include <zencore/trace.h>
 #include <zencore/workthreadpool.h>
 #include <zencore/xxhash.h>
-#include <zenutil/referencemetadata.h>
 #include <zenutil/workerpools.h>
 
+#include "../referencemetadata.h"
+
 #include <future>
 #include <limits>
 
diff --git a/src/zenstore/projectstore.cpp b/src/zenstore/projectstore.cpp
index f23a669b5..8ae74c8cf 100644
--- a/src/zenstore/projectstore.cpp
+++ b/src/zenstore/projectstore.cpp
@@ -18,9 +18,10 @@
 #include <zenstore/caslog.h>
 #include <zenstore/cidstore.h>
 #include <zenstore/scrubcontext.h>
-#include <zenutil/referencemetadata.h>
 #include <zenutil/workerpools.h>
 
+#include "referencemetadata.h"
+
 ZEN_THIRD_PARTY_INCLUDES_START
 #include <tsl/robin_set.h>
 #include <xxh3.h>
diff --git a/src/zenstore/referencemetadata.cpp b/src/zenstore/referencemetadata.cpp
new file mode 100644
index 000000000..e202b435b
--- /dev/null
+++ b/src/zenstore/referencemetadata.cpp
@@ -0,0 +1,32 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include "referencemetadata.h"
+//////////////////////////////////////////////////////////////////////////
+
+#include <zencore/xxhash.h>
+
+namespace zen {
+
+uint32_t
+ReferenceMetaDataHeader::ComputeChecksum() const
+{
+	return XXH32(&Magic, sizeof(ReferenceMetaDataHeader) - sizeof(uint32_t), 0xC0C0'BABA);
+}
+
+bool
+ReferenceMetaDataHeader::IsValid(uint32_t ExpectedMagic) const
+{
+	if (Magic != ExpectedMagic)
+	{
+		return false;
+	}
+
+	if (Checksum != ComputeChecksum())
+	{
+		return false;
+	}
+
+	return true;
+}
+
+}  // namespace zen
diff --git a/src/zenstore/referencemetadata.h b/src/zenstore/referencemetadata.h
new file mode 100644
index 000000000..5160bfb8b
--- /dev/null
+++ b/src/zenstore/referencemetadata.h
@@ -0,0 +1,109 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include <zencore/compositebuffer.h>
+
+ZEN_THIRD_PARTY_INCLUDES_START
+#include <gsl/gsl-lite.hpp>
+ZEN_THIRD_PARTY_INCLUDES_END
+
+namespace zen {
+
+#pragma pack(push)
+#pragma pack(1)
+
+struct ReferenceMetaDataHeader
+{
+	static constexpr uint32_t Version1		 = 1;
+	static constexpr uint32_t CurrentVersion = Version1;
+
+	ReferenceMetaDataHeader(uint32_t InMagic, uint32_t InEntryCount, uint64_t InAttachmentCount)
+	: Magic(InMagic)
+	, EntryCount(InEntryCount)
+	, AttachmentCount(InAttachmentCount)
+	, Checksum(ComputeChecksum())
+	{
+	}
+
+	uint32_t Magic	 = 0xffffffffu;
+	uint32_t Version = CurrentVersion;
+
+	uint32_t EntryCount		 = 0;
+	uint64_t AttachmentCount = 0;
+	uint64_t Padding		 = 0;
+
+	uint32_t Checksum = 0;
+
+	bool IsValid(uint32_t ExpectedMagic) const;
+
+	template<typename KeyType, typename AttachmentType>
+	static uint64_t ExpectedSize(uint32_t EntryCount, uint64_t AttachmentCount)
+	{
+		return sizeof(ReferenceMetaDataHeader) + sizeof(KeyType) * EntryCount + sizeof(uint32_t) * EntryCount +
+			   sizeof(AttachmentType) * AttachmentCount;
+	}
+
+	ReferenceMetaDataHeader() = delete;
+
+private:
+	uint32_t ComputeChecksum() const;
+};
+
+static_assert(sizeof(ReferenceMetaDataHeader) == 32);
+
+#pragma pack(pop)
+
+template<typename KeyType, typename AttachmentType>
+CompositeBuffer
+BuildReferenceMetaData(uint32_t						   HeaderMagic,
+					   std::span<const KeyType>		   Keys,
+					   std::span<const uint32_t>	   AttachmentCounts,
+					   std::span<const AttachmentType> Attachments)
+{
+	uint32_t KeyCount = gsl::narrow<uint32_t>(Keys.size());
+
+	ReferenceMetaDataHeader Header(HeaderMagic, KeyCount, Attachments.size());
+	return CompositeBuffer(std::vector<SharedBuffer>{
+		SharedBuffer(IoBuffer(IoBuffer::Clone, &Header, sizeof(ReferenceMetaDataHeader))),
+		SharedBuffer(IoBuffer(IoBuffer::Wrap, Keys.data(), sizeof(KeyType) * Keys.size())),
+		SharedBuffer(IoBuffer(IoBuffer::Wrap, AttachmentCounts.data(), sizeof(uint32_t) * AttachmentCounts.size())),
+		SharedBuffer(IoBuffer(IoBuffer::Wrap, Attachments.data(), sizeof(AttachmentType) * Attachments.size()))});
+}
+
+template<typename KeyType, typename AttachmentType>
+bool
+GetAttachmentsFromMetaData(const IoBuffer&													  MetaData,
+						   const uint32_t													  ExpectedHeaderMagic,
+						   std::function<void(std::span<const KeyType>		  Keys,
+											  std::span<const uint32_t>		  AttachmentCounts,
+											  std::span<const AttachmentType> Attachments)>&& Parser)
+{
+	MemoryView PayloadView = MetaData.GetView();
+	if (PayloadView.GetSize() >= sizeof(ReferenceMetaDataHeader))
+	{
+		const ReferenceMetaDataHeader* Header = (const ReferenceMetaDataHeader*)PayloadView.GetData();
+		if (Header->IsValid(ExpectedHeaderMagic))
+		{
+			if (MetaData.GetSize() ==
+				ReferenceMetaDataHeader::ExpectedSize<KeyType, AttachmentType>(Header->EntryCount, Header->AttachmentCount))
+			{
+				PayloadView.MidInline(sizeof(ReferenceMetaDataHeader));
+				std::span<const KeyType> PayloadKeys = {(const KeyType*)PayloadView.GetData(), Header->EntryCount};
+				PayloadView.MidInline(sizeof(KeyType) * Header->EntryCount);
+				std::span<const uint32_t> PayloadAttachmentCounts = {(const uint32_t*)PayloadView.GetData(), Header->EntryCount};
+				PayloadView.MidInline(sizeof(uint32_t) * Header->EntryCount);
+				std::span<const AttachmentType> PayloadAttachments = {(const AttachmentType*)PayloadView.GetData(),
+																	  Header->AttachmentCount};
+				PayloadView.MidInline(sizeof(AttachmentType) * Header->AttachmentCount);
+				ZEN_ASSERT(PayloadView.GetSize() == 0);
+
+				Parser(PayloadKeys, PayloadAttachmentCounts, PayloadAttachments);
+
+				return true;
+			}
+		}
+	}
+	return false;
+}
+}  // namespace zen