Ensure bucket index counters non-zero in serialize bucket index test

src/bucket/Bucket.cpp

@@ -875,4 +875,17 @@ BucketEntryCounters::operator+=(BucketEntryCounters const& other)
     }
     return *this;
 }
+
+bool
+BucketEntryCounters::operator==(BucketEntryCounters const& other) const
+{
+    return this->entryTypeCounts == other.entryTypeCounts &&
+           this->entryTypeSizes == other.entryTypeSizes;
+}
+
+bool
+BucketEntryCounters::operator!=(BucketEntryCounters const& other) const
+{
+    return !(*this == other);
 }
+}

src/bucket/Bucket.h

@@ -192,6 +192,8 @@ struct BucketEntryCounters
     std::map<LedgerEntryTypeAndDurability, size_t> entryTypeSizes;
 
     BucketEntryCounters& operator+=(BucketEntryCounters const& other);
+    bool operator==(BucketEntryCounters const& other) const;
+    bool operator!=(BucketEntryCounters const& other) const;
 
     template <class Archive>
     void

src/bucket/BucketIndexImpl.cpp

@@ -564,12 +564,7 @@ BucketIndexImpl<IndexT>::operator==(BucketIndex const& inRaw) const
         }
     }
 
-    if (mData.counters.entryTypeCounts != in.mData.counters.entryTypeCounts)
-    {
-        return false;
-    }
-
-    if (mData.counters.entryTypeSizes != in.mData.counters.entryTypeSizes)
+    if (mData.counters != in.mData.counters)
     {
         return false;
     }

src/bucket/test/BucketIndexTests.cpp

@@ -663,6 +663,17 @@ TEST_CASE("serialize bucket indexes", "[bucket][bucketindex]")
 
         auto& inMemoryIndex = b->getIndexForTesting();
         REQUIRE(inMemoryIndex.getPageSize() == (1UL << 10));
+        auto inMemoryCoutners = inMemoryIndex.getBucketEntryCounters();
+        // Ensure the inMemoryIndex has some non-zero counters.
+        REQUIRE(!inMemoryCoutners.entryTypeCounts.empty());
+        REQUIRE(!inMemoryCoutners.entryTypeSizes.empty());
+        bool allZero = true;
+        for (auto const& [k, v] : inMemoryCoutners.entryTypeCounts)
+        {
+            allZero = allZero && (v == 0);
+            allZero = allZero && (inMemoryCoutners.entryTypeSizes.at(k) == 0);
+        }
+        REQUIRE(!allZero);
 
         // Check if on-disk index rewritten with correct config params
         auto indexFilename = test.getBM().bucketIndexFilename(bucketHash);