diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2018-01-24 08:39:12 -0500 |
|---|---|---|
| committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2018-01-29 13:43:56 -0500 |
| commit | 1162812624d110c52ac73a548f43b2d7f9ecf46c (patch) | |
| tree | 7fe0bcbd604e654302ca83be3484a30c99a0c0a5 /src/mongo/db/s/merge_chunks_command.cpp | |
| parent | 2487ab101a42434e1f61e68ee7c2383432861f8b (diff) | |
| download | mongo-1162812624d110c52ac73a548f43b2d7f9ecf46c.tar.gz | |
SERVER-32901 Consolidate sharding libraries
Also gets rid of most usages of the std::string variant of
CollectionShardingState::get.
Diffstat (limited to 'src/mongo/db/s/merge_chunks_command.cpp')
| -rw-r--r-- | src/mongo/db/s/merge_chunks_command.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/s/merge_chunks_command.cpp b/src/mongo/db/s/merge_chunks_command.cpp index da9755d5383..4e8c9c768e0 100644 --- a/src/mongo/db/s/merge_chunks_command.cpp +++ b/src/mongo/db/s/merge_chunks_command.cpp @@ -60,7 +60,7 @@ bool checkMetadataForSuccess(OperationContext* opCtx, const BSONObj& maxKey) { const auto metadataAfterMerge = [&] { AutoGetCollection autoColl(opCtx, nss, MODE_IS); - return CollectionShardingState::get(opCtx, nss.ns())->getMetadata(); + return CollectionShardingState::get(opCtx, nss)->getMetadata(); }(); uassert(ErrorCodes::StaleEpoch, @@ -115,7 +115,7 @@ Status mergeChunks(OperationContext* opCtx, const auto metadata = [&] { AutoGetCollection autoColl(opCtx, nss, MODE_IS); - return CollectionShardingState::get(opCtx, nss.ns())->getMetadata(); + return CollectionShardingState::get(opCtx, nss)->getMetadata(); }(); if (!metadata) { |