ItemFreqDecayerTask should take Engine& instead of Engine*

In a future change I will update GlobalTask to take an Engine& rather than Engine* as we dereference the pointer regardless of its value for the Taskable so it should logically be a reference. Change-Id: I905af1e97775e826aee2c64af5a30a9f7a2e1ef8 Reviewed-on: https://review.couchbase.org/c/kv_engine/+/179471 Tested-by: Build Bot <build@couchbase.com> Reviewed-by: James H <james.harrison@couchbase.com>
couchbase · Sep 2, 2022 · 9844df0 · 9844df0
1 parent 1d15548
commit 9844df0
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/engines/ep/src/item_freq_decayer.cc b/engines/ep/src/item_freq_decayer.cc
@@ -21,9 +21,9 @@
 
 #include <limits>
 
-ItemFreqDecayerTask::ItemFreqDecayerTask(EventuallyPersistentEngine* e,
+ItemFreqDecayerTask::ItemFreqDecayerTask(EventuallyPersistentEngine& e,
                                          uint16_t percentage_)
-    : GlobalTask(e, TaskId::ItemFreqDecayerTask, 0, false),
+    : GlobalTask(&e, TaskId::ItemFreqDecayerTask, 0, false),
       completed(false),
       epstore_position(engine->getKVBucket()->startPosition()),
       notified(false),

diff --git a/engines/ep/src/item_freq_decayer.h b/engines/ep/src/item_freq_decayer.h
@@ -24,7 +24,7 @@ class PauseResumeVBAdapter;
  */
 class ItemFreqDecayerTask : public GlobalTask {
 public:
-    ItemFreqDecayerTask(EventuallyPersistentEngine* e, uint16_t percentage_);
+    ItemFreqDecayerTask(EventuallyPersistentEngine& e, uint16_t percentage_);
 
     ~ItemFreqDecayerTask() override;
 

diff --git a/engines/ep/src/kv_bucket.cc b/engines/ep/src/kv_bucket.cc
@@ -481,7 +481,7 @@ bool KVBucket::initialize() {
      * item in the hash table becomes saturated.
      */
     itemFreqDecayerTask = std::make_shared<ItemFreqDecayerTask>(
-            &engine, config.getItemFreqDecayerPercent());
+            engine, config.getItemFreqDecayerPercent());
     ExecutorPool::get()->schedule(itemFreqDecayerTask);
 
     createAndScheduleSeqnoPersistenceNotifier();

diff --git a/engines/ep/tests/mock/mock_ep_bucket.cc b/engines/ep/tests/mock/mock_ep_bucket.cc
@@ -52,7 +52,7 @@ void MockEPBucket::removeMakeCompactionContextCallback() {
 void MockEPBucket::createItemFreqDecayerTask() {
     Configuration& config = engine.getConfiguration();
     itemFreqDecayerTask = std::make_shared<MockItemFreqDecayerTask>(
-            &engine, config.getItemFreqDecayerPercent());
+            engine, config.getItemFreqDecayerPercent());
 }
 
 void MockEPBucket::disableItemFreqDecayerTask() {

diff --git a/engines/ep/tests/mock/mock_item_freq_decayer.h b/engines/ep/tests/mock/mock_item_freq_decayer.h
@@ -18,7 +18,7 @@
  */
 class MockItemFreqDecayerTask : public ItemFreqDecayerTask {
 public:
-    MockItemFreqDecayerTask(EventuallyPersistentEngine* e, uint16_t percentage_)
+    MockItemFreqDecayerTask(EventuallyPersistentEngine& e, uint16_t percentage_)
         : ItemFreqDecayerTask(e, percentage_) {
     }
 

diff --git a/engines/ep/tests/module_tests/ep_bucket_tests.cc b/engines/ep/tests/module_tests/ep_bucket_tests.cc
@@ -509,7 +509,7 @@ TEST_F(SingleThreadedEPBucketTest, ItemFreqDecayerTaskTest) {
 
     auto& lpNonioQ = *task_executor->getLpTaskQ()[NONIO_TASK_IDX];
     auto itemFreqDecayerTask =
-            std::make_shared<MockItemFreqDecayerTask>(engine.get(), 50);
+            std::make_shared<MockItemFreqDecayerTask>(*engine, 50);
 
     EXPECT_EQ(0, lpNonioQ.getFutureQueueSize());
     task_executor->schedule(itemFreqDecayerTask);