MB-48529: Remove CheckpointConfig(EPEngine&)

Unnecessary proxy to CheckpointConfig(EPConfig&), both prod/test code
can call the latter directly.

Change-Id: Ie0360606c1d1a475e981456ad1b93382625dfb4a
Reviewed-on: http://review.couchbase.org/c/kv_engine/+/163770
Reviewed-by: Richard de Mellow <[email protected]>
Tested-by: Paolo Cocchi <[email protected]>

Author: paolococchi

engines/ep/src/checkpoint_config.cc

@@ -91,10 +91,6 @@ CheckpointConfig::CheckpointConfig(rel_time_t period,
       checkpointRemovalMode(checkpoint_removal_mode) {
 }
 
-CheckpointConfig::CheckpointConfig(EventuallyPersistentEngine& e)
-    : CheckpointConfig(e.getConfiguration()) {
-}
-
 CheckpointConfig::CheckpointConfig(Configuration& config)
     : CheckpointConfig(config.getChkPeriod(),
                        config.getChkMaxItems(),

engines/ep/src/checkpoint_config.h

@@ -35,7 +35,7 @@ class CheckpointConfig {
                      bool persistence_enabled,
                      CheckpointRemoval checkpoint_removal_mode);
 
-    explicit CheckpointConfig(EventuallyPersistentEngine& e);
+    explicit CheckpointConfig(Configuration& config);
 
     rel_time_t getCheckpointPeriod() const {
         return checkpointPeriod;
@@ -69,11 +69,6 @@ class CheckpointConfig {
     friend class EventuallyPersistentEngine;
     friend class SynchronousEPEngine;
 
-    /**
-     * Helper constructor from config. Only called by other constructors.
-     */
-    explicit CheckpointConfig(Configuration& config);
-
     bool validateCheckpointMaxItemsParam(size_t checkpoint_max_items);
     bool validateCheckpointPeriodParam(size_t checkpoint_period);
 

engines/ep/src/ep_engine.cc

@@ -2168,7 +2168,7 @@ cb::engine_errc EventuallyPersistentEngine::initialize(const char* config) {
         dcpFlowControlManager_ = std::make_unique<DcpFlowControlManager>(*this);
     }
 
-    checkpointConfig = std::make_unique<CheckpointConfig>(*this);
+    checkpointConfig = std::make_unique<CheckpointConfig>(configuration);
     CheckpointConfig::addConfigChangeListener(*this);
 
     kvBucket = makeBucket(configuration);

engines/ep/tests/mock/mock_synchronous_ep_engine.cc

@@ -67,7 +67,7 @@ SynchronousEPEngine::SynchronousEPEngine(const cb::ArenaMallocClient& client,
     dcpConnMap_ = std::make_unique<MockDcpConnMap>(*this);
 
     // checkpointConfig is needed by CheckpointManager (via EPStore).
-    checkpointConfig = std::make_unique<CheckpointConfig>(*this);
+    checkpointConfig = std::make_unique<CheckpointConfig>(configuration);
     CheckpointConfig::addConfigChangeListener(*this);
 
     // Simplified setup for switching FlowControl on/off

engines/ep/tests/mock/mock_synchronous_ep_engine.h

@@ -89,10 +89,4 @@ class SynchronousEPEngine : public EventuallyPersistentEngine {
     using EventuallyPersistentEngine::doConnAggStatsInner;
     using EventuallyPersistentEngine::doEngineStats;
     MockReplicationThrottle& getMockReplicationThrottle();
-
-    // re-create the checkpoint config from the engine config.
-    // For use after altering the engine config.
-    void updateCheckpointConfig() {
-        *checkpointConfig = CheckpointConfig(*this);
-    }
 };

engines/ep/tests/module_tests/checkpoint_remover_test.cc

@@ -396,7 +396,7 @@ void CheckpointRemoverEPTest::testExpellingOccursBeforeCursorDropping(
     auto vb = store->getVBuckets().getBucket(vbid);
     auto* manager =
             static_cast<MockCheckpointManager*>(vb->checkpointManager.get());
-    CheckpointConfig c(*engine.get());
+    CheckpointConfig c(config);
     manager->resetConfig(c);
 
     auto producer = createDcpProducer(cookie, IncludeDeleteTime::Yes);
@@ -502,7 +502,7 @@ TEST_F(CheckpointRemoverEPTest, DISABLED_noCursorDropWhenTargetMet) {
     auto vb = store->getVBuckets().getBucket(vbid);
     auto* checkpointManager =
             static_cast<MockCheckpointManager*>(vb->checkpointManager.get());
-    CheckpointConfig c(*engine.get());
+    CheckpointConfig c(config);
     checkpointManager->resetConfig(c);
 
     auto producer = createDcpProducer(cookie, IncludeDeleteTime::Yes);