diff options
| author | Per Larsson <[email protected]> | 2021-11-11 15:10:08 +0100 |
|---|---|---|
| committer | Per Larsson <[email protected]> | 2021-11-11 15:10:08 +0100 |
| commit | b15b04b55ecfa0335c168561c61a7568538fccb8 (patch) | |
| tree | 40f68a324f081746c74c423d8c478d3da6b1b4cc /zenserver | |
| parent | Handle batch requests asynchronously. (diff) | |
| parent | Format fix. (diff) | |
| download | zen-b15b04b55ecfa0335c168561c61a7568538fccb8.tar.xz zen-b15b04b55ecfa0335c168561c61a7568538fccb8.zip | |
Merge branch 'main' into zcache-batch
Diffstat (limited to 'zenserver')
| -rw-r--r-- | zenserver/cache/structuredcachestore.cpp | 15 | ||||
| -rw-r--r-- | zenserver/cache/structuredcachestore.h | 6 | ||||
| -rw-r--r-- | zenserver/upstream/upstreamcache.cpp | 6 |
3 files changed, 16 insertions, 11 deletions
diff --git a/zenserver/cache/structuredcachestore.cpp b/zenserver/cache/structuredcachestore.cpp index 119062833..8b9ce8ff9 100644 --- a/zenserver/cache/structuredcachestore.cpp +++ b/zenserver/cache/structuredcachestore.cpp @@ -325,27 +325,32 @@ inline DiskLocation::DiskLocation(uint64_t Offset, uint64_t ValueSize, uint32_t { } -inline uint64_t DiskLocation::CombineOffsetAndFlags(uint64_t Offset, uint64_t Flags) +inline uint64_t +DiskLocation::CombineOffsetAndFlags(uint64_t Offset, uint64_t Flags) { return Offset | Flags; } -inline uint64_t DiskLocation::Offset() const +inline uint64_t +DiskLocation::Offset() const { return OffsetAndFlags & kOffsetMask; } -inline uint64_t DiskLocation::Size() const +inline uint64_t +DiskLocation::Size() const { return LowerSize; } -inline uint64_t DiskLocation::IsFlagSet(uint64_t Flag) const +inline uint64_t +DiskLocation::IsFlagSet(uint64_t Flag) const { return OffsetAndFlags & Flag; } -inline ZenContentType DiskLocation::GetContentType() const +inline ZenContentType +DiskLocation::GetContentType() const { ZenContentType ContentType = ZenContentType::kBinary; diff --git a/zenserver/cache/structuredcachestore.h b/zenserver/cache/structuredcachestore.h index 6521d8393..0dfcbc5ca 100644 --- a/zenserver/cache/structuredcachestore.h +++ b/zenserver/cache/structuredcachestore.h @@ -112,9 +112,9 @@ struct DiskLocation static const uint64_t kStructured = 0x4000'0000'0000'0000ull; static const uint64_t kTombStone = 0x2000'0000'0000'0000ull; - DiskLocation(); - DiskLocation(uint64_t Offset, uint64_t ValueSize, uint32_t IndexSize, uint64_t Flags); - static uint64_t CombineOffsetAndFlags(uint64_t Offset, uint64_t Flags); + DiskLocation(); + DiskLocation(uint64_t Offset, uint64_t ValueSize, uint32_t IndexSize, uint64_t Flags); + static uint64_t CombineOffsetAndFlags(uint64_t Offset, uint64_t Flags); uint64_t Offset() const; uint64_t Size() const; uint64_t IsFlagSet(uint64_t Flag) const; diff --git a/zenserver/upstream/upstreamcache.cpp b/zenserver/upstream/upstreamcache.cpp index b486b751c..174c3d17a 100644 --- a/zenserver/upstream/upstreamcache.cpp +++ b/zenserver/upstream/upstreamcache.cpp @@ -262,7 +262,7 @@ namespace detail { using namespace fmt::literals; ZEN_ASSERT(CacheRecord.PayloadIds.size() == Payloads.size()); - const size_t MaxAttempts = 3; + const int32_t MaxAttempts = 3; try { @@ -307,7 +307,7 @@ namespace detail { const size_t Idx = std::distance(std::begin(CacheRecord.PayloadIds), It); CloudCacheResult BlobResult; - for (size_t Attempt = 0; Attempt < MaxAttempts && !BlobResult.Success; Attempt++) + for (int32_t Attempt = 0; Attempt < MaxAttempts && !BlobResult.Success; Attempt++) { BlobResult = Session.PutCompressedBlob(CacheRecord.PayloadIds[Idx], Payloads[Idx]); } @@ -726,7 +726,7 @@ namespace detail { std::span<IoBuffer const> Payloads) override { ZEN_ASSERT(CacheRecord.PayloadIds.size() == Payloads.size()); - const uint32_t MaxAttempts = 3; + const int32_t MaxAttempts = 3; try { |