diff options
| -rw-r--r-- | src/zenserver-test/zenserver-test.cpp | 2 | ||||
| -rw-r--r-- | src/zenstore/cache/cachedisklayer.cpp | 15 | ||||
| -rw-r--r-- | src/zenstore/cache/cacherpc.cpp | 4 | ||||
| -rw-r--r-- | src/zenstore/cache/structuredcachestore.cpp | 4 |
4 files changed, 10 insertions, 15 deletions
diff --git a/src/zenserver-test/zenserver-test.cpp b/src/zenserver-test/zenserver-test.cpp index 1cbd10194..0ea953937 100644 --- a/src/zenserver-test/zenserver-test.cpp +++ b/src/zenserver-test/zenserver-test.cpp @@ -1631,7 +1631,7 @@ TEST_CASE("zcache.rpc") CHECK(Details); CHECK(Details["RawHash"sv].IsHash()); CHECK(Details["RawSize"sv].IsInteger()); - CHECK(Details["Object"sv].IsObject()); + CHECK(Details["Record"sv].IsObject()); } } 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; diff --git a/src/zenstore/cache/cacherpc.cpp b/src/zenstore/cache/cacherpc.cpp index 5cecc8b6b..77ca26409 100644 --- a/src/zenstore/cache/cacherpc.cpp +++ b/src/zenstore/cache/cacherpc.cpp @@ -438,7 +438,7 @@ CacheRpcHandler::PutCacheRecord(PutRequestData& Request, const CbPackage* Packag if (Count.Invalid > 0) { CbObjectWriter DetailWriter; - DetailWriter.AddString(fmt::format("Found {}/{} invalid attachments", Count.Invalid, Count.Total)); + DetailWriter.AddString("Message", fmt::format("Found {}/{} invalid attachments", Count.Invalid, Count.Total)); return ZenCacheStore::PutResult{PutStatus::Invalid, DetailWriter.Save()}; } @@ -1068,7 +1068,7 @@ CacheRpcHandler::HandleRpcPutCacheValues(const CacheRequestContext& Context, con else { CbObjectWriter DetailWriter; - DetailWriter.AddString(fmt::format("Missing attachment with raw hash {}", RawHash)); + DetailWriter.AddString("Message", fmt::format("Missing attachment with raw hash {}", RawHash)); Results.push_back({zen::PutStatus::Fail, DetailWriter.Save()}); } } diff --git a/src/zenstore/cache/structuredcachestore.cpp b/src/zenstore/cache/structuredcachestore.cpp index 51c80dbc7..b58f70ea7 100644 --- a/src/zenstore/cache/structuredcachestore.cpp +++ b/src/zenstore/cache/structuredcachestore.cpp @@ -731,7 +731,7 @@ ZenCacheStore::Put(const CacheRequestContext& Context, { m_RejectedWriteCount++; CbObjectWriter DetailWriter; - DetailWriter.AddString("Bad bucket name"); + DetailWriter.AddString("Message", "Bad bucket name"); return PutResult{zen::PutStatus::Invalid, DetailWriter.Save()}; } @@ -781,7 +781,7 @@ ZenCacheStore::Put(const CacheRequestContext& Context, HashKey.ToHexString()); CbObjectWriter DetailWriter; - DetailWriter.AddString(fmt::format("Unknown namespace '{}'", Namespace)); + DetailWriter.AddString("Message", fmt::format("Unknown namespace '{}'", Namespace)); return PutResult{zen::PutStatus::Fail, DetailWriter.Save()}; } |