diff options
author | Craig Harris <craig.harris@10gen.com> | 2014-06-25 17:06:03 -0400 |
---|---|---|
committer | CraigHarris <craig.harris@10gen.com> | 2014-07-08 10:53:53 -0400 |
commit | 0450a0f25d4509f6515e939a5ef3a671f744cc2a (patch) | |
tree | bd5004de51df5ebe4923a6af0863ab5c4b10f8fc /src/mongo/db/exec/distinct_scan.cpp | |
parent | b1048dc6f42e184c08853fe98c21a90ecfb40d6b (diff) | |
download | mongo-0450a0f25d4509f6515e939a5ef3a671f744cc2a.tar.gz |
SERVER-14387 Propogate OperationContext through calls requiring document read locks, without doing the locking.
Diffstat (limited to 'src/mongo/db/exec/distinct_scan.cpp')
-rw-r--r-- | src/mongo/db/exec/distinct_scan.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mongo/db/exec/distinct_scan.cpp b/src/mongo/db/exec/distinct_scan.cpp index 3cbd9e84d08..a55ea4e997e 100644 --- a/src/mongo/db/exec/distinct_scan.cpp +++ b/src/mongo/db/exec/distinct_scan.cpp @@ -39,8 +39,9 @@ namespace mongo { // static const char* DistinctScan::kStageType = "DISTINCT"; - DistinctScan::DistinctScan(const DistinctParams& params, WorkingSet* workingSet) - : _workingSet(workingSet), + DistinctScan::DistinctScan(OperationContext* txn, const DistinctParams& params, WorkingSet* workingSet) + : _txn(txn), + _workingSet(workingSet), _descriptor(params.descriptor), _iam(params.descriptor->getIndexCatalog()->getIndex(params.descriptor)), _btreeCursor(NULL), @@ -60,7 +61,7 @@ namespace mongo { } IndexCursor *cursor; - Status s = _iam->newCursor(cursorOptions, &cursor); + Status s = _iam->newCursor(_txn, cursorOptions, &cursor); verify(s.isOK()); verify(cursor); // Is this assumption always valid? See SERVER-12397 |