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/client/shard_registry.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/client/shard_registry.cpp')
-rw-r--r-- | src/mongo/s/client/shard_registry.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mongo/s/client/shard_registry.cpp b/src/mongo/s/client/shard_registry.cpp index 11f0e7e7c2c..34307cd1fe2 100644 --- a/src/mongo/s/client/shard_registry.cpp +++ b/src/mongo/s/client/shard_registry.cpp @@ -38,8 +38,7 @@ #include "mongo/bson/util/bson_extract.h" #include "mongo/client/connection_string.h" #include "mongo/client/replica_set_monitor.h" -#include "mongo/s/catalog/catalog_manager.h" -#include "mongo/s/catalog/type_config_version.h" +#include "mongo/s/catalog/sharding_catalog_client.h" #include "mongo/s/catalog/type_shard.h" #include "mongo/s/client/shard.h" #include "mongo/s/client/shard_connection.h" @@ -200,7 +199,7 @@ ShardRegistryData::ShardRegistryData(OperationContext* txn, ShardFactory* shardF } void ShardRegistryData::_init(OperationContext* txn, ShardFactory* shardFactory) { - auto shardsStatus = grid.catalogManager(txn)->getAllShards(txn); + auto shardsStatus = grid.catalogClient(txn)->getAllShards(txn); if (!shardsStatus.isOK()) { uasserted(shardsStatus.getStatus().code(), |