fix oplog chunk batch get (#221)

* fix batch request not handling missing chunks correctly
* fix CorrelationId in oplog batch chunk fetch

1 files changed, 7 insertions, 5 deletions

diff --git a/src/zenserver/projectstore/httpprojectstore.cpp b/src/zenserver/projectstore/httpprojectstore.cpp
index 710cbe5a7..2954bcdc0 100644
--- a/src/zenserver/projectstore/httpprojectstore.cpp
+++ b/src/zenserver/projectstore/httpprojectstore.cpp
@@ -576,22 +576,24 @@ HttpProjectService::HandleChunkBatchRequest(HttpRouterRequest& Req)
 	ResponsePtr += sizeof(ResponseHdr);
 	for (uint32_t ChunkIndex = 0; ChunkIndex < RequestHdr.ChunkCount; ++ChunkIndex)
 	{
-		// const RequestChunkEntry& RequestedChunk = RequestedChunks[ChunkIndex];
-		const IoBuffer&	   FoundChunk(OutBlobs[ChunkIndex + 1]);
-		ResponseChunkEntry ResponseChunk;
-		ResponseChunk.CorrelationId = ChunkIndex;
+		const RequestChunkEntry& RequestedChunk = RequestedChunks[ChunkIndex];
+		const IoBuffer&			 FoundChunk(OutBlobs[ChunkIndex + 1]);
+		ResponseChunkEntry		 ResponseChunk;
+		ResponseChunk.CorrelationId = RequestedChunk.CorrelationId;
 		if (FoundChunk)
 		{
 			ResponseChunk.ChunkSize = FoundChunk.Size();
+			m_ProjectStats.ChunkHitCount++;
 		}
 		else
 		{
 			ResponseChunk.ChunkSize = uint64_t(-1);
+			m_ProjectStats.ChunkMissCount++;
 		}
 		memcpy(ResponsePtr, &ResponseChunk, sizeof(ResponseChunk));
 		ResponsePtr += sizeof(ResponseChunk);
 	}
-	m_ProjectStats.ChunkHitCount += RequestHdr.ChunkCount;
+	std::erase_if(OutBlobs, [](IoBuffer Buffer) -> bool { return !Buffer; });
 	return HttpReq.WriteResponse(HttpResponseCode::OK, HttpContentType::kBinary, OutBlobs);
 }