diff options
Diffstat (limited to 'src/zenstore/cache/cachedisklayer.cpp')
| -rw-r--r-- | src/zenstore/cache/cachedisklayer.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/zenstore/cache/cachedisklayer.cpp b/src/zenstore/cache/cachedisklayer.cpp index 9a56844fe..ba82dd942 100644 --- a/src/zenstore/cache/cachedisklayer.cpp +++ b/src/zenstore/cache/cachedisklayer.cpp @@ -1969,7 +1969,7 @@ ZenCacheDiskLayer::CacheBucket::ShouldRejectPut(const IoHash& HashKey, if (!cache::impl::UpdateValueWithRawSizeAndHash(InOutValue)) { CbObjectWriter DetailWriter; - DetailWriter.AddString("Value provided is of bad format"); + DetailWriter.AddString("Message", "Value provided is of bad format"); OutPutResult = PutResult{zen::PutStatus::Fail, DetailWriter.Save()}; return true; } @@ -2011,7 +2011,7 @@ ZenCacheDiskLayer::CacheBucket::ShouldRejectPut(const IoHash& HashKey, if (!cache::impl::UpdateValueWithRawSizeAndHash(InOutValue)) { CbObjectWriter DetailWriter; - DetailWriter.AddString("Value provided is of bad format"); + DetailWriter.AddString("Message", "Value provided is of bad format"); OutPutResult = PutResult{zen::PutStatus::Fail, DetailWriter.Save()}; return true; } @@ -2019,16 +2019,11 @@ ZenCacheDiskLayer::CacheBucket::ShouldRejectPut(const IoHash& HashKey, if (ExistingValue.RawSize != InOutValue.RawSize || ExistingValue.RawHash != InOutValue.RawHash) { CbObjectWriter DetailWriter; + DetailWriter.AddInteger("RawSize", ExistingValue.RawSize); + DetailWriter.AddHash("RawHash", ExistingValue.RawHash); if (Location.IsFlagSet(DiskLocation::kStructured)) { - DetailWriter.AddInteger("RawSize", ExistingValue.RawSize); - DetailWriter.AddHash("RawHash", ExistingValue.RawHash); - DetailWriter.AddObject("Object", CbObjectView(ExistingValue.Value.GetData())); - } - else - { - DetailWriter.AddInteger("RawSize", ExistingValue.RawSize); - DetailWriter.AddHash("RawHash", ExistingValue.RawHash); + DetailWriter.AddObject("Record", CbObject(SharedBuffer(ExistingValue.Value))); } OutPutResult = PutResult{zen::PutStatus::Conflict, DetailWriter.Save()}; return true; |