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/metadata_loader.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/metadata_loader.cpp')
-rw-r--r-- | src/mongo/db/s/metadata_loader.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mongo/db/s/metadata_loader.cpp b/src/mongo/db/s/metadata_loader.cpp index e4d41dad429..f57fc35a2df 100644 --- a/src/mongo/db/s/metadata_loader.cpp +++ b/src/mongo/db/s/metadata_loader.cpp @@ -35,7 +35,7 @@ #include <vector> #include "mongo/db/s/collection_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/catalog/type_collection.h" #include "mongo/s/chunk_diff.h" @@ -93,25 +93,25 @@ MetadataLoader::MetadataLoader() = default; MetadataLoader::~MetadataLoader() = default; Status MetadataLoader::makeCollectionMetadata(OperationContext* txn, - CatalogManager* catalogManager, + ShardingCatalogClient* catalogClient, const string& ns, const string& shard, const CollectionMetadata* oldMetadata, CollectionMetadata* metadata) const { - Status status = _initCollection(txn, catalogManager, ns, shard, metadata); + Status status = _initCollection(txn, catalogClient, ns, shard, metadata); if (!status.isOK() || metadata->getKeyPattern().isEmpty()) { return status; } - return initChunks(txn, catalogManager, ns, shard, oldMetadata, metadata); + return initChunks(txn, catalogClient, ns, shard, oldMetadata, metadata); } Status MetadataLoader::_initCollection(OperationContext* txn, - CatalogManager* catalogManager, + ShardingCatalogClient* catalogClient, const string& ns, const string& shard, CollectionMetadata* metadata) const { - auto coll = catalogManager->getCollection(txn, ns); + auto coll = catalogClient->getCollection(txn, ns); if (!coll.isOK()) { return coll.getStatus(); } @@ -132,7 +132,7 @@ Status MetadataLoader::_initCollection(OperationContext* txn, } Status MetadataLoader::initChunks(OperationContext* txn, - CatalogManager* catalogManager, + ShardingCatalogClient* catalogClient, const string& ns, const string& shard, const CollectionMetadata* oldMetadata, @@ -179,7 +179,7 @@ Status MetadataLoader::initChunks(OperationContext* txn, try { std::vector<ChunkType> chunks; const auto diffQuery = differ.configDiffQuery(); - Status status = catalogManager->getChunks( + Status status = catalogClient->getChunks( txn, diffQuery.query, diffQuery.sort, boost::none, &chunks, nullptr); if (!status.isOK()) { if (status == ErrorCodes::HostUnreachable) { |