summaryrefslogtreecommitdiff
path: root/src/mongo/dbtests/namespacetests.cpp
diff options
context:
space:
mode:
authorCraig Harris <craig.harris@10gen.com>2014-06-25 17:06:03 -0400
committerCraigHarris <craig.harris@10gen.com>2014-07-08 10:53:53 -0400
commit0450a0f25d4509f6515e939a5ef3a671f744cc2a (patch)
treebd5004de51df5ebe4923a6af0863ab5c4b10f8fc /src/mongo/dbtests/namespacetests.cpp
parentb1048dc6f42e184c08853fe98c21a90ecfb40d6b (diff)
downloadmongo-0450a0f25d4509f6515e939a5ef3a671f744cc2a.tar.gz
SERVER-14387 Propogate OperationContext through calls requiring document read locks, without doing the locking.
Diffstat (limited to 'src/mongo/dbtests/namespacetests.cpp')
-rw-r--r--src/mongo/dbtests/namespacetests.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/mongo/dbtests/namespacetests.cpp b/src/mongo/dbtests/namespacetests.cpp
index 4309b9c2356..698678be8ec 100644
--- a/src/mongo/dbtests/namespacetests.cpp
+++ b/src/mongo/dbtests/namespacetests.cpp
@@ -2,7 +2,7 @@
//
/**
- * Copyright (C) 2008 10gen Inc.
+ * Copyright (C) 2008-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,
@@ -363,14 +363,16 @@ namespace NamespaceTests {
DiskLoc last, first;
{
- auto_ptr<Runner> runner(InternalPlanner::collectionScan(ns(),
+ auto_ptr<Runner> runner(InternalPlanner::collectionScan(&txn,
+ ns(),
collection(),
InternalPlanner::BACKWARD));
runner->getNext(NULL, &last);
ASSERT( !last.isNull() );
}
{
- auto_ptr<Runner> runner(InternalPlanner::collectionScan(ns(),
+ auto_ptr<Runner> runner(InternalPlanner::collectionScan(&txn,
+ ns(),
collection(),
InternalPlanner::FORWARD));
runner->getNext(NULL, &first);
@@ -383,14 +385,16 @@ namespace NamespaceTests {
{
DiskLoc loc;
- auto_ptr<Runner> runner(InternalPlanner::collectionScan(ns(),
+ auto_ptr<Runner> runner(InternalPlanner::collectionScan(&txn,
+ ns(),
collection(),
InternalPlanner::FORWARD));
runner->getNext(NULL, &loc);
ASSERT( first == loc);
}
{
- auto_ptr<Runner> runner(InternalPlanner::collectionScan(ns(),
+ auto_ptr<Runner> runner(InternalPlanner::collectionScan(&txn,
+ ns(),
collection(),
InternalPlanner::BACKWARD));
DiskLoc loc;