MB-48529: Remove user-defined CheckpointConfig()

Replace with the default generated.

Change-Id: I284977ff769fe0c046a51d06577aeaa1f354ba99
Reviewed-on: http://review.couchbase.org/c/kv_engine/+/163779
Reviewed-by: James H <[email protected]>
Tested-by: Build Bot <[email protected]>

Author: paolococchi

engines/ep/src/checkpoint.h

@@ -28,14 +28,6 @@
 #include <set>
 #include <unordered_map>
 
-#define MIN_CHECKPOINT_ITEMS 10
-#define MAX_CHECKPOINT_ITEMS 50000
-#define DEFAULT_CHECKPOINT_ITEMS 500
-
-#define MIN_CHECKPOINT_PERIOD 1 //  1 sec.
-#define MAX_CHECKPOINT_PERIOD 3600 // 3600 sec.
-#define DEFAULT_CHECKPOINT_PERIOD 5 // 5 sec.
-
 /**
  * The state of a given checkpoint.
  */

engines/ep/src/checkpoint_config.cc

@@ -12,7 +12,6 @@
 #include "checkpoint_config.h"
 
 #include "bucket_logger.h"
-#include "checkpoint.h"
 #include "configuration.h"
 #include "ep_engine.h"
 
@@ -68,15 +67,6 @@ class CheckpointConfig::ChangeListener : public ValueChangedListener {
     CheckpointConfig& config;
 };
 
-// Test only
-CheckpointConfig::CheckpointConfig()
-    : checkpointPeriod(DEFAULT_CHECKPOINT_PERIOD),
-      checkpointMaxItems(DEFAULT_CHECKPOINT_ITEMS),
-      maxCheckpoints(2),
-      itemNumBasedNewCheckpoint(true),
-      persistenceEnabled(true) { /* empty */
-}
-
 CheckpointConfig::CheckpointConfig(rel_time_t period,
                                    size_t max_items,
                                    size_t max_ckpts,

engines/ep/src/checkpoint_config.h

@@ -26,8 +26,7 @@ std::string to_string(CheckpointRemoval mode);
 class CheckpointConfig {
 public:
     // Test only
-    CheckpointConfig();
-
+    CheckpointConfig() = default;
     CheckpointConfig(rel_time_t period,
                      size_t max_items,
                      size_t max_ckpts,
@@ -86,20 +85,20 @@ class CheckpointConfig {
     class ChangeListener;
 
     // Period of a checkpoint in terms of time in sec
-    rel_time_t checkpointPeriod;
+    rel_time_t checkpointPeriod{DEFAULT_CHECKPOINT_PERIOD};
 
     // Number of max items allowed in each checkpoint
-    size_t checkpointMaxItems;
+    size_t checkpointMaxItems{DEFAULT_CHECKPOINT_ITEMS};
 
     // Number of max checkpoints allowed
-    size_t maxCheckpoints;
+    size_t maxCheckpoints{2};
 
     // Flag indicating if a new checkpoint is created once the number of items
     // in the current checkpoint is greater than the max number allowed.
-    bool itemNumBasedNewCheckpoint;
+    bool itemNumBasedNewCheckpoint{true};
 
     // Flag indicating if persistence is enabled.
-    bool persistenceEnabled;
+    bool persistenceEnabled{true};
 
     CheckpointRemoval checkpointRemovalMode = CheckpointRemoval::Eager;
 };

engines/ep/src/checkpoint_types.h

@@ -20,6 +20,14 @@
 #include <list>
 #include <memory>
 
+#define MIN_CHECKPOINT_ITEMS 10
+#define MAX_CHECKPOINT_ITEMS 50000
+#define DEFAULT_CHECKPOINT_ITEMS 500
+
+#define MIN_CHECKPOINT_PERIOD 1 //  1 sec.
+#define MAX_CHECKPOINT_PERIOD 3600 // 3600 sec.
+#define DEFAULT_CHECKPOINT_PERIOD 5 // 5 sec.
+
 class Checkpoint;
 class CheckpointManager;
 class VBucket;