summaryrefslogtreecommitdiff
path: root/src/mongo/db/catalog/collection_catalog_helper.cpp
diff options
context:
space:
mode:
authorXiangyu Yao <xiangyu.yao@mongodb.com>2019-06-19 00:38:36 -0400
committerXiangyu Yao <xiangyu.yao@mongodb.com>2019-06-28 15:03:00 -0400
commit2597e7fbe3c09683408b82b8b854023d6c2dbbf2 (patch)
tree8cfe4373adec95180cd2a1c37f428626bab94bfc /src/mongo/db/catalog/collection_catalog_helper.cpp
parent47ee8f8cde1d1e116caf223458c15b4af10943d6 (diff)
downloadmongo-2597e7fbe3c09683408b82b8b854023d6c2dbbf2.tar.gz
SERVER-40717 Remove CollectionCatalogEntry and KVColletionCatalogEntry
Diffstat (limited to 'src/mongo/db/catalog/collection_catalog_helper.cpp')
-rw-r--r--src/mongo/db/catalog/collection_catalog_helper.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mongo/db/catalog/collection_catalog_helper.cpp b/src/mongo/db/catalog/collection_catalog_helper.cpp
index 2a10fef2066..2cb11844d71 100644
--- a/src/mongo/db/catalog/collection_catalog_helper.cpp
+++ b/src/mongo/db/catalog/collection_catalog_helper.cpp
@@ -30,7 +30,6 @@
#include "mongo/db/catalog/collection_catalog_helper.h"
#include "mongo/db/catalog/collection.h"
#include "mongo/db/catalog/collection_catalog.h"
-#include "mongo/db/catalog/collection_catalog_entry.h"
#include "mongo/db/concurrency/d_concurrency.h"
namespace mongo {
@@ -63,11 +62,10 @@ void forEachCollectionFromDb(OperationContext* opCtx,
opCtx->recoveryUnit()->abandonSnapshot();
auto collection = catalog.lookupCollectionByUUID(uuid);
- auto catalogEntry = catalog.lookupCollectionCatalogEntryByUUID(uuid);
- if (!collection || !catalogEntry || catalogEntry->ns() != *nss)
+ if (!collection || collection->ns() != *nss)
continue;
- if (!callback(collection, catalogEntry))
+ if (!callback(collection))
break;
MONGO_FAIL_POINT_PAUSE_WHILE_SET(hangBeforeGettingNextCollection);