MB-54553: Remove ::getSuperCheckpointType()

Never used in Prod. Used in a couple of tests where we can easily get
rid of it.
Simplifying the CheckpointType class in preparetion for changes to it.

Change-Id: I8f84ff5a9499aff1858f53c5e58dc0049e2f3774
Reviewed-on: https://review.couchbase.org/c/kv_engine/+/185149
Well-Formed: Restriction Checker
Reviewed-by: Jim Walker <[email protected]>
Tested-by: Paolo Cocchi <[email protected]>

Author: paolococchi

engines/ep/src/ep_types.cc

@@ -19,19 +19,6 @@ bool isDiskCheckpointType(CheckpointType type) {
     return type == CheckpointType::InitialDisk || type == CheckpointType::Disk;
 }
 
-CheckpointType getSuperCheckpointType(CheckpointType type) {
-    switch (type) {
-    // Supertypes.
-    case CheckpointType::Disk:
-    case CheckpointType::Memory:
-        return type;
-    // Subtypes.
-    case CheckpointType::InitialDisk:
-        return CheckpointType::Disk;
-    }
-    folly::assume_unreachable();
-}
-
 GenerateBySeqno getGenerateBySeqno(const OptionalSeqno& seqno) {
     return seqno ? GenerateBySeqno::No : GenerateBySeqno::Yes;
 }

engines/ep/src/ep_types.h

@@ -110,10 +110,6 @@ enum class CheckpointType : uint8_t {
 // Returns true if given type is either a Disk checkpoint or its subtype.
 bool isDiskCheckpointType(CheckpointType type);
 
-// A type could logically be a subtype of another. This method returns its
-// supertype.
-CheckpointType getSuperCheckpointType(CheckpointType type);
-
 enum class ConflictResolutionMode {
     /// Resolve conflicts based on document revision id (revid).
     RevisionId,

engines/ep/tests/module_tests/dcp_durability_stream_test.cc

@@ -4594,8 +4594,7 @@ void DurabilityPromotionStreamTest::testDiskCheckpointStreamedAsDiskSnapshot() {
                                              CheckpointType expectedCkptType,
                                              uint64_t expectedSnapStart,
                                              uint64_t expectedSnapEnd) -> void {
-        ASSERT_EQ(expectedCkptType,
-                  getSuperCheckpointType(ckptMgr.getOpenCheckpointType()));
+        ASSERT_EQ(expectedCkptType, ckptMgr.getOpenCheckpointType());
         auto currSnap = ckptMgr.getSnapshotInfo();
         ASSERT_EQ(expectedSnapStart, currSnap.range.getStart());
         ASSERT_EQ(expectedSnapEnd, currSnap.range.getEnd());
@@ -4605,7 +4604,7 @@ void DurabilityPromotionStreamTest::testDiskCheckpointStreamedAsDiskSnapshot() {
     // test)
     {
         SCOPED_TRACE("");
-        checkOpenCheckpoint(CheckpointType::Disk, 2, 4);
+        checkOpenCheckpoint(CheckpointType::InitialDisk, 2, 4);
     }
 
     // 3) Set up the Producer and ActiveStream
@@ -5057,8 +5056,7 @@ void DurabilityPromotionStreamTest::
                                              CheckpointType expectedCkptType,
                                              uint64_t expectedSnapStart,
                                              uint64_t expectedSnapEnd) -> void {
-        ASSERT_EQ(expectedCkptType,
-                  getSuperCheckpointType(ckptMgr.getOpenCheckpointType()));
+        ASSERT_EQ(expectedCkptType, ckptMgr.getOpenCheckpointType());
         auto currSnap = ckptMgr.getSnapshotInfo();
         ASSERT_EQ(expectedSnapStart, currSnap.range.getStart());
         ASSERT_EQ(expectedSnapEnd, currSnap.range.getEnd());
@@ -5074,7 +5072,7 @@ void DurabilityPromotionStreamTest::
                         DocumentState::Alive);
 
         ASSERT_EQ(1, ckptMgr.getNumCheckpoints());
-        checkOpenCheckpoint(CheckpointType::Disk, 1, 2);
+        checkOpenCheckpoint(CheckpointType::InitialDisk, 1, 2);
     }
 
     // 2) Replica receives PRE:3 and M:4 (logic CMT:4) in a second disk

engines/ep/tests/module_tests/dcp_stream_test.cc

@@ -4761,7 +4761,7 @@ TEST_P(STPassiveStreamPersistentTest, VBStateNotLostAfterFlushFailure) {
                                      uint64_t maxDelRevSeqno) {
         EXPECT_EQ(lastSnapStart, vbs.lastSnapStart);
         EXPECT_EQ(lastSnapEnd, vbs.lastSnapEnd);
-        EXPECT_EQ(type, getSuperCheckpointType(vbs.checkpointType));
+        EXPECT_EQ(type, vbs.checkpointType);
         EXPECT_EQ(hps, vbs.highPreparedSeqno);
         EXPECT_EQ(hcs, vbs.persistedCompletedSeqno);
         EXPECT_EQ(maxDelRevSeqno, vbs.maxDeletedSeqno);
@@ -4797,7 +4797,7 @@ TEST_P(STPassiveStreamPersistentTest, VBStateNotLostAfterFlushFailure) {
         //   2) expected (HPS = snapEnd) for complete Disk snap flushed
         checkVBState(3 /*lastSnapStart*/,
                      3 /*lastSnapEnd*/,
-                     CheckpointType::Disk,
+                     CheckpointType::InitialDisk,
                      3 /*HPS*/,
                      1 /*HCS*/,
                      2 /*maxDelRevSeqno*/);
@@ -4968,7 +4968,7 @@ void STPassiveStreamPersistentTest::checkVBState(uint64_t lastSnapStart,
     auto& vbs = *kvStore.getCachedVBucketState(vbid);
     EXPECT_EQ(lastSnapStart, vbs.lastSnapStart);
     EXPECT_EQ(lastSnapEnd, vbs.lastSnapEnd);
-    EXPECT_EQ(type, getSuperCheckpointType(vbs.checkpointType));
+    EXPECT_EQ(type, vbs.checkpointType);
     EXPECT_EQ(hps, vbs.highPreparedSeqno);
     EXPECT_EQ(hcs, vbs.persistedCompletedSeqno);
     EXPECT_EQ(maxDelRevSeqno, vbs.maxDeletedSeqno);
@@ -5020,12 +5020,15 @@ TEST_P(STPassiveStreamPersistentTest, DiskSnapWithoutPrepareSetsDiskHPS) {
     // send it from the active. We instead move the HPS to the snapshot end
     // (both on disk and in memory) which is 4 in this case due to changes made
     // as part of MB-34873.
-    checkVBState(4 /*lastSnapStart*/,
-                 4 /*lastSnapEnd*/,
-                 CheckpointType::Disk,
-                 4 /*HPS*/,
-                 2 /*HCS*/,
-                 0 /*maxDelRevSeqno*/);
+    {
+        SCOPED_TRACE("");
+        checkVBState(4 /*lastSnapStart*/,
+                     4 /*lastSnapEnd*/,
+                     CheckpointType::InitialDisk,
+                     4 /*HPS*/,
+                     2 /*HCS*/,
+                     0 /*maxDelRevSeqno*/);
+    }
 
     EXPECT_EQ(4, store->getVBucket(vbid)->getHighPreparedSeqno());
 
@@ -5092,12 +5095,15 @@ TEST_P(STPassiveStreamPersistentTest, DiskSnapWithPrepareSetsHPSToSnapEnd) {
 
     flushVBucketToDiskIfPersistent(vbid, 4);
 
-    checkVBState(6 /*lastSnapStart*/,
-                 6 /*lastSnapEnd*/,
-                 CheckpointType::Disk,
-                 6 /*HPS*/,
-                 2 /*HCS*/,
-                 0 /*maxDelRevSeqno*/);
+    {
+        SCOPED_TRACE("");
+        checkVBState(6 /*lastSnapStart*/,
+                     6 /*lastSnapEnd*/,
+                     CheckpointType::InitialDisk,
+                     6 /*HPS*/,
+                     2 /*HCS*/,
+                     0 /*maxDelRevSeqno*/);
+    }
 }
 
 INSTANTIATE_TEST_SUITE_P(Persistent,