SERVER-23905 Move writesAreReplicated flag from OperationContextImpl to OperationContext.

This removes the last difference between OperationContextNoop and
OperationContextReplMock, so this patch also deletes the latter.

Author: amschwerin

src/mongo/db/operation_context.cpp

@@ -203,5 +203,4 @@ Status OperationContext::checkForInterruptNoAssert() {
 
     return Status::OK();
 }
-
 }  // namespace mongo

src/mongo/db/operation_context.h

@@ -180,12 +180,16 @@ class OperationContext : public Decorable<OperationContext> {
     /**
      * Set whether or not operations should generate oplog entries.
      */
-    virtual void setReplicatedWrites(bool writesAreReplicated = true) = 0;
+    void setReplicatedWrites(bool writesAreReplicated = true) {
+        _writesAreReplicated = writesAreReplicated;
+    }
 
     /**
      * Returns true if operations should generate oplog entries.
      */
-    virtual bool writesAreReplicated() const = 0;
+    bool writesAreReplicated() const {
+        return _writesAreReplicated;
+    }
 
     /**
      * Marks this operation as killed so that subsequent calls to checkForInterrupt and
@@ -318,6 +322,8 @@ class OperationContext : public Decorable<OperationContext> {
 
     // Timer counting the elapsed time since the construction of this OperationContext.
     Timer _elapsedTime;
+
+    bool _writesAreReplicated = true;
 };
 
 class WriteUnitOfWork {

src/mongo/db/operation_context_impl.cpp

@@ -72,8 +72,7 @@ using std::string;
 
 OperationContextImpl::OperationContextImpl()
     : OperationContext(
-          &cc(), nextOpId.fetchAndAdd(1), clientOperationInfoDecoration(cc()).getLocker()),
-      _writesAreReplicated(true) {
+          &cc(), nextOpId.fetchAndAdd(1), clientOperationInfoDecoration(cc()).getLocker()) {
     StorageEngine* storageEngine = getServiceContext()->getGlobalStorageEngine();
     _recovery.reset(storageEngine->newRecoveryUnit());
 
@@ -120,11 +119,4 @@ bool OperationContextImpl::isPrimaryFor(StringData ns) {
     return repl::getGlobalReplicationCoordinator()->canAcceptWritesFor(NamespaceString(ns));
 }
 
-void OperationContextImpl::setReplicatedWrites(bool writesAreReplicated) {
-    _writesAreReplicated = writesAreReplicated;
-}
-
-bool OperationContextImpl::writesAreReplicated() const {
-    return _writesAreReplicated;
-}
 }  // namespace mongo

src/mongo/db/operation_context_impl.h

@@ -52,16 +52,12 @@ class OperationContextImpl final : public OperationContext {
 
     virtual bool isPrimaryFor(StringData ns) override;
 
-    virtual void setReplicatedWrites(bool writesAreReplicated = true) override;
-    virtual bool writesAreReplicated() const override;
-
 private:
     friend class ServiceContextMongoD;
 
     OperationContextImpl();
 
     std::unique_ptr<RecoveryUnit> _recovery;
-    bool _writesAreReplicated;
 };
 
 }  // namespace mongo

src/mongo/db/operation_context_noop.h

@@ -100,12 +100,6 @@ class OperationContextNoop : public OperationContext {
         return std::string();
     };
 
-    void setReplicatedWrites(bool writesAreReplicated = true) override {}
-
-    bool writesAreReplicated() const override {
-        return false;
-    }
-
 private:
     std::unique_ptr<RecoveryUnit> _recoveryUnit;
     std::unique_ptr<Locker> _locker;

src/mongo/db/repl/SConscript

@@ -521,7 +521,6 @@ env.Library('repl_coordinator_global',
 env.Library(
     target='replmocks',
     source=[
-        'operation_context_repl_mock.cpp',
         'replication_coordinator_external_state_mock.cpp',
         'replication_coordinator_mock.cpp',
         'service_context_repl_mock.cpp',

src/mongo/db/repl/operation_context_repl_mock.cpp

@@ -32,14 +32,16 @@
 
 #include <memory>
 
-#include "mongo/db/repl/operation_context_repl_mock.h"
+#include "mongo/db/concurrency/lock_state.h"
+#include "mongo/db/concurrency/locker.h"
+#include "mongo/db/operation_context_noop.h"
 
 namespace mongo {
 namespace repl {
 
 std::unique_ptr<OperationContext> ServiceContextReplMock::_newOpCtx(Client* client) {
-    return std::unique_ptr<OperationContextReplMock>(
-        new OperationContextReplMock(client, _nextOpId.fetchAndAdd(1)));
+    return std::unique_ptr<OperationContext>(
+        new OperationContextNoop(client, _nextOpId.fetchAndAdd(1), new MMAPV1LockerImpl()));
 }
 
 }  // namespace repl