SERVER-13641 put opctx into Runners

Author: Hari Khalsa

src/mongo/db/catalog/index_create.cpp

@@ -137,7 +137,7 @@ namespace mongo {
                     collection->deleteDocument( txn, loc, false, true, &toDelete );
                     logOp( txn, "d", ns.c_str(), toDelete );
 
-                    if (!runner->restoreState()) {
+                    if (!runner->restoreState(txn)) {
                         // Runner got killed somehow.  This probably shouldn't happen.
                         if (runnerEOF) {
                             // Quote: "We were already at the end.  Normal.

src/mongo/db/commands/mr.cpp

@@ -880,7 +880,7 @@ namespace mongo {
          * After calling this method, the temp collection will be completed.
          * If inline, the results will be in the in memory map
          */
-        void State::finalReduce( CurOp * op , ProgressMeterHolder& pm ) {
+        void State::finalReduce(CurOp * op , ProgressMeterHolder& pm ) {
 
             if (_jsMode) {
                 // apply the reduce within JS
@@ -995,7 +995,7 @@ namespace mongo {
                 prev = o;
                 all.push_back( o );
 
-                if (!runner->restoreState()) {
+                if (!runner->restoreState(_txn)) {
                     break;
                 }
 
@@ -1376,7 +1376,7 @@ namespace mongo {
                     // if not inline: dump the in memory map to inc collection, all data is on disk
                     state.dumpToInc();
                     // final reduce
-                    state.finalReduce( op , pm );
+                    state.finalReduce(op , pm );
                     reduceTime += rt.micros();
                     countsBuilder.appendNumber( "reduce" , state.numReduces() );
                     timingBuilder.appendNumber("reduceTime", reduceTime / 1000);

src/mongo/db/commands/parallel_collection_scan.cpp

@@ -90,7 +90,7 @@ namespace mongo {
                     _iterators[i]->prepareToYield();
                 }
             }
-            virtual bool restoreState() {
+            virtual bool restoreState(OperationContext* opCtx) {
                 for (size_t i = 0; i < _iterators.size(); i++) {
                     if (!_iterators[i]->recoverFromYield()) {
                         kill();

src/mongo/db/commands/pipeline_command.cpp

@@ -118,7 +118,7 @@ namespace {
 
         // These are all no-ops for PipelineRunners
         virtual void saveState() {}
-        virtual bool restoreState() { return true; }
+        virtual bool restoreState(OperationContext* opCtx) { return true; }
         virtual const Collection* collection() { return NULL; }
 
         /**

src/mongo/db/ops/delete_executor.cpp

@@ -147,7 +147,7 @@ namespace mongo {
             // saving/restoring state repeatedly?
             runner->saveState();
             collection->deleteDocument(txn, rloc, false, false, logop ? &toDelete : NULL );
-            runner->restoreState();
+            runner->restoreState(txn);
 
             nDeleted++;
 

src/mongo/db/ops/update.cpp

@@ -663,7 +663,7 @@ namespace mongo {
             // Restore state after modification
             uassert(17278,
                     "Update could not restore runner state after updating a document.",
-                    runner->restoreState());
+                    runner->restoreState(txn));
 
             // Call logOp if requested.
             if (request.shouldCallLogOp() && !logObj.isEmpty()) {

src/mongo/db/pipeline/document_source_cursor.cpp

@@ -31,6 +31,7 @@
 #include "mongo/db/pipeline/document_source.h"
 
 #include "mongo/db/instance.h"
+#include "mongo/db/operation_context_impl.h"
 #include "mongo/db/pipeline/document.h"
 #include "mongo/db/query/find_constants.h"
 #include "mongo/db/query/type_explain.h"
@@ -80,8 +81,9 @@ namespace mongo {
         // so we shouldn't check it again.
         Lock::DBRead lk(_ns);
         Client::Context ctx(_ns, storageGlobalParams.dbpath, /*doVersion=*/false);
+        OperationContextImpl opCtx;  // XXX TODO(MATHIAS)
 
-        _runner->restoreState();
+        _runner->restoreState(&opCtx);
 
         int memUsageBytes = 0;
         BSONObj obj;
@@ -201,10 +203,11 @@ namespace {
         {
             Lock::DBRead lk(_ns);
             Client::Context ctx(_ns, storageGlobalParams.dbpath, /*doVersion=*/false);
+            OperationContextImpl opCtx;  // XXX TODO(MATHIAS)
             massert(17392, "No _runner. Were we disposed before explained?",
                     _runner);
 
-            _runner->restoreState();
+            _runner->restoreState(&opCtx);
 
             TypeExplain* explainRaw;
             explainStatus = _runner->getInfo(&explainRaw, NULL);

src/mongo/db/query/eof_runner.cpp

@@ -52,7 +52,7 @@ namespace mongo {
     void EOFRunner::saveState() {
     }
 
-    bool EOFRunner::restoreState() {
+    bool EOFRunner::restoreState(OperationContext* opCtx) {
         // TODO: Does this value matter?
         return false;
     }

src/mongo/db/query/eof_runner.h

@@ -60,7 +60,7 @@ namespace mongo {
 
         virtual void saveState();
 
-        virtual bool restoreState();
+        virtual bool restoreState(OperationContext* opCtx);
 
         virtual void invalidate(const DiskLoc& dl, InvalidationType type);
 

src/mongo/db/query/idhack_runner.cpp

@@ -186,7 +186,7 @@ namespace mongo {
 
     void IDHackRunner::saveState() { }
 
-    bool IDHackRunner::restoreState() { return true; }
+    bool IDHackRunner::restoreState(OperationContext* opCtx) { return true; }
 
     // Nothing to do here, holding no state.
     void IDHackRunner::invalidate(const DiskLoc& dl, InvalidationType type) {