diff options
Diffstat (limited to 'src/mongo/db/catalog_raii.h')
| -rw-r--r-- | src/mongo/db/catalog_raii.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/mongo/db/catalog_raii.h b/src/mongo/db/catalog_raii.h index 69f2abac298..b62d791c1ce 100644 --- a/src/mongo/db/catalog_raii.h +++ b/src/mongo/db/catalog_raii.h @@ -137,8 +137,8 @@ public: /** * Returns the database, creating it if it does not exist. */ - Database* ensureDbExists() { - return _autoDb.ensureDbExists(_opCtx); + Database* ensureDbExists(OperationContext* opCtx) { + return _autoDb.ensureDbExists(opCtx); } /** @@ -174,13 +174,10 @@ public: * the original Collection pointer. */ Collection* getWritableCollection( + OperationContext* opCtx, CollectionCatalog::LifetimeMode mode = CollectionCatalog::LifetimeMode::kManagedInWriteUnitOfWork); - OperationContext* getOperationContext() const { - return _opCtx; - } - protected: template <typename AutoGetCollectionType, typename EmplaceAutoGetCollectionFunc> friend class AutoGetCollectionForReadBase; @@ -192,7 +189,6 @@ protected: return _coll; } - OperationContext* _opCtx = nullptr; AutoGetDb _autoDb; boost::optional<Lock::CollectionLock> _collLock; CollectionPtr _coll = nullptr; @@ -361,7 +357,8 @@ public: CollectionCatalog::LifetimeMode mode = CollectionCatalog::LifetimeMode::kManagedInWriteUnitOfWork); // Acts as an adaptor for AutoGetCollection - CollectionWriter(AutoGetCollection& autoCollection, + CollectionWriter(OperationContext* opCtx, + AutoGetCollection& autoCollection, CollectionCatalog::LifetimeMode mode = CollectionCatalog::LifetimeMode::kManagedInWriteUnitOfWork); // Acts as an adaptor for a writable Collection that has been retrieved elsewhere |