WIP

1 files changed, 50 insertions, 8 deletions

diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp
index 45bbe062b..06b41a014 100644
--- a/zenserver/cache/structuredcache.cpp
+++ b/zenserver/cache/structuredcache.cpp
@@ -543,10 +543,7 @@ HttpStructuredCacheService::HandleGetCacheRecord(zen::HttpServerRequest& Request
 				{
 					Package.SetObject(LoadCompactBinaryObject(ClientResultValue.Value));
 
-					BinaryWriter MemStream;
-					Package.Save(MemStream);
-
-					ClientResultValue.Value = IoBuffer(IoBuffer::Clone, MemStream.Data(), MemStream.Size());
+					ClientResultValue.Value = Package.SaveAsIoBuffer();
 					ClientResultValue.Value.SetContentType(HttpContentType::kCbPackage);
 				}
 			}
@@ -688,18 +685,17 @@ HttpStructuredCacheService::HandleGetCacheRecord(zen::HttpServerRequest& Request
 							m_CacheStore.Put(Ref.Namespace, Ref.BucketSegment, Ref.HashKey, CacheValue);
 						}
 
-						BinaryWriter MemStream;
+						//						BinaryWriter MemStream;
 						if (SkipData)
 						{
 							// Save a package containing only the object.
-							CbPackage(Package.GetObject()).Save(MemStream);
+							ClientResultValue.Value = CbPackage(Package.GetObject()).SaveAsIoBuffer();
 						}
 						else
 						{
-							Package.Save(MemStream);
+							ClientResultValue.Value = Package.SaveAsIoBuffer();
 						}
 
-						ClientResultValue.Value = IoBuffer(IoBuffer::Clone, MemStream.Data(), MemStream.Size());
 						ClientResultValue.Value.SetContentType(ZenContentType::kCbPackage);
 					}
 					else
@@ -725,6 +721,18 @@ HttpStructuredCacheService::HandleGetCacheRecord(zen::HttpServerRequest& Request
 
 		if (Success)
 		{
+			ZEN_DEBUG("HIT - '{}/{}' {} '{}' (UPSTREAM)",
+					  Ref.BucketSegment,
+					  Ref.HashKey,
+					  NiceBytes(ClientResultValue.Value.Size()),
+					  ToString(ClientResultValue.Value.GetContentType()));
+
+			//			ZEN_DEBUG("HIT - '{}/{}' {} '{}' (UPSTREAM)",
+			//					  Ref.BucketSegment,
+			//					  Ref.HashKey,
+			//					  NiceBytes(ClientResultValue.Value.Size()),
+			//					  ToString(ClientResultValue.Value.GetContentType()));
+			//
 			ZEN_DEBUG("HIT - '{}/{}/{}' {} '{}' (UPSTREAM)",
 					  Ref.Namespace,
 					  Ref.BucketSegment,
@@ -748,6 +756,8 @@ HttpStructuredCacheService::HandleGetCacheRecord(zen::HttpServerRequest& Request
 		}
 		else
 		{
+			ZEN_DEBUG("MISS - '{}/{}' '{}'", Ref.BucketSegment, Ref.HashKey, ToString(AcceptType));
+			//			ZEN_DEBUG("MISS - '{}/{}' '{}'", Ref.BucketSegment, Ref.HashKey, ToString(AcceptType));
 			ZEN_DEBUG("MISS - '{}/{}/{}' '{}'", Ref.Namespace, Ref.BucketSegment, Ref.HashKey, ToString(AcceptType));
 			m_CacheStats.MissCount++;
 			AsyncRequest.WriteResponse(HttpResponseCode::NotFound);
@@ -891,6 +901,22 @@ HttpStructuredCacheService::HandlePutCacheRecord(zen::HttpServerRequest& Request
 			return Request.WriteResponse(HttpResponseCode::BadRequest, HttpContentType::kText, "Invalid attachment(s)"sv);
 		}
 
+		ZEN_DEBUG("PUT - '{}/{}' {} '{}', attachments '{}/{}/{}' (new/valid/total)",
+				  Ref.BucketSegment,
+				  Ref.HashKey,
+				  NiceBytes(Body.GetSize()),
+				  ToString(ContentType),
+				  Count.New,
+				  Count.Valid,
+				  Count.Total);
+		//		ZEN_DEBUG("PUT - '{}/{}' {} '{}', attachments '{}/{}/{}' (new/valid/total)",
+		//				  Ref.BucketSegment,
+		//				  Ref.HashKey,
+		//				  NiceBytes(Body.GetSize()),
+		//				  ToString(ContentType),
+		//				  Count.New,
+		//				  Count.Valid,
+		//				  Count.Total);
 		ZEN_DEBUG("PUT - '{}/{}/{}' {} '{}', attachments '{}/{}/{}' (new/valid/total)",
 				  Ref.Namespace,
 				  Ref.BucketSegment,
@@ -1238,6 +1264,20 @@ HttpStructuredCacheService::PutCacheRecord(PutRequestData& Request, const CbPack
 		return PutResult::Invalid;
 	}
 
+	ZEN_DEBUG("PUT - '{}/{}' {}, attachments '{}/{}/{}' (new/valid/total)",
+			  Request.Key.Bucket,
+			  Request.Key.Hash,
+			  NiceBytes(TransferredSize),
+			  Count.New,
+			  Count.Valid,
+			  Count.Total);
+	//	ZEN_DEBUG("PUT - '{}/{}' {}, attachments '{}/{}/{}' (new/valid/total)",
+	//			  Request.Key.Bucket,
+	//			  Request.Key.Hash,
+	//			  NiceBytes(TransferredSize),
+	//			  Count.New,
+	//			  Count.Valid,
+	//			  Count.Total);
 	ZEN_DEBUG("PUT - '{}/{}/{}' {}, attachments '{}/{}/{}' (new/valid/total)",
 			  Request.Namespace,
 			  Request.Key.Bucket,
@@ -1776,6 +1816,8 @@ HttpStructuredCacheService::HandleRpcGetCacheValues(zen::HttpServerRequest& Http
 		}
 		else
 		{
+			ZEN_DEBUG("GETCACHEVALUES MISS - '{}/{}'", Key.Bucket, Key.Hash);
+			//			ZEN_DEBUG("GETCACHEVALUES MISS - '{}/{}'", Key.Bucket, Key.Hash);
 			ZEN_DEBUG("GETCACHEVALUES MISS - '{}/{}/{}' ({}) in {}",
 					  *Namespace,
 					  Key.Bucket,