Merge mad-hatter into master

* commit '0c62ce031': MB-43205: Remove DcpConsumer::engine Change-Id: I17c4ec6582c20e53631ee3e20f384c73dcb4e442
couchbase · Jan 22, 2021 · 6c0cd3f · 6c0cd3f
2 parents aaa2c41 + 0c62ce0
commit 6c0cd3f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/engines/ep/src/dcp/consumer.cc b/engines/ep/src/dcp/consumer.cc
@@ -154,7 +154,6 @@ DcpConsumer::DcpConsumer(EventuallyPersistentEngine& engine,
                          std::string consumerName_)
     : ConnHandler(engine, cookie, name),
       lastMessageTime(ep_current_time()),
-      engine(engine),
       opaqueCounter(0),
       processorTaskId(0),
       processorTaskState(all_processed),
@@ -312,7 +311,7 @@ ENGINE_ERROR_CODE DcpConsumer::addStream(uint32_t opaque,
     bool exp = false;
     if (processorTaskRunning.compare_exchange_strong(exp, true)) {
         ExTask task = std::make_shared<DcpConsumerTask>(
-                &engine, shared_from_this(), 1);
+                &engine_, shared_from_this(), 1);
         processorTaskId = ExecutorPool::get()->schedule(task);
     }
 

diff --git a/engines/ep/src/dcp/consumer.h b/engines/ep/src/dcp/consumer.h
@@ -558,8 +558,6 @@ class DcpConsumer : public ConnHandler,
      */
     ENGINE_ERROR_CODE getOpaqueMissMatchErrorCode() const;
 
-    /* Reference to the ep engine; need to create the 'Processor' task */
-    EventuallyPersistentEngine& engine;
     uint64_t opaqueCounter;
     size_t processorTaskId;
     std::atomic<enum process_items_error_t> processorTaskState;