diff options
| author | Faustoleyva54 <fausto.leyva@mongodb.com> | 2021-12-31 17:44:36 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-01-05 21:46:33 +0000 |
| commit | 23376f506bf0ee9cb64cdf212a618224a1184859 (patch) | |
| tree | 97c4ac417dd2b10672771b45cb8cc4a502812d19 /src/mongo/db/catalog_raii.cpp | |
| parent | f8ce50765f7017ed6cbb1cffd57dfa0d58e5c705 (diff) | |
| download | mongo-23376f506bf0ee9cb64cdf212a618224a1184859.tar.gz | |
SERVER-62050 Remove _opCtx from AutoGetDb and instead pass in an opCtx to AutoGetDb::ensureDbExists()
Diffstat (limited to 'src/mongo/db/catalog_raii.cpp')
| -rw-r--r-- | src/mongo/db/catalog_raii.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mongo/db/catalog_raii.cpp b/src/mongo/db/catalog_raii.cpp index 555f3b8cbd7..3625d81ff4a 100644 --- a/src/mongo/db/catalog_raii.cpp +++ b/src/mongo/db/catalog_raii.cpp @@ -49,7 +49,7 @@ MONGO_FAIL_POINT_DEFINE(setAutoGetCollectionWait); } // namespace AutoGetDb::AutoGetDb(OperationContext* opCtx, StringData dbName, LockMode mode, Date_t deadline) - : _opCtx(opCtx), _dbName(dbName), _dbLock(opCtx, dbName, mode, deadline), _db([&] { + : _dbName(dbName), _dbLock(opCtx, dbName, mode, deadline), _db([&] { auto databaseHolder = DatabaseHolder::get(opCtx); return databaseHolder->getDb(opCtx, dbName); }()) { @@ -58,17 +58,17 @@ AutoGetDb::AutoGetDb(OperationContext* opCtx, StringData dbName, LockMode mode, dss->checkDbVersion(opCtx, dssLock); } -Database* AutoGetDb::ensureDbExists() { +Database* AutoGetDb::ensureDbExists(OperationContext* opCtx) { if (_db) { return _db; } - auto databaseHolder = DatabaseHolder::get(_opCtx); - _db = databaseHolder->openDb(_opCtx, _dbName, nullptr); + auto databaseHolder = DatabaseHolder::get(opCtx); + _db = databaseHolder->openDb(opCtx, _dbName, nullptr); - auto dss = DatabaseShardingState::get(_opCtx, _dbName); - auto dssLock = DatabaseShardingState::DSSLock::lockShared(_opCtx, dss); - dss->checkDbVersion(_opCtx, dssLock); + auto dss = DatabaseShardingState::get(opCtx, _dbName); + auto dssLock = DatabaseShardingState::DSSLock::lockShared(opCtx, dss); + dss->checkDbVersion(opCtx, dssLock); return _db; } |