faster oplog validate (#408)

Improvement: Faster oplog validate to reduce GC wall time and disk I/O pressure

1 files changed, 16 insertions, 9 deletions

diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp
index 7d22da717..3ec4373a2 100644
--- a/src/zenserver/projectstore/projectstore.cpp
+++ b/src/zenserver/projectstore/projectstore.cpp
@@ -1511,11 +1511,17 @@ ProjectStore::Oplog::Validate(std::atomic_bool& IsCancelledFlag, WorkerThreadPoo
 
 	ValidationResult Result;
 
+	const size_t OpCount = OplogCount();
+
 	std::vector<Oid>				 KeyHashes;
 	std::vector<std::string>		 Keys;
 	std::vector<std::vector<IoHash>> Attachments;
 	std::vector<OplogEntryMapping>	 Mappings;
 
+	KeyHashes.reserve(OpCount);
+	Keys.reserve(OpCount);
+	Mappings.reserve(OpCount);
+
 	IterateOplogWithKey([&](uint32_t LSN, const Oid& Key, CbObjectView OpView) {
 		Result.LSNLow  = Min(Result.LSNLow, LSN);
 		Result.LSNHigh = Max(Result.LSNHigh, LSN);
@@ -1540,20 +1546,22 @@ ProjectStore::Oplog::Validate(std::atomic_bool& IsCancelledFlag, WorkerThreadPoo
 		bool					 HasMissingEntries = false;
 		for (const ChunkMapping& Chunk : Mapping.Chunks)
 		{
-			if (IoBuffer Payload = m_CidStore.FindChunkByCid(Chunk.Hash); !Payload)
+			if (!m_CidStore.ContainsChunk(Chunk.Hash))
 			{
 				ResultLock.WithExclusiveLock([&]() { Result.MissingChunks.push_back({KeyHash, Chunk}); });
 				HasMissingEntries = true;
 			}
 		}
+
 		for (const ChunkMapping& Meta : Mapping.Meta)
 		{
-			if (IoBuffer Payload = m_CidStore.FindChunkByCid(Meta.Hash); !Payload)
+			if (!m_CidStore.ContainsChunk(Meta.Hash))
 			{
 				ResultLock.WithExclusiveLock([&]() { Result.MissingMetas.push_back({KeyHash, Meta}); });
 				HasMissingEntries = true;
 			}
 		}
+
 		for (const FileMapping& File : Mapping.Files)
 		{
 			if (File.Hash == IoHash::Zero)
@@ -1565,24 +1573,23 @@ ProjectStore::Oplog::Validate(std::atomic_bool& IsCancelledFlag, WorkerThreadPoo
 					HasMissingEntries = true;
 				}
 			}
-			else
+			else if (!m_CidStore.ContainsChunk(File.Hash))
 			{
-				if (IoBuffer Payload = m_CidStore.FindChunkByCid(File.Hash); !Payload)
-				{
-					ResultLock.WithExclusiveLock([&]() { Result.MissingFiles.push_back({KeyHash, File}); });
-					HasMissingEntries = true;
-				}
+				ResultLock.WithExclusiveLock([&]() { Result.MissingFiles.push_back({KeyHash, File}); });
+				HasMissingEntries = true;
 			}
 		}
+
 		const std::vector<IoHash>& OpAttachments = Attachments[OpIndex];
 		for (const IoHash& Attachment : OpAttachments)
 		{
-			if (IoBuffer Payload = m_CidStore.FindChunkByCid(Attachment); !Payload)
+			if (!m_CidStore.ContainsChunk(Attachment))
 			{
 				ResultLock.WithExclusiveLock([&]() { Result.MissingAttachments.push_back({KeyHash, Attachment}); });
 				HasMissingEntries = true;
 			}
 		}
+
 		if (HasMissingEntries)
 		{
 			ResultLock.WithExclusiveLock([&]() { Result.OpKeys.push_back({KeyHash, Key}); });