Revert "MB-39946: Don't record the system event size for collections"

This reverts commit 2e86e27.

Commit added to aid investigation of MB-39946, not needed anymore.

Change-Id: Id58c303d72b17f0a7971b2f7bcc95db4988991de
Reviewed-on: http://review.couchbase.org/c/kv_engine/+/140360
Tested-by: Build Bot <[email protected]>
Reviewed-by: Trond Norbye <[email protected]>

Author: jimwwalker

engines/ep/src/collections/flush.cc

@@ -65,21 +65,10 @@ void Flush::StatisticsUpdate::insert(bool isSystem,
         incrementItemCount();
     } // else inserting a tombstone - no item increment
 
-    // MB-39946: for now don't record the system event size to catch this bug
-    // against any old collection (i.e any empty collection should now be 0
-    // disk)
-    if (!isSystem) {
-        updateDiskSize(diskSizeDelta);
-    }
+    updateDiskSize(diskSizeDelta);
 }
 
-void Flush::StatisticsUpdate::update(bool isSystem, ssize_t diskSizeDelta) {
-    // MB-39946: for now don't record the system event size to catch this bug
-    // against any old collection (i.e any empty collection should now be 0
-    // disk)
-    if (isSystem) {
-        return;
-    }
+void Flush::StatisticsUpdate::update(ssize_t diskSizeDelta) {
     updateDiskSize(diskSizeDelta);
 }
 
@@ -355,7 +344,7 @@ void Flush::updateStats(const DocKey& key,
         } else if (!oldIsDelete && isDelete) {
             stats.remove(isSystemEvent, size - oldSize);
         } else {
-            stats.update(isSystemEvent, size - oldSize);
+            stats.update(size - oldSize);
         }
     }
 }

engines/ep/src/collections/flush.h

@@ -291,12 +291,11 @@ class Flush {
 
         /**
          * Process an update into the collection
-         * @param isSystem true if updating a system event
          * @param diskSizeDelta size in bytes difference. Should be
          *        representative of the difference between existing and new
          *        documents, but does not need to be exact.
          */
-        void update(bool isSystem, ssize_t diskSizeDelta);
+        void update(ssize_t diskSizeDelta);
 
         /**
          * Process a remove from the collection (store of a delete)

engines/ep/tests/module_tests/collections/evp_store_collections_dcp_test.cc

@@ -2893,14 +2893,13 @@ void CollectionsDcpPersistentOnly::resurrectionStatsTest(
 
     auto stats = vb->getManifest().lock(target.getId()).getPersistedStats();
 
-    // MB-39946: systemeventSize currently set to 0
     // Note 57 manually verified from dbdump and is the system-event usage
     // Note 14 manually verified from dbdump and is the item usage
-    size_t systemeventSize = 0;
+    size_t systemeventSize = 57;
     size_t itemSize = 14;
     if (isMagma()) {
         // magma doesn't account the same bits and bytes
-        systemeventSize = 0;
+        systemeventSize = 56;
         itemSize = 4;
     }
     EXPECT_EQ(1, stats.itemCount);

engines/ep/tests/module_tests/collections/evp_store_collections_eraser_test.cc

@@ -111,7 +111,7 @@ TEST_P(CollectionsEraserTest, basic) {
             vb->lockCollections().getStatsForFlush(CollectionEntry::dairy, 1);
     if (persistent()) {
         EXPECT_EQ(0, stats.itemCount);
-        EXPECT_EQ(0, stats.diskSize); // MB-39946: 0 size for system event
+        EXPECT_NE(0, stats.diskSize);
     } else {
         EXPECT_EQ(2, stats.itemCount);
         EXPECT_EQ(0, stats.diskSize);
@@ -1304,11 +1304,11 @@ void CollectionsEraserPersistentOnly::testEmptyCollections(
                 kvs.getCollectionStats(*fileHandle, CollectionEntry::dairy);
         EXPECT_EQ(0, stats.itemCount);
         EXPECT_EQ(vb->getHighSeqno() - 1, stats.highSeqno);
-        EXPECT_EQ(0, stats.diskSize); // MB-39946: SystemEvent size not recorded
+        EXPECT_NE(0, stats.diskSize);
         stats = kvs.getCollectionStats(*fileHandle, CollectionEntry::fruit);
         EXPECT_EQ(0, stats.itemCount);
         EXPECT_EQ(vb->getHighSeqno(), stats.highSeqno);
-        EXPECT_EQ(0, stats.diskSize); // MB-39946: SystemEvent size not recorded
+        EXPECT_NE(0, stats.diskSize);
     } else {
         auto handle = vb->lockCollections();
         EXPECT_EQ(vb->getHighSeqno() - 1,