1 files changed, 96 insertions, 21 deletions

diff --git a/zenstore/CAS.cpp b/zenstore/CAS.cpp
index 807bba3b3..7ec91cfa5 100644
--- a/zenstore/CAS.cpp
+++ b/zenstore/CAS.cpp
@@ -5,6 +5,9 @@
 #include "compactcas.h"
 #include "filecas.h"
 
+#include <zencore/compactbinary.h>
+#include <zencore/compactbinarybuilder.h>
+#include <zencore/compactbinaryvalidation.h>
 #include <zencore/except.h>
 #include <zencore/fmtutils.h>
 #include <zencore/logging.h>
@@ -105,6 +108,18 @@ private:
 	CasContainerStrategy m_TinyStrategy;
 	CasContainerStrategy m_SmallStrategy;
 	FileCasStrategy		 m_LargeStrategy;
+	CbObject			 m_ManifestObject;
+
+	enum class StorageScheme
+	{
+		Legacy		   = 0,
+		WithCbManifest = 1
+	};
+
+	StorageScheme m_StorageScheme = StorageScheme::Legacy;
+
+	bool OpenOrCreateManifest();
+	void UpdateManifest(bool IsNewStore);
 };
 
 CasImpl::CasImpl() : m_TinyStrategy(m_Config), m_SmallStrategy(m_Config), m_LargeStrategy(m_Config)
@@ -127,39 +142,99 @@ CasImpl::Initialize(const CasStoreConfiguration& InConfig)
 	std::filesystem::create_directories(m_Config.RootDirectory);
 
 	// Open or create manifest
-	//
-	//  The manifest is not currently fully implemented. The goal is to
-	//  use it for recovery and configuration
 
+	const bool IsNewStore = OpenOrCreateManifest();
+
+	// Initialize payload storage
+
+	m_TinyStrategy.Initialize("tobs", 16, IsNewStore);
+	m_SmallStrategy.Initialize("sobs", 4096, IsNewStore);
+}
+
+bool
+CasImpl::OpenOrCreateManifest()
+{
 	bool IsNewStore = false;
 
-	{
-		std::filesystem::path ManifestPath = m_Config.RootDirectory;
-		ManifestPath /= ".ucas_root";
+	std::filesystem::path ManifestPath = m_Config.RootDirectory;
+	ManifestPath /= ".ucas_root";
 
-		std::error_code Ec;
-		BasicFile		Marker;
-		Marker.Open(ManifestPath.c_str(), /* IsCreate */ false, Ec);
+	std::error_code Ec;
+	BasicFile		ManifestFile;
+	ManifestFile.Open(ManifestPath.c_str(), /* IsCreate */ false, Ec);
 
-		if (Ec)
+	bool ManifestIsOk = false;
+
+	if (Ec)
+	{
+		if (Ec == std::errc::no_such_file_or_directory)
 		{
 			IsNewStore = true;
+		}
+	}
+	else
+	{
+		IoBuffer ManifestBuffer = ManifestFile.ReadAll();
+		ManifestFile.Close();
 
-			ExtendableStringBuilder<128> manifest;
-			manifest.Append("#CAS_ROOT\n");
-			manifest.Append("ID=");
-			zen::Oid id = zen::Oid::NewOid();
-			id.ToString(manifest);
-
-			Marker.Open(ManifestPath.c_str(), /* IsCreate */ true);
-			Marker.Write(manifest.c_str(), (DWORD)manifest.Size(), 0);
+		if (ManifestBuffer.Size() > 0 && ManifestBuffer.Data<uint8_t>()[0] == '#')
+		{
+			// Old-style manifest, does not contain any useful information, so we may as well update it
+		}
+		else
+		{
+			CbObject		Manifest{SharedBuffer(ManifestBuffer)};
+			CbValidateError ValidationResult = ValidateCompactBinary(ManifestBuffer, CbValidateMode::All);
+
+			if (ValidationResult == CbValidateError::None)
+			{
+				if (Manifest["id"])
+				{
+					ManifestIsOk = true;
+				}
+			}
+			else
+			{
+				ZEN_ERROR("Store manifest validation failed: {:#x}, will generate new manifest to recover", ValidationResult);
+			}
+
+			if (ManifestIsOk)
+			{
+				m_ManifestObject = std::move(Manifest);
+			}
 		}
 	}
 
-	// Initialize payload storage
+	if (!ManifestIsOk)
+	{
+		UpdateManifest(true);
+	}
 
-	m_TinyStrategy.Initialize("tobs", 16, IsNewStore);
-	m_SmallStrategy.Initialize("sobs", 4096, IsNewStore);
+	return IsNewStore;
+}
+
+void
+CasImpl::UpdateManifest(bool IsNewStore)
+{
+	if (!m_ManifestObject)
+	{
+		CbObjectWriter Cbo;
+		Cbo << "id" << zen::Oid::NewOid() << "created" << DateTime::Now();
+		m_ManifestObject = Cbo.Save();
+	}
+
+	// Write manifest to file
+
+	std::filesystem::path ManifestPath = m_Config.RootDirectory;
+	ManifestPath /= ".ucas_root";
+
+	// This will throw on failure
+
+	ZEN_TRACE("Writing new manifest to '{}'", ManifestPath);
+
+	BasicFile Marker;
+	Marker.Open(ManifestPath.c_str(), /* IsCreate */ true);
+	Marker.Write(m_ManifestObject.GetBuffer(), 0);
 }
 
 CasStore::InsertResult