[Refactor] EPE::getInner should use cookie reference

It cannot be nullptr Change-Id: Id4c9e9e9c1efd88ede44edc4056ca2f32da9f403 Reviewed-on: https://review.couchbase.org/c/kv_engine/+/181248 Tested-by: Build Bot <build@couchbase.com> Reviewed-by: Vesko Karaganev <vesko.karaganev@couchbase.com>
couchbase · Oct 17, 2022 · aab1123 · aab1123
1 parent 0f1d3cf
commit aab1123
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/engines/ep/src/ep_engine.cc b/engines/ep/src/ep_engine.cc
@@ -293,7 +293,7 @@ cb::EngineErrorItemPair EventuallyPersistentEngine::get(
         options = static_cast<get_options_t>(options | GET_DELETED_VALUE);
         break;
     }
-    return acquireEngine(this)->getInner(&cookie, key, vbucket, options);
+    return acquireEngine(this)->getInner(cookie, key, vbucket, options);
 }
 
 cb::EngineErrorItemPair EventuallyPersistentEngine::get_if(
@@ -2294,15 +2294,15 @@ void EventuallyPersistentEngine::itemRelease(ItemIface* itm) {
 }
 
 cb::EngineErrorItemPair EventuallyPersistentEngine::getInner(
-        CookieIface* cookie,
+        CookieIface& cookie,
         const DocKey& key,
         Vbid vbucket,
         get_options_t options) {
     ScopeTimer2<HdrMicroSecStopwatch, TracerStopwatch> timer(
             std::forward_as_tuple(stats.getCmdHisto),
             std::forward_as_tuple(cookie, cb::tracing::Code::Get));
 
-    GetValue gv(kvBucket->get(key, vbucket, cookie, options));
+    GetValue gv(kvBucket->get(key, vbucket, &cookie, options));
     cb::engine_errc ret = gv.getStatus();
 
     if (ret == cb::engine_errc::success) {

diff --git a/engines/ep/src/ep_engine.h b/engines/ep/src/ep_engine.h
@@ -431,7 +431,7 @@ class EventuallyPersistentEngine : public EngineIface, public DcpIface {
 
     void itemRelease(ItemIface* itm);
 
-    cb::EngineErrorItemPair getInner(CookieIface* cookie,
+    cb::EngineErrorItemPair getInner(CookieIface& cookie,
                                      const DocKey& key,
                                      Vbid vbucket,
                                      get_options_t options);

diff --git a/engines/ep/tests/module_tests/hash_table_eviction_test.cc b/engines/ep/tests/module_tests/hash_table_eviction_test.cc
@@ -239,7 +239,7 @@ class STHashTableEvictionTest : public STParameterizedEvictionTest {
                         DELETE_TEMP | HIDE_LOCKED_CAS | TRACK_STATISTICS);
                 {
                     auto [status, item] =
-                            engine->getInner(cookie, key, vbucket, options);
+                            engine->getInner(*cookie, key, vbucket, options);
                     EXPECT_EQ(cb::engine_errc::success, status);
                     EXPECT_TRUE(item);
                 }