SERVER-14995 Move operation id, lockState and client fields to OperationContext.

They have been moved from OperationContextImpl.  Furthermore, the CurOp stack is
now attached to OperationContext, instead of Client.

With this change, an operation's lifetime is governed by the lifetime of an
OperationContext object.  The "_active" field of CurOp is therefore no longer
meaingful.  This required fixing the lifetime of OperationContext in a few
places.

A future change will adjust operation lifetime timing to time the lifetime of
the OperationContext object, as well.

1 files changed, 17 insertions, 18 deletions

diff --git a/src/mongo/db/operation_context_noop.h b/src/mongo/db/operation_context_noop.h
index a428042438c..254f553445b 100644
--- a/src/mongo/db/operation_context_noop.h
+++ b/src/mongo/db/operation_context_noop.h
@@ -39,25 +39,32 @@ namespace mongo {
 
     class OperationContextNoop : public OperationContext {
     public:
-        OperationContextNoop(RecoveryUnit* ru)
-            : _recoveryUnit(ru),
-              _locker(new LockerNoop()) {
 
+        OperationContextNoop() : OperationContextNoop(new RecoveryUnitNoop()) {}
+
+        OperationContextNoop(RecoveryUnit* ru) : OperationContextNoop(nullptr, 0, ru) {}
+
+        OperationContextNoop(Client* client, unsigned int opId)
+            : OperationContextNoop(client, opId, new RecoveryUnitNoop()) {
         }
 
-        OperationContextNoop()
-            : _recoveryUnit(new RecoveryUnitNoop()),
-              _locker(new LockerNoop()) {
+        OperationContextNoop(Client* client, unsigned int opId, RecoveryUnit* ru)
+            : OperationContextNoop(client, opId, new LockerNoop(), ru) {
+        }
 
+        OperationContextNoop(Client* client, unsigned int opId, Locker* locker)
+            : OperationContextNoop(client, opId, locker, new RecoveryUnitNoop()) {
         }
 
-        virtual ~OperationContextNoop() { }
+        OperationContextNoop(Client* client, unsigned int opId, Locker* locker, RecoveryUnit* ru)
+            : OperationContext(client, opId, locker),
+              _recoveryUnit(ru) {
 
-        virtual Client* getClient() const override {
-            invariant(false);
-            return NULL;
+            _locker.reset(lockState());
         }
 
+        virtual ~OperationContextNoop() = default;
+
         virtual RecoveryUnit* recoveryUnit() const override {
             return _recoveryUnit.get();
         }
@@ -74,10 +81,6 @@ namespace mongo {
             return oldState;
         }
 
-        virtual Locker* lockState() const override {
-            return _locker.get();
-        }
-
         virtual ProgressMeter* setMessage(const char * msg,
                                           const std::string &name,
                                           unsigned long long progressMeterTotal,
@@ -98,10 +101,6 @@ namespace mongo {
             return std::string();
         };
 
-        virtual unsigned int getOpID() const override {
-            return 0;
-        }
-
         void setReplicatedWrites(bool writesAreReplicated = true) override {}
 
         bool writesAreReplicated() const override {