don't add batch overhead if we are only going to put one cache value

1 files changed, 19 insertions, 5 deletions

diff --git a/src/zenstore/cache/cacherpc.cpp b/src/zenstore/cache/cacherpc.cpp
index b7f456d5c..6cdfeabd0 100644
--- a/src/zenstore/cache/cacherpc.cpp
+++ b/src/zenstore/cache/cacherpc.cpp
@@ -808,9 +808,16 @@ CacheRpcHandler::HandleRpcPutCacheValues(const CacheRequestContext& Context, con
 	std::vector<size_t>	  BatchResultIndexes;
 	std::vector<bool>	  Results;
 	std::vector<CacheKey> UpstreamCacheKeys;
+	uint64_t			  RequestCount = RequestsArray.Num();
 	{
-		Results.reserve(RequestsArray.Num());
-		ZenCacheStore::PutBatch Batch(m_CacheStore, *Namespace, BatchResults);
+		Results.reserve(RequestCount);
+		std::unique_ptr<ZenCacheStore::PutBatch> Batch;
+		if (RequestCount > 1)
+		{
+			Batch = std::make_unique<ZenCacheStore::PutBatch>(m_CacheStore, *Namespace, BatchResults);
+			BatchResults.reserve(RequestCount);
+			BatchResultIndexes.reserve(RequestCount);
+		}
 		for (CbFieldView RequestField : RequestsArray)
 		{
 			ZEN_TRACE_CPU("Z$::RpcPutCacheValues::Request");
@@ -861,11 +868,18 @@ CacheRpcHandler::HandleRpcPutCacheValues(const CacheRequestContext& Context, con
 										 Key.Hash,
 										 {.Value = Value, .RawSize = RawSize, .RawHash = RawHash},
 										 {},
-										 &Batch);
+										 Batch.get());
 						m_CacheStats.WriteCount++;
+						if (Batch)
+						{
+							BatchResultIndexes.push_back(Results.size());
+							Results.push_back(false);
+						}
+						else
+						{
+							Results.push_back(true);
+						}
 						TransferredSize = Chunk.GetCompressedSize();
-						BatchResultIndexes.push_back(Results.size());
-						Results.push_back(false);
 					}
 					else
 					{