From 9086231f3923c0df6d9ef817441bfae5e134e8ff Mon Sep 17 00:00:00 2001 From: Martin Ridgers Date: Mon, 10 Jan 2022 12:07:03 +0100 Subject: Converted use of _format UDL to fmt::format --- zenserver/cache/structuredcache.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'zenserver/cache/structuredcache.cpp') diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp index 1d43d372b..3bcc3be87 100644 --- a/zenserver/cache/structuredcache.cpp +++ b/zenserver/cache/structuredcache.cpp @@ -813,8 +813,6 @@ HttpStructuredCacheService::HandleRpcGetCacheRecords(zen::HttpServerRequest& Req { ZEN_TRACE_CPU("Z$::RpcGetCacheRecords"); - using namespace fmt::literals; - CbPackage RpcResponse; CacheRecordPolicy Policy; CbObjectView Params = RpcRequest["Params"sv].AsObjectView(); @@ -1011,8 +1009,6 @@ HttpStructuredCacheService::HandleRpcGetCachePayloads(zen::HttpServerRequest& Re { ZEN_TRACE_CPU("Z$::RpcGetCachePayloads"); - using namespace fmt::literals; - ZEN_ASSERT(RpcRequest["Method"sv].AsString() == "GetCachePayloads"sv); std::vector ChunkRequests; -- cgit v1.2.3 From 3b90970ef117efc2e165a9d0f3b519f261face1a Mon Sep 17 00:00:00 2001 From: Martin Ridgers Date: Mon, 10 Jan 2022 12:29:54 +0100 Subject: Compiler support for C++20's using-enum is wildly incomplete --- zenserver/cache/structuredcache.cpp | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) (limited to 'zenserver/cache/structuredcache.cpp') diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp index 3bcc3be87..6ce9ada22 100644 --- a/zenserver/cache/structuredcache.cpp +++ b/zenserver/cache/structuredcache.cpp @@ -155,16 +155,14 @@ HttpStructuredCacheService::HandleCacheBucketRequest(HttpServerRequest& Request, ZEN_UNUSED(Request, Bucket); switch (Request.RequestVerb()) { - using enum HttpVerb; - - case kHead: - case kGet: + case HttpVerb::kHead: + case HttpVerb::kGet: { // Query stats } break; - case kDelete: + case HttpVerb::kDelete: // Drop bucket if (m_CacheStore.DropBucket(Bucket)) @@ -187,16 +185,14 @@ HttpStructuredCacheService::HandleCacheRecordRequest(HttpServerRequest& Request, { switch (Request.RequestVerb()) { - using enum HttpVerb; - - case kHead: - case kGet: + case HttpVerb::kHead: + case HttpVerb::kGet: { HandleGetCacheRecord(Request, Ref, Policy); } break; - case kPut: + case HttpVerb::kPut: HandlePutCacheRecord(Request, Ref, Policy); break; default: @@ -588,15 +584,13 @@ HttpStructuredCacheService::HandleCachePayloadRequest(HttpServerRequest& Request { switch (Request.RequestVerb()) { - using enum HttpVerb; - - case kHead: - case kGet: + case HttpVerb::kHead: + case HttpVerb::kGet: { HandleGetCachePayload(Request, Ref, Policy); } break; - case kPut: + case HttpVerb::kPut: HandlePutCachePayload(Request, Ref, Policy); break; default: @@ -772,9 +766,7 @@ HttpStructuredCacheService::HandleRpcRequest(zen::HttpServerRequest& Request) { switch (Request.RequestVerb()) { - using enum HttpVerb; - - case kPost: + case HttpVerb::kPost: { const HttpContentType ContentType = Request.RequestContentType(); const HttpContentType AcceptType = Request.AcceptContentType(); -- cgit v1.2.3 From 09fe7a461d2cff5000f3d3c07b5cc5cdacdec141 Mon Sep 17 00:00:00 2001 From: Martin Ridgers Date: Mon, 10 Jan 2022 12:30:32 +0100 Subject: Removed ZEN_UNUSED() statement that is unnecessary --- zenserver/cache/structuredcache.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'zenserver/cache/structuredcache.cpp') diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp index 6ce9ada22..139081530 100644 --- a/zenserver/cache/structuredcache.cpp +++ b/zenserver/cache/structuredcache.cpp @@ -152,7 +152,6 @@ HttpStructuredCacheService::HandleRequest(HttpServerRequest& Request) void HttpStructuredCacheService::HandleCacheBucketRequest(HttpServerRequest& Request, std::string_view Bucket) { - ZEN_UNUSED(Request, Bucket); switch (Request.RequestVerb()) { case HttpVerb::kHead: -- cgit v1.2.3 From fa08a67cde4b63176929ade6203946fdc15ae152 Mon Sep 17 00:00:00 2001 From: Martin Ridgers Date: Mon, 10 Jan 2022 12:30:54 +0100 Subject: Fixed unused-lambda-capture compile errors --- zenserver/cache/structuredcache.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'zenserver/cache/structuredcache.cpp') diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp index 139081530..29bec8788 100644 --- a/zenserver/cache/structuredcache.cpp +++ b/zenserver/cache/structuredcache.cpp @@ -223,7 +223,7 @@ HttpStructuredCacheService::HandleGetCacheRecord(zen::HttpServerRequest& Request if (!SkipAttachments) { - CacheRecord.IterateAttachments([this, &Ref, &Package, &AttachmentCount, &ValidCount](CbFieldView AttachmentHash) { + CacheRecord.IterateAttachments([this, &Package, &AttachmentCount, &ValidCount](CbFieldView AttachmentHash) { if (IoBuffer Chunk = m_CidStore.FindChunkByCid(AttachmentHash.AsHash())) { Package.AddAttachment(CbAttachment(CompressedBuffer::FromCompressed(SharedBuffer(Chunk)))); @@ -891,7 +891,7 @@ HttpStructuredCacheService::HandleRpcGetCacheRecords(zen::HttpServerRequest& Req if (!UpstreamRequests.empty() && m_UpstreamCache) { const auto OnCacheRecordGetComplete = - [this, &CacheKeys, &CacheValues, &RpcResponse, PartialOnError, SkipAttachments](CacheRecordGetCompleteParams&& Params) { + [this, &CacheValues, &RpcResponse, PartialOnError, SkipAttachments](CacheRecordGetCompleteParams&& Params) { ZEN_ASSERT(Params.KeyIndex < CacheValues.size()); IoBuffer CacheValue; @@ -1136,7 +1136,7 @@ HttpStructuredCacheService::HandleRpcGetCachePayloads(zen::HttpServerRequest& Re if (!UpstreamRequests.empty() && m_UpstreamCache) { - const auto OnCachePayloadGetComplete = [this, &ChunkRequests, &Chunks](CachePayloadGetCompleteParams&& Params) { + const auto OnCachePayloadGetComplete = [this, &Chunks](CachePayloadGetCompleteParams&& Params) { if (CompressedBuffer Compressed = CompressedBuffer::FromCompressed(SharedBuffer(Params.Payload))) { m_CidStore.AddChunk(Compressed); -- cgit v1.2.3 From 0c9085ba269315788771d77726dee5815a1945d8 Mon Sep 17 00:00:00 2001 From: Martin Ridgers Date: Mon, 10 Jan 2022 13:20:12 +0100 Subject: LLVM-12 C++ lib's emplace_back() doesn't like classes all that much --- zenserver/cache/structuredcache.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'zenserver/cache/structuredcache.cpp') diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp index 29bec8788..ef312d800 100644 --- a/zenserver/cache/structuredcache.cpp +++ b/zenserver/cache/structuredcache.cpp @@ -1018,7 +1018,10 @@ HttpStructuredCacheService::HandleRpcGetCachePayloads(zen::HttpServerRequest& Re const uint64_t RawSize = RequestObject["RawSize"sv].AsUInt64(); const uint32_t ChunkPolicy = RequestObject["Policy"sv].AsUInt32(); - ChunkRequests.emplace_back(Key, ChunkId, PayloadId, RawOffset, RawSize, static_cast(ChunkPolicy)); + // Note we could use emplace_back here but [Apple] LLVM-12's C++ library + // can't infer a constructor like other platforms (or can't handle an + // initializer list like others do). + ChunkRequests.push_back({Key, ChunkId, PayloadId, RawOffset, RawSize, static_cast(ChunkPolicy)}); } if (ChunkRequests.empty()) -- cgit v1.2.3