Merge pull request #509 from ue-foundation/zs/put-overwrite-policy-response

Zs/put overwrite policy response

1 files changed, 19 insertions, 11 deletions

diff --git a/src/zenstore/cache/cachedisklayer.cpp b/src/zenstore/cache/cachedisklayer.cpp
index fd52cdab5..ba82dd942 100644
--- a/src/zenstore/cache/cachedisklayer.cpp
+++ b/src/zenstore/cache/cachedisklayer.cpp
@@ -1968,17 +1968,19 @@ ZenCacheDiskLayer::CacheBucket::ShouldRejectPut(const IoHash&				  HashKey,
 					IndexLock.ReleaseNow();
 					if (!cache::impl::UpdateValueWithRawSizeAndHash(InOutValue))
 					{
-						OutPutResult = PutResult{zen::PutStatus::Fail, "Value provided is of bad format"};
+						CbObjectWriter DetailWriter;
+						DetailWriter.AddString("Message", "Value provided is of bad format");
+						OutPutResult = PutResult{zen::PutStatus::Fail, DetailWriter.Save()};
 						return true;
 					}
 					else if (MetaData.RawSize != InOutValue.RawSize || MetaData.RawHash != InOutValue.RawHash)
 					{
-						OutPutResult = PutResult{
-							zen::PutStatus::Conflict,
-							fmt::format("Value exists with different size '{}' or hash '{}'", MetaData.RawSize, MetaData.RawHash)};
-						return true;
+						// Deliberate fall through without return so that we load the value and include it in the result
+					}
+					else
+					{
+						return false;
 					}
-					return false;
 				}
 			}
 
@@ -2008,16 +2010,22 @@ ZenCacheDiskLayer::CacheBucket::ShouldRejectPut(const IoHash&				  HashKey,
 				{
 					if (!cache::impl::UpdateValueWithRawSizeAndHash(InOutValue))
 					{
-						OutPutResult = PutResult{zen::PutStatus::Fail, "Value provided is of bad format"};
+						CbObjectWriter DetailWriter;
+						DetailWriter.AddString("Message", "Value provided is of bad format");
+						OutPutResult = PutResult{zen::PutStatus::Fail, DetailWriter.Save()};
 						return true;
 					}
 
 					if (ExistingValue.RawSize != InOutValue.RawSize || ExistingValue.RawHash != InOutValue.RawHash)
 					{
-						OutPutResult = PutResult{zen::PutStatus::Conflict,
-												 fmt::format("Value exists with different size '{}' or hash '{}'",
-															 ExistingValue.RawSize,
-															 ExistingValue.RawHash)};
+						CbObjectWriter DetailWriter;
+						DetailWriter.AddInteger("RawSize", ExistingValue.RawSize);
+						DetailWriter.AddHash("RawHash", ExistingValue.RawHash);
+						if (Location.IsFlagSet(DiskLocation::kStructured))
+						{
+							DetailWriter.AddObject("Record", CbObject(SharedBuffer(ExistingValue.Value)));
+						}
+						OutPutResult = PutResult{zen::PutStatus::Conflict, DetailWriter.Save()};
 						return true;
 					}
 				}