SERVER-19543 Don't store a pointer to the CatalogManager in the Catal…

…ogCache
adamchel · Aug 13, 2015 · 0978210 · 0978210
1 parent 5c30b38
commit 0978210
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/src/mongo/s/catalog/catalog_cache.cpp b/src/mongo/s/catalog/catalog_cache.cpp
@@ -35,16 +35,15 @@
 #include "mongo/s/catalog/catalog_manager.h"
 #include "mongo/s/catalog/type_database.h"
 #include "mongo/s/config.h"
+#include "mongo/s/grid.h"
 
 namespace mongo {
 
 using std::shared_ptr;
 using std::string;
 
 
-CatalogCache::CatalogCache(CatalogManager* catalogManager) : _catalogManager(catalogManager) {
-    invariant(_catalogManager);
-}
+CatalogCache::CatalogCache() {}
 
 StatusWith<shared_ptr<DBConfig>> CatalogCache::getDatabase(OperationContext* txn,
                                                            const string& dbName) {
@@ -56,7 +55,7 @@ StatusWith<shared_ptr<DBConfig>> CatalogCache::getDatabase(OperationContext* txn
     }
 
     // Need to load from the store
-    StatusWith<DatabaseType> status = _catalogManager->getDatabase(dbName);
+    StatusWith<DatabaseType> status = grid.catalogManager(txn)->getDatabase(dbName);
     if (!status.isOK()) {
         return status.getStatus();
     }

diff --git a/src/mongo/s/catalog/catalog_cache.h b/src/mongo/s/catalog/catalog_cache.h
@@ -53,7 +53,7 @@ class CatalogCache {
     MONGO_DISALLOW_COPYING(CatalogCache);
 
 public:
-    explicit CatalogCache(CatalogManager* catalogManager);
+    CatalogCache();
 
     /**
      * Retrieves the cached metadata for the specified database. The returned value is still
@@ -81,10 +81,6 @@ class CatalogCache {
 private:
     typedef std::map<std::string, std::shared_ptr<DBConfig>> ShardedDatabasesMap;
 
-
-    // Reference to the catalog manager. Not owned.
-    CatalogManager* const _catalogManager;
-
     // Databases catalog map and mutex to protect it
     stdx::mutex _mutex;
     ShardedDatabasesMap _databases;

diff --git a/src/mongo/s/grid.cpp b/src/mongo/s/grid.cpp
@@ -55,7 +55,7 @@ void Grid::init(std::unique_ptr<CatalogManager> catalogManager,
     invariant(!_cursorManager);
 
     _catalogManager = std::move(catalogManager);
-    _catalogCache = stdx::make_unique<CatalogCache>(_catalogManager.get());
+    _catalogCache = stdx::make_unique<CatalogCache>();
     _shardRegistry = std::move(shardRegistry);
     _cursorManager = std::move(cursorManager);
 }