Merge branch 'main' into wait_for_quiescencewait_for_quiescence

3 files changed, 27 insertions, 44 deletions

diff --git a/zenserver/cache/cachetracking.cpp b/zenserver/cache/cachetracking.cpp
index ae132f37f..9119e3122 100644
--- a/zenserver/cache/cachetracking.cpp
+++ b/zenserver/cache/cachetracking.cpp
@@ -26,8 +26,6 @@ ZEN_THIRD_PARTY_INCLUDES_END
 
 namespace zen {
 
-using namespace fmt::literals;
-
 namespace rocksdb = ROCKSDB_NAMESPACE;
 
 static constinit auto Epoch = std::chrono::time_point<std::chrono::system_clock>{};
@@ -180,14 +178,14 @@ struct ZenCacheTracker::Impl
 		}
 		else
 		{
-			throw std::runtime_error("column family iteration failed for '{}': '{}'"_format(RocksdbPath, Status.getState()).c_str());
+			throw std::runtime_error(fmt::format("column family iteration failed for '{}': '{}'", RocksdbPath, Status.getState()).c_str());
 		}
 
 		Status = rocksdb::DB::Open(Options, RocksdbPath, ColumnDescriptors, &m_RocksDbColumnHandles, &Db);
 
 		if (!Status.ok())
 		{
-			throw std::runtime_error("database open failed for '{}': '{}'"_format(RocksdbPath, Status.getState()).c_str());
+			throw std::runtime_error(fmt::format("database open failed for '{}': '{}'", RocksdbPath, Status.getState()).c_str());
 		}
 
 		m_RocksDb.reset(Db);
@@ -297,7 +295,6 @@ ZenCacheTracker::IterateSnapshots(std::function<void(uint64_t TimeStamp, CbObjec
 
 TEST_CASE("z$.tracker")
 {
-	using namespace fmt::literals;
 	using namespace std::literals;
 
 	const uint64_t t0 = GetCurrentCacheTimeStamp();
diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp
index 8639ed1c8..6078f892e 100644
--- a/zenserver/cache/structuredcache.cpp
+++ b/zenserver/cache/structuredcache.cpp
@@ -152,19 +152,16 @@ HttpStructuredCacheService::HandleRequest(HttpServerRequest& Request)
 void
 HttpStructuredCacheService::HandleCacheBucketRequest(HttpServerRequest& Request, std::string_view Bucket)
 {
-	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 +184,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:
@@ -228,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))));
@@ -588,15 +583,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 +765,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();
@@ -817,8 +808,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();
@@ -906,7 +895,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;
@@ -1015,8 +1004,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<CacheChunkRequest> ChunkRequests;
@@ -1035,7 +1022,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<CachePolicy>(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<CachePolicy>(ChunkPolicy)});
 	}
 
 	if (ChunkRequests.empty())
@@ -1153,7 +1143,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);
diff --git a/zenserver/cache/structuredcachestore.cpp b/zenserver/cache/structuredcachestore.cpp
index e74becb3a..68b7e2a48 100644
--- a/zenserver/cache/structuredcachestore.cpp
+++ b/zenserver/cache/structuredcachestore.cpp
@@ -26,8 +26,6 @@
 #endif
 
 #include <concepts>
-#include <memory_resource>
-#include <ranges>
 
 ZEN_THIRD_PARTY_INCLUDES_START
 #include <fmt/core.h>
@@ -38,7 +36,6 @@ ZEN_THIRD_PARTY_INCLUDES_END
 
 namespace zen {
 
-using namespace fmt::literals;
 namespace fs = std::filesystem;
 
 static CbObject
@@ -1066,14 +1063,14 @@ ZenCacheDiskLayer::CacheBucket::PutStandaloneCacheValue(const IoHash& HashKey, c
 
 	if (Ec)
 	{
-		throw std::system_error(Ec, "Failed to open temporary file for put at '{}'"_format(m_BucketDir));
+		throw std::system_error(Ec, fmt::format("Failed to open temporary file for put at '{}'", m_BucketDir));
 	}
 
 	DataFile.WriteAll(Value.Value, Ec);
 
 	if (Ec)
 	{
-		throw std::system_error(Ec, "Failed to write payload ({} bytes) to file"_format(NiceBytes(Value.Value.Size())));
+		throw std::system_error(Ec, fmt::format("Failed to write payload ({} bytes) to file", NiceBytes(Value.Value.Size())));
 	}
 
 	// Move file into place (atomically)
@@ -1113,7 +1110,7 @@ ZenCacheDiskLayer::CacheBucket::PutStandaloneCacheValue(const IoHash& HashKey, c
 
 		if (Ec)
 		{
-			throw std::system_error(Ec, "Failed to finalize file '{}'"_format(DataFilePath.ToUtf8()));
+			throw std::system_error(Ec, fmt::format("Failed to finalize file '{}'", DataFilePath.ToUtf8()));
 		}
 	}
 
@@ -1396,7 +1393,6 @@ ZenCacheDiskLayer::TotalSize() const
 #if ZEN_WITH_TESTS
 
 using namespace std::literals;
-using namespace fmt::literals;
 
 namespace testutils {
 	IoHash CreateKey(size_t KeyValue) { return IoHash::HashBuffer(&KeyValue, sizeof(size_t)); }
@@ -1483,7 +1479,7 @@ TEST_CASE("z$.size")
 			for (size_t Key = 0; Key < Count; ++Key)
 			{
 				const size_t Bucket = Key % 4;
-				Zcs.Put("test_bucket-{}"_format(Bucket), IoHash::HashBuffer(&Key, sizeof(uint32_t)), {.Value = Buffer});
+				Zcs.Put(fmt::format("test_bucket-{}", Bucket), IoHash::HashBuffer(&Key, sizeof(uint32_t)), {.Value = Buffer});
 			}
 
 			CacheSize = Zcs.StorageSize();
@@ -1501,7 +1497,7 @@ TEST_CASE("z$.size")
 
 			for (size_t Bucket = 0; Bucket < 4; ++Bucket)
 			{
-				Zcs.DropBucket("test_bucket-{}"_format(Bucket));
+				Zcs.DropBucket(fmt::format("test_bucket-{}", Bucket));
 			}
 			CHECK_EQ(0, Zcs.StorageSize().DiskSize);
 		}
@@ -1526,7 +1522,7 @@ TEST_CASE("z$.size")
 			for (size_t Key = 0; Key < Count; ++Key)
 			{
 				const size_t Bucket = Key % 4;
-				Zcs.Put("test_bucket-{}"_format(Bucket), IoHash::HashBuffer(&Key, sizeof(uint32_t)), {.Value = Buffer});
+				Zcs.Put(fmt::format("test_bucket-{}", Bucket), IoHash::HashBuffer(&Key, sizeof(uint32_t)), {.Value = Buffer});
 			}
 
 			CacheSize = Zcs.StorageSize();
@@ -1544,7 +1540,7 @@ TEST_CASE("z$.size")
 
 			for (size_t Bucket = 0; Bucket < 4; ++Bucket)
 			{
-				Zcs.DropBucket("test_bucket-{}"_format(Bucket));
+				Zcs.DropBucket(fmt::format("test_bucket-{}", Bucket));
 			}
 			CHECK_EQ(0, Zcs.StorageSize().DiskSize);
 		}
@@ -1585,7 +1581,7 @@ TEST_CASE("z$.gc")
 
 			for (size_t Idx = 0; auto& Cid : Cids)
 			{
-				Record.AddBinaryAttachment("attachment-{}"_format(Idx++), Cid);
+				Record.AddBinaryAttachment(fmt::format("attachment-{}", Idx++), Cid);
 			}
 
 			IoBuffer Buffer = Record.Save().GetBuffer().AsIoBuffer();