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/db/s/sharding_state.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/db/s/sharding_state.cpp')
-rw-r--r-- | src/mongo/db/s/sharding_state.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/s/sharding_state.cpp b/src/mongo/db/s/sharding_state.cpp index 124629899c4..715fd1ffa02 100644 --- a/src/mongo/db/s/sharding_state.cpp +++ b/src/mongo/db/s/sharding_state.cpp @@ -52,7 +52,7 @@ #include "mongo/db/s/type_shard_identity.h" #include "mongo/executor/task_executor_pool.h" #include "mongo/rpc/metadata/config_server_metadata.h" -#include "mongo/s/catalog/catalog_manager.h" +#include "mongo/s/catalog/sharding_catalog_client.h" #include "mongo/s/catalog/type_chunk.h" #include "mongo/s/chunk_version.h" #include "mongo/s/client/shard_registry.h" @@ -211,7 +211,7 @@ void ShardingState::shutDown(OperationContext* txn) { if (_getInitializationState() == InitializationState::kInitialized) { grid.getExecutorPool()->shutdownAndJoin(); - grid.catalogManager(txn)->shutDown(txn); + grid.catalogClient(txn)->shutDown(txn); } } @@ -698,7 +698,7 @@ Status ShardingState::_refreshMetadata(OperationContext* txn, { Status status = mdLoader.makeCollectionMetadata(txn, - grid.catalogManager(txn), + grid.catalogClient(txn), ns, getShardName(), fullReload ? nullptr : beforeMetadata.get(), |