diff options
author | Tyler Brock <tyler.brock@gmail.com> | 2014-06-30 15:08:13 -0400 |
---|---|---|
committer | Tyler Brock <tyler.brock@gmail.com> | 2014-06-30 15:08:13 -0400 |
commit | a353e16805d573af3d5ab4d32fbda87ec98d5c40 (patch) | |
tree | b380194417fd18d7ac24a138cf8a3f14f2535e0c /src/mongo/db/catalog | |
parent | e9a6e9365cf4d6d13b4a3f94aec1f433dab9f704 (diff) | |
download | mongo-a353e16805d573af3d5ab4d32fbda87ec98d5c40.tar.gz |
Revert "SERVER-13961 Add OperationContext argument to Client::Context"
This reverts commit e1f5a39b1b625d04752be13f39c774e579b64cd8.
Diffstat (limited to 'src/mongo/db/catalog')
-rw-r--r-- | src/mongo/db/catalog/collection_cursor_cache.cpp | 4 | ||||
-rw-r--r-- | src/mongo/db/catalog/database.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/catalog/database_holder.cpp | 4 | ||||
-rw-r--r-- | src/mongo/db/catalog/index_catalog.cpp | 3 |
4 files changed, 5 insertions, 8 deletions
diff --git a/src/mongo/db/catalog/collection_cursor_cache.cpp b/src/mongo/db/catalog/collection_cursor_cache.cpp index c8e8feae704..2e941dd1f40 100644 --- a/src/mongo/db/catalog/collection_cursor_cache.cpp +++ b/src/mongo/db/catalog/collection_cursor_cache.cpp @@ -191,7 +191,7 @@ namespace mongo { Database* db = dbHolder().get(txn, ns); if ( !db ) return false; - Client::Context context(txn, ns, db ); + Client::Context context( ns, db ); Collection* collection = db->getCollection( txn, ns ); if ( !collection ) { if ( checkAuth ) @@ -221,7 +221,7 @@ namespace mongo { Database* db = dbHolder().get(txn, ns); if ( !db ) continue; - Client::Context context(txn, ns, db ); + Client::Context context( ns, db ); Collection* collection = db->getCollection( txn, ns ); if ( collection == NULL ) { continue; diff --git a/src/mongo/db/catalog/database.cpp b/src/mongo/db/catalog/database.cpp index 1238072ba59..affa5d64195 100644 --- a/src/mongo/db/catalog/database.cpp +++ b/src/mongo/db/catalog/database.cpp @@ -513,7 +513,7 @@ namespace mongo { log() << "dropAllDatabasesExceptLocal " << n.size() << endl; for( vector<string>::iterator i = n.begin(); i != n.end(); i++ ) { if( *i != "local" ) { - Client::Context ctx(txn, *i); + Client::Context ctx(*i); dropDatabase(txn, ctx.db()); } } diff --git a/src/mongo/db/catalog/database_holder.cpp b/src/mongo/db/catalog/database_holder.cpp index 438be2fd6aa..e1f83b53e98 100644 --- a/src/mongo/db/catalog/database_holder.cpp +++ b/src/mongo/db/catalog/database_holder.cpp @@ -141,10 +141,8 @@ namespace mongo { int nNotClosed = 0; for( set< string >::iterator i = dbs.begin(); i != dbs.end(); ++i ) { string name = *i; - LOG(2) << "DatabaseHolder::closeAll name:" << name; - Client::Context ctx(txn, name); - + Client::Context ctx( name ); if( !force && BackgroundOperation::inProgForDb(name) ) { log() << "WARNING: can't close database " << name diff --git a/src/mongo/db/catalog/index_catalog.cpp b/src/mongo/db/catalog/index_catalog.cpp index 8d70c6b123c..309775aed85 100644 --- a/src/mongo/db/catalog/index_catalog.cpp +++ b/src/mongo/db/catalog/index_catalog.cpp @@ -420,8 +420,7 @@ namespace mongo { return; } - Client::Context context( _txn, - _collection->ns().ns(), + Client::Context context( _collection->ns().ns(), _collection->_database ); // if we're here, the index build failed or was interrupted |