diff options
author | Spencer T Brody <spencer@mongodb.com> | 2016-05-31 11:14:24 -0400 |
---|---|---|
committer | Spencer T Brody <spencer@mongodb.com> | 2016-06-13 18:26:51 -0400 |
commit | 7899a8e8a62548fb7a149649082bc34bbc001dc2 (patch) | |
tree | 537c418fcd35755518d2f359401ddc644c925454 /src/mongo/s/grid.cpp | |
parent | 710159c9602a6738e6455cfb26bc2d70a0454ae2 (diff) | |
download | mongo-7899a8e8a62548fb7a149649082bc34bbc001dc2.tar.gz |
SERVER-24323 Rename CatalogManager to ShardingCatalogClient
Renames the relevant classes and libraries, moves files, updates comments referencing the
CatalogManager, and renames common methods for getting the catalogManager (like
grid.catalogManager()). No functional changes.
Diffstat (limited to 'src/mongo/s/grid.cpp')
-rw-r--r-- | src/mongo/s/grid.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/s/grid.cpp b/src/mongo/s/grid.cpp index 0f102def839..d4a6a827af5 100644 --- a/src/mongo/s/grid.cpp +++ b/src/mongo/s/grid.cpp @@ -37,7 +37,7 @@ #include "mongo/executor/task_executor_pool.h" #include "mongo/s/balancer/balancer_configuration.h" #include "mongo/s/catalog/catalog_cache.h" -#include "mongo/s/catalog/catalog_manager.h" +#include "mongo/s/catalog/sharding_catalog_client.h" #include "mongo/s/client/shard_factory.h" #include "mongo/s/client/shard_registry.h" #include "mongo/s/query/cluster_cursor_manager.h" @@ -57,14 +57,14 @@ Grid* Grid::get(OperationContext* operationContext) { return &grid; } -void Grid::init(std::unique_ptr<CatalogManager> catalogManager, +void Grid::init(std::unique_ptr<ShardingCatalogClient> catalogClient, std::unique_ptr<CatalogCache> catalogCache, std::unique_ptr<ShardRegistry> shardRegistry, std::unique_ptr<ClusterCursorManager> cursorManager, std::unique_ptr<BalancerConfiguration> balancerConfig, std::unique_ptr<executor::TaskExecutorPool> executorPool, executor::NetworkInterface* network) { - invariant(!_catalogManager); + invariant(!_catalogClient); invariant(!_catalogCache); invariant(!_shardRegistry); invariant(!_cursorManager); @@ -72,7 +72,7 @@ void Grid::init(std::unique_ptr<CatalogManager> catalogManager, invariant(!_executorPool); invariant(!_network); - _catalogManager = std::move(catalogManager); + _catalogClient = std::move(catalogClient); _catalogCache = std::move(catalogCache); _shardRegistry = std::move(shardRegistry); _cursorManager = std::move(cursorManager); @@ -108,7 +108,7 @@ void Grid::advanceConfigOpTime(repl::OpTime opTime) { } void Grid::clearForUnitTests() { - _catalogManager.reset(); + _catalogClient.reset(); _catalogCache.reset(); _shardRegistry.reset(); _cursorManager.reset(); |