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/dbtests/query_stage_collscan.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/dbtests/query_stage_collscan.cpp')
| -rw-r--r-- | src/mongo/dbtests/query_stage_collscan.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mongo/dbtests/query_stage_collscan.cpp b/src/mongo/dbtests/query_stage_collscan.cpp index 06088bf425a..415a651babc 100644 --- a/src/mongo/dbtests/query_stage_collscan.cpp +++ b/src/mongo/dbtests/query_stage_collscan.cpp @@ -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, @@ -352,7 +352,7 @@ namespace QueryStageCollectionScan { // Make a scan and have the runner own it. WorkingSet* ws = new WorkingSet(); - PlanStage* ps = new CollectionScan(params, ws, filterExpr.get()); + PlanStage* ps = new CollectionScan(&_txn, params, ws, filterExpr.get()); PlanExecutor runner(ws, ps, params.collection); // Use the runner to count the number of objects scanned. @@ -371,7 +371,7 @@ namespace QueryStageCollectionScan { params.direction = direction; params.tailable = false; - scoped_ptr<CollectionScan> scan(new CollectionScan(params, &ws, NULL)); + scoped_ptr<CollectionScan> scan(new CollectionScan(&_txn, params, &ws, NULL)); while (!scan->isEOF()) { WorkingSetID id = WorkingSet::INVALID_ID; PlanStage::StageState state = scan->work(&id); @@ -457,7 +457,7 @@ namespace QueryStageCollectionScan { // Make a scan and have the runner own it. WorkingSet* ws = new WorkingSet(); - PlanStage* ps = new CollectionScan(params, ws, NULL); + PlanStage* ps = new CollectionScan(&_txn, params, ws, NULL); PlanExecutor runner(ws, ps, params.collection); int count = 0; @@ -486,7 +486,7 @@ namespace QueryStageCollectionScan { params.tailable = false; WorkingSet* ws = new WorkingSet(); - PlanStage* ps = new CollectionScan(params, ws, NULL); + PlanStage* ps = new CollectionScan(&_txn, params, ws, NULL); PlanExecutor runner(ws, ps, params.collection); int count = 0; @@ -522,7 +522,7 @@ namespace QueryStageCollectionScan { params.tailable = false; WorkingSet ws; - scoped_ptr<CollectionScan> scan(new CollectionScan(params, &ws, NULL)); + scoped_ptr<CollectionScan> scan(new CollectionScan(&_txn, params, &ws, NULL)); int count = 0; while (count < 10) { @@ -584,7 +584,7 @@ namespace QueryStageCollectionScan { params.tailable = false; WorkingSet ws; - scoped_ptr<CollectionScan> scan(new CollectionScan(params, &ws, NULL)); + scoped_ptr<CollectionScan> scan(new CollectionScan(&_txn, params, &ws, NULL)); int count = 0; while (count < 10) { |