SERVER-44276: Change storage engine catalog map to be keyed by RecordId instead of Namespace.

1 files changed, 7 insertions, 0 deletions

diff --git a/src/mongo/db/catalog/collection_impl.h b/src/mongo/db/catalog/collection_impl.h
index a33c507ecda..5e60d4b91db 100644
--- a/src/mongo/db/catalog/collection_impl.h
+++ b/src/mongo/db/catalog/collection_impl.h
@@ -44,6 +44,7 @@ public:
 
     explicit CollectionImpl(OperationContext* opCtx,
                             const NamespaceString& nss,
+                            RecordId catalogId,
                             UUID uuid,
                             std::unique_ptr<RecordStore> recordStore);
 
@@ -53,6 +54,7 @@ public:
     public:
         std::unique_ptr<Collection> make(OperationContext* opCtx,
                                          const NamespaceString& nss,
+                                         RecordId catalogId,
                                          CollectionUUID uuid,
                                          std::unique_ptr<RecordStore> rs) const final;
     };
@@ -63,6 +65,10 @@ public:
 
     void setNs(NamespaceString nss) final;
 
+    RecordId getCatalogId() const {
+        return _catalogId;
+    }
+
     UUID uuid() const {
         return _uuid;
     }
@@ -357,6 +363,7 @@ private:
                             OpDebug* opDebug);
 
     NamespaceString _ns;
+    RecordId _catalogId;
     UUID _uuid;
 
     // The RecordStore may be null during a repair operation.