diff options
Diffstat (limited to 'src/mongo/db/catalog/drop_collection.cpp')
| -rw-r--r-- | src/mongo/db/catalog/drop_collection.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/mongo/db/catalog/drop_collection.cpp b/src/mongo/db/catalog/drop_collection.cpp index 3ed987e475f..99826f3082a 100644 --- a/src/mongo/db/catalog/drop_collection.cpp +++ b/src/mongo/db/catalog/drop_collection.cpp @@ -53,7 +53,7 @@ namespace mongo { MONGO_FAIL_POINT_DEFINE(hangDropCollectionBeforeLockAcquisition); MONGO_FAIL_POINT_DEFINE(hangDuringDropCollection); -Status _checkNssAndReplState(OperationContext* opCtx, const Collection* coll) { +Status _checkNssAndReplState(OperationContext* opCtx, const CollectionPtr& coll) { if (!coll) { return Status(ErrorCodes::NamespaceNotFound, "ns not found"); } @@ -134,7 +134,7 @@ Status _abortIndexBuildsAndDropCollection(OperationContext* opCtx, // which may have changed when we released the collection lock temporarily. opCtx->recoveryUnit()->abandonSnapshot(); - const Collection* coll = + const CollectionPtr& coll = CollectionCatalog::get(opCtx).lookupCollectionByNamespace(opCtx, startingNss); Status status = _checkNssAndReplState(opCtx, coll); if (!status.isOK()) { @@ -185,7 +185,7 @@ Status _abortIndexBuildsAndDropCollection(OperationContext* opCtx, // disk state, which may have changed when we released the collection lock temporarily. opCtx->recoveryUnit()->abandonSnapshot(); - const Collection* coll = + const CollectionPtr& coll = CollectionCatalog::get(opCtx).lookupCollectionByUUID(opCtx, collectionUUID); status = _checkNssAndReplState(opCtx, coll); if (!status.isOK()) { @@ -237,7 +237,7 @@ Status _dropCollection(OperationContext* opCtx, DropCollectionSystemCollectionMode systemCollectionMode, BSONObjBuilder& result) { Lock::CollectionLock collLock(opCtx, collectionName, MODE_X); - const Collection* coll = + const CollectionPtr& coll = CollectionCatalog::get(opCtx).lookupCollectionByNamespace(opCtx, collectionName); Status status = _checkNssAndReplState(opCtx, coll); if (!status.isOK()) { @@ -300,8 +300,9 @@ Status dropCollection(OperationContext* opCtx, return Status(ErrorCodes::NamespaceNotFound, "ns not found"); } - const Collection* coll = CollectionCatalog::get(opCtx).lookupCollectionByNamespace( - opCtx, collectionName); + const CollectionPtr& coll = + CollectionCatalog::get(opCtx).lookupCollectionByNamespace(opCtx, + collectionName); if (!coll) { return _dropView(opCtx, db, collectionName, result); @@ -337,7 +338,7 @@ Status dropCollectionForApplyOps(OperationContext* opCtx, return Status(ErrorCodes::NamespaceNotFound, "ns not found"); } - const Collection* coll = + const CollectionPtr& coll = CollectionCatalog::get(opCtx).lookupCollectionByNamespace(opCtx, collectionName); BSONObjBuilder unusedBuilder; |