CBD-6348: [BP] Backport changes related to C++20

Backport from trinity

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

Author: trondn

engines/ep/src/hash_table.cc

@@ -554,54 +554,6 @@ HashTable::Statistics::StoredValueProperties HashTable::Statistics::prologue(
     return StoredValueProperties(v);
 }
 
-struct HashTable::Statistics::CacheLocalStatistics {
-    // Many of these stats should logically be NonNegativeCounters,
-    // but as they are used inside a LastLevelCacheStore there are
-    // multiple copies of each stat; one copy _may_ go negative
-    // even though the sum across cores remains non-negative.
-
-    /// Count of alive & deleted, in-memory non-resident and resident
-    /// items. Excludes temporary and prepared items.
-    CopyableAtomic<ssize_t> numItems;
-
-    /// Count of alive, non-resident items.
-    CopyableAtomic<ssize_t> numNonResidentItems;
-
-    /// Count of deleted items.
-    CopyableAtomic<ssize_t> numDeletedItems;
-
-    /// Count of items where StoredValue::isTempItem() is true.
-    CopyableAtomic<ssize_t> numTempItems;
-
-    /// Count of items where StoredValue resides in system namespace
-    CopyableAtomic<ssize_t> numSystemItems;
-
-    /// Count of items where StoredValue is a prepared SyncWrite.
-    CopyableAtomic<ssize_t> numPreparedSyncWrites;
-
-    /**
-     * Number of documents of a given datatype. Includes alive
-     * (non-deleted), committed documents in the HashTable.
-     * (Prepared documents are not counted).
-     * For value eviction includes resident & non-resident items (as the
-     * datatype is part of the metadata), for full-eviction will only
-     * include resident items.
-     */
-    AtomicDatatypeCombo datatypeCounts = {};
-
-    //! Cache size (fixed-length fields in StoredValue + keylen +
-    //! valuelen).
-    CopyableAtomic<ssize_t> cacheSize = {};
-
-    //! Meta-data size (fixed-length fields in StoredValue + keylen).
-    CopyableAtomic<ssize_t> metaDataMemory = {};
-
-    //! Memory consumed by items in this hashtable.
-    CopyableAtomic<ssize_t> memSize = {};
-
-    /// Memory consumed if the items were uncompressed.
-    CopyableAtomic<ssize_t> uncompressedMemSize = {};
-};
 
 HashTable::Statistics::Statistics(EPStats& epStats) : epStats(epStats) {
 }

engines/ep/src/hash_table.h

@@ -326,7 +326,54 @@ class HashTable {
         size_t getUncompressedMemSize() const;
 
     private:
-        struct CacheLocalStatistics;
+        struct CacheLocalStatistics {
+            // Many of these stats should logically be NonNegativeCounters,
+            // but as they are used inside a LastLevelCacheStore there are
+            // multiple copies of each stat; one copy _may_ go negative
+            // even though the sum across cores remains non-negative.
+
+            /// Count of alive & deleted, in-memory non-resident and resident
+            /// items. Excludes temporary and prepared items.
+            CopyableAtomic<ssize_t> numItems;
+
+            /// Count of alive, non-resident items.
+            CopyableAtomic<ssize_t> numNonResidentItems;
+
+            /// Count of deleted items.
+            CopyableAtomic<ssize_t> numDeletedItems;
+
+            /// Count of items where StoredValue::isTempItem() is true.
+            CopyableAtomic<ssize_t> numTempItems;
+
+            /// Count of items where StoredValue resides in system namespace
+            CopyableAtomic<ssize_t> numSystemItems;
+
+            /// Count of items where StoredValue is a prepared SyncWrite.
+            CopyableAtomic<ssize_t> numPreparedSyncWrites;
+
+            /**
+             * Number of documents of a given datatype. Includes alive
+             * (non-deleted), committed documents in the HashTable.
+             * (Prepared documents are not counted).
+             * For value eviction includes resident & non-resident items (as the
+             * datatype is part of the metadata), for full-eviction will only
+             * include resident items.
+             */
+            AtomicDatatypeCombo datatypeCounts = {};
+
+            //! Cache size (fixed-length fields in StoredValue + keylen +
+            //! valuelen).
+            CopyableAtomic<ssize_t> cacheSize = {};
+
+            //! Meta-data size (fixed-length fields in StoredValue + keylen).
+            CopyableAtomic<ssize_t> metaDataMemory = {};
+
+            //! Memory consumed by items in this hashtable.
+            CopyableAtomic<ssize_t> memSize = {};
+
+            /// Memory consumed if the items were uncompressed.
+            CopyableAtomic<ssize_t> uncompressedMemSize = {};
+        };
 
         LastLevelCacheStore<CacheLocalStatistics> llcLocal;
 

engines/ep/src/mutation_log.cc

@@ -323,7 +323,7 @@ MutationLog::~MutationLog() {
 }
 
 void MutationLog::disable() {
-    if (file >= INVALID_FILE_VALUE) {
+    if (file != INVALID_FILE_VALUE) {
         close();
         disabled = true;
     }

utilities/logtags.h

@@ -10,6 +10,7 @@
  */
 #pragma once
 
+#include <cstdint>
 #include <iosfwd>
 #include <string>