SERVER-37988 Add an optional predicate argument in forEachCollectionFromDb() to allow skipping unsatisfied collections without grabbing them in the desired lock mode

1 files changed, 13 insertions, 0 deletions

diff --git a/src/mongo/db/catalog/collection_catalog.h b/src/mongo/db/catalog/collection_catalog.h
index 8a7dcaae650..475d12241fe 100644
--- a/src/mongo/db/catalog/collection_catalog.h
+++ b/src/mongo/db/catalog/collection_catalog.h
@@ -56,6 +56,9 @@ class CollectionCatalog {
     struct CollectionInfo;
 
 public:
+    using CollectionInfoFn = std::function<bool(const Collection* collection,
+                                                const CollectionCatalogEntry* catalogEntry)>;
+
     class iterator {
     public:
         using value_type = Collection*;
@@ -217,6 +220,12 @@ public:
     boost::optional<CollectionUUID> lookupUUIDByNSS(const NamespaceString& nss) const;
 
     /**
+     * Returns whether the collection with 'uuid' satisfies the provided 'predicate'. If the
+     * collection with 'uuid' is not found, false is returned.
+     */
+    bool checkIfCollectionSatisfiable(CollectionUUID uuid, CollectionInfoFn predicate) const;
+
+    /**
      * This function gets the UUIDs of all collections from `dbName`.
      *
      * If the caller does not take a strong database lock, some of UUIDs might no longer exist (due
@@ -284,6 +293,10 @@ private:
     class FinishDropChange;
     friend class CollectionCatalog::iterator;
 
+    Collection* _lookupCollectionByUUID(WithLock, CollectionUUID uuid) const;
+    CollectionCatalogEntry* _lookupCollectionCatalogEntryByUUID(WithLock,
+                                                                CollectionUUID uuid) const;
+
     const std::vector<CollectionUUID>& _getOrdering_inlock(const StringData& db,
                                                            const stdx::lock_guard<stdx::mutex>&);
     mutable mongo::stdx::mutex _catalogLock;