diff options
author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2014-05-28 18:40:59 -0400 |
---|---|---|
committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2014-05-28 18:40:59 -0400 |
commit | 8bc2783d2e6e39c0910455b4eac9e0f93a482cfc (patch) | |
tree | 46a523ea698d1a9a80013816d8e568e2fdd2f2dc /src/mongo/dbtests/query_stage_sort.cpp | |
parent | 0672061deb58aac931912bed68d014247c581968 (diff) | |
download | mongo-8bc2783d2e6e39c0910455b4eac9e0f93a482cfc.tar.gz |
Revert "SERVER-13961 Pass LockState to DBWrite and DBRead directly"
This reverts commit 0672061deb58aac931912bed68d014247c581968.
Diffstat (limited to 'src/mongo/dbtests/query_stage_sort.cpp')
-rw-r--r-- | src/mongo/dbtests/query_stage_sort.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/mongo/dbtests/query_stage_sort.cpp b/src/mongo/dbtests/query_stage_sort.cpp index 2440f67948f..f0605a7abbc 100644 --- a/src/mongo/dbtests/query_stage_sort.cpp +++ b/src/mongo/dbtests/query_stage_sort.cpp @@ -169,9 +169,10 @@ namespace QueryStageSortTests { static const char* ns() { return "unittests.QueryStageSort"; } private: - DBDirectClient _client; + static DBDirectClient _client; }; + DBDirectClient QueryStageSortTestBase::_client; // Sort some small # of results in increasing order. class QueryStageSortInc: public QueryStageSortTestBase { @@ -179,9 +180,8 @@ namespace QueryStageSortTests { virtual int numObj() { return 100; } void run() { + Client::WriteContext ctx(ns()); OperationContextImpl txn; - Client::WriteContext ctx(&txn, ns()); - Database* db = ctx.ctx().db(); Collection* coll = db->getCollection(ns()); if (!coll) { @@ -199,9 +199,8 @@ namespace QueryStageSortTests { virtual int numObj() { return 100; } void run() { + Client::WriteContext ctx(ns()); OperationContextImpl txn; - Client::WriteContext ctx(&txn, ns()); - Database* db = ctx.ctx().db(); Collection* coll = db->getCollection(ns()); if (!coll) { @@ -228,9 +227,8 @@ namespace QueryStageSortTests { virtual int numObj() { return 10000; } void run() { + Client::WriteContext ctx(ns()); OperationContextImpl txn; - Client::WriteContext ctx(&txn, ns()); - Database* db = ctx.ctx().db(); Collection* coll = db->getCollection(ns()); if (!coll) { @@ -248,9 +246,8 @@ namespace QueryStageSortTests { virtual int numObj() { return 2000; } void run() { + Client::WriteContext ctx(ns()); OperationContextImpl txn; - Client::WriteContext ctx(&txn, ns()); - Database* db = ctx.ctx().db(); Collection* coll = db->getCollection(ns()); if (!coll) { @@ -339,9 +336,8 @@ namespace QueryStageSortTests { virtual int numObj() { return 100; } void run() { + Client::WriteContext ctx(ns()); OperationContextImpl txn; - Client::WriteContext ctx(&txn, ns()); - Database* db = ctx.ctx().db(); Collection* coll = db->getCollection(ns()); if (!coll) { |