CBD-6348: [BP] Changes needed for fmt 10.2

Backport changes required for FMT upgrade

Change-Id: Ic687ac0d2c784abfac9dd8a3bff2a813af692788
Reviewed-on: https://review.couchbase.org/c/kv_engine/+/234759
Tested-by: Trond Norbye <[email protected]>
Well-Formed: Restriction Checker
Reviewed-by: Jim Walker <[email protected]>

Author: trondn

daemon/cluster_config.h

@@ -89,3 +89,6 @@ class ClusterConfiguration {
 
 std::string to_string(const ClustermapVersion& version);
 std::ostream& operator<<(std::ostream& os, const ClustermapVersion& version);
+inline auto format_as(const ClustermapVersion& version) {
+    return to_string(version);
+}

daemon/connection.cc

@@ -1422,7 +1422,7 @@ Connection::~Connection() {
         LOG_DEBUG("Current tenant use for {}:{} - {}",
                   user.name,
                   to_string(user.domain),
-                  tenant->to_json());
+                  tenant->to_json().dump());
     }
 
     if (bev) {

daemon/protocol/mcbp/settings_reload_command_context.cc

@@ -263,7 +263,7 @@ cb::engine_errc SettingsReloadCommandContext::doSettingsReload() {
                 cookie.getConnectionId(),
                 cookie.getEventId(),
                 cookie.getErrorContext(),
-                extras);
+                extras.dump());
         return cb::engine_errc::failed;
     } catch (const std::exception& exception) {
         cookie.setErrorContext(exception.what());

engines/ep/CMakeLists.txt

@@ -230,7 +230,7 @@ SET_PROPERTY(TARGET ep-engine_collections PROPERTY POSITION_INDEPENDENT_CODE 1)
 
 kv_enable_pch(ep-engine_collections)
 
-target_link_libraries(ep-engine_collections PRIVATE platform)
+target_link_libraries(ep-engine_collections PUBLIC fmt::fmt PRIVATE platform)
 
 TARGET_INCLUDE_DIRECTORIES(ep-engine_collections
                            PUBLIC
@@ -628,7 +628,6 @@ if(CB_ENABLE_HEADER_INCLUDE_CHECK)
 
     # List of headers to ignore / not attempt to compile
     list(REMOVE_ITEM ep_headers
-      src/bucket_logger_impl.h # Included via bucket_logger.h
       src/config.cmake.h  # XXXX
       src/tasks.def.h  # X-Macro file; cannot be compiled by itself
     )

engines/ep/src/bucket_logger.h

@@ -12,6 +12,8 @@
 #pragma once
 
 #include "spdlog/logger.h"
+#include <fmt/core.h>
+#include <spdlog/fmt/ostr.h>
 
 class EventuallyPersistentEngine;
 
@@ -296,4 +298,98 @@ std::shared_ptr<BucketLogger>& getGlobalBucketLogger();
 #define EP_LOG_CRITICAL_RAW(msg) \
     EP_LOG_RAW(spdlog::level::level_enum::critical, msg)
 
-#include "bucket_logger_impl.h"
+template <typename S, typename... Args>
+void BucketLogger::log(spdlog::level::level_enum lvl,
+                       const S& fmt,
+                       Args&&... args) {
+    if (!should_log(lvl)) {
+        return;
+    }
+
+#if FMT_VERSION < 100000
+    logInner(lvl, fmt, fmt::make_args_checked<Args...>(fmt, args...));
+#else
+    logInner(lvl, fmt, fmt::make_format_args(args...));
+#endif
+}
+
+template <typename... Args>
+void BucketLogger::log(spdlog::level::level_enum lvl, const char* msg) {
+    if (!should_log(lvl)) {
+        return;
+    }
+    logInner(lvl, msg, {});
+}
+
+template <typename T>
+void BucketLogger::log(spdlog::level::level_enum lvl, const T& msg) {
+    if (!should_log(lvl)) {
+        return;
+    }
+
+#if FMT_VERSION < 100000
+    logInner(lvl, "{}", fmt::make_args_checked<T>("{}", msg));
+#else
+    logInner(lvl, "{}", fmt::make_format_args(msg));
+#endif
+}
+
+template <typename... Args>
+void BucketLogger::trace(const char* fmt, const Args&... args) {
+    log(spdlog::level::trace, fmt, args...);
+}
+
+template <typename... Args>
+void BucketLogger::debug(const char* fmt, const Args&... args) {
+    log(spdlog::level::debug, fmt, args...);
+}
+
+template <typename... Args>
+void BucketLogger::info(const char* fmt, const Args&... args) {
+    log(spdlog::level::info, fmt, args...);
+}
+
+template <typename... Args>
+void BucketLogger::warn(const char* fmt, const Args&... args) {
+    log(spdlog::level::warn, fmt, args...);
+}
+
+template <typename... Args>
+void BucketLogger::error(const char* fmt, const Args&... args) {
+    log(spdlog::level::err, fmt, args...);
+}
+
+template <typename... Args>
+void BucketLogger::critical(const char* fmt, const Args&... args) {
+    log(spdlog::level::critical, fmt, args...);
+}
+
+template <typename T>
+void BucketLogger::trace(const T& msg) {
+    log(spdlog::level::trace, msg);
+}
+
+template <typename T>
+void BucketLogger::debug(const T& msg) {
+    log(spdlog::level::debug, msg);
+}
+
+template <typename T>
+void BucketLogger::info(const T& msg) {
+    log(spdlog::level::info, msg);
+}
+
+template <typename T>
+void BucketLogger::warn(const T& msg) {
+    log(spdlog::level::warn, msg);
+}
+
+template <typename T>
+void BucketLogger::error(const T& msg) {
+    log(spdlog::level::err, msg);
+}
+
+template <typename T>
+void BucketLogger::critical(const T& msg) {
+    log(spdlog::level::critical, msg);
+}

engines/ep/src/bucket_logger_impl.h

@@ -63,3 +63,8 @@ struct PersistedStats {
 std::ostream& operator<<(std::ostream& os, const PersistedStats& ps);
 
 } // namespace Collections::VB
+#include <fmt/ostream.h>
+#if FMT_VERSION >= 100000
+template <>
+struct fmt::formatter<Collections::VB::PersistedStats> : ostream_formatter {};
+#endif

engines/ep/src/collections/collection_persisted_stats.h

@@ -213,9 +213,11 @@ std::ostream& operator<<(std::ostream& os, const CollectionMetaData& meta) {
 }
 
 std::ostream& operator<<(std::ostream& os, const ScopeMetaData& meta) {
-    os << "sid:" << meta.sid << ",name:" << meta.name;
+    return os << format_as(meta);
+}
 
-    return os;
+std::string format_as(const ScopeMetaData& meta) {
+    return fmt::format("sid:{},name:{}", meta.sid, meta.name);
 }
 
 } // end namespace Collections

engines/ep/src/collections/collections_types.cc

@@ -204,6 +204,9 @@ struct CollectionMetaData {
 
 std::string to_string(const CollectionMetaData&);
 std::ostream& operator<<(std::ostream& os, const CollectionMetaData& meta);
+inline auto format_as(const CollectionMetaData& md) {
+    return to_string(md);
+}
 
 /**
  * The metadata of a single scope
@@ -220,6 +223,7 @@ struct ScopeMetaData {
 };
 
 std::ostream& operator<<(std::ostream& os, const ScopeMetaData& meta);
+std::string format_as(const ScopeMetaData& meta);
 
 /**
  * For creation of collection SystemEvents - The SystemEventFactory

engines/ep/src/collections/collections_types.h

@@ -199,3 +199,14 @@ using DroppedCb = std::function<void(
         const DiskDocKey& key, int64_t seqno, bool aborted, int64_t pcs)>;
 
 } // namespace Collections::KVStore
+
+#include <fmt/ostream.h>
+#if FMT_VERSION >= 100000
+template <>
+struct fmt::formatter<Collections::KVStore::Manifest> : ostream_formatter {};
+template <>
+struct fmt::formatter<Collections::KVStore::OpenScope> : ostream_formatter {};
+template <>
+struct fmt::formatter<Collections::KVStore::OpenCollection>
+    : ostream_formatter {};
+#endif