SERVER-14387 Propogate OperationContext through calls requiring document read locks, without doing the locking.

1 files changed, 7 insertions, 2 deletions

diff --git a/src/mongo/db/exec/index_scan.h b/src/mongo/db/exec/index_scan.h
index 6b993f387ad..02b14f1e6d8 100644
--- a/src/mongo/db/exec/index_scan.h
+++ b/src/mongo/db/exec/index_scan.h
@@ -1,5 +1,5 @@
 /**
- *    Copyright (C) 2013 10gen Inc.
+ *    Copyright (C) 2013-2014 MongoDB Inc.
  *
  *    This program is free software: you can redistribute it and/or  modify
  *    it under the terms of the GNU Affero General Public License, version 3,
@@ -80,7 +80,9 @@ namespace mongo {
      */
     class IndexScan : public PlanStage {
     public:
-        IndexScan(const IndexScanParams& params, WorkingSet* workingSet,
+        IndexScan(OperationContext* txn,
+                  const IndexScanParams& params,
+                  WorkingSet* workingSet,
                   const MatchExpression* filter);
 
         virtual ~IndexScan() { }
@@ -108,6 +110,9 @@ namespace mongo {
         /** See if the cursor is pointing at or past _endKey, if _endKey is non-empty. */
         void checkEnd();
 
+        // transactional context for read locks. Not owned by us
+        OperationContext* _txn;
+
         // The WorkingSet we annotate with results.  Not owned by us.
         WorkingSet* _workingSet;