diff options
| author | Daniel Solnik <dan.solnik@Daniels-MacBook-Pro-3.local> | 2019-06-07 13:04:20 -0400 |
|---|---|---|
| committer | Daniel Solnik <dansolnik@gmail.com> | 2019-06-28 10:00:57 -0400 |
| commit | 00d0b83b4e0940acf5aeb4496101f71a6be02d17 (patch) | |
| tree | a223019c3d3b2e94e60e6c2091b0593c66d58fd9 /src/mongo/db/cloner.cpp | |
| parent | 460636ded3d52532033660c34134ca3b2f283c7e (diff) | |
| download | mongo-00d0b83b4e0940acf5aeb4496101f71a6be02d17.tar.gz | |
SERVER-38796 Refactor CollectionOptions::parse to be static
Diffstat (limited to 'src/mongo/db/cloner.cpp')
| -rw-r--r-- | src/mongo/db/cloner.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/mongo/db/cloner.cpp b/src/mongo/db/cloner.cpp index dfb39dcfbc6..f2d86cd8f64 100644 --- a/src/mongo/db/cloner.cpp +++ b/src/mongo/db/cloner.cpp @@ -156,8 +156,7 @@ struct Cloner::Fun { WriteUnitOfWork wunit(opCtx); const bool createDefaultIndexes = true; - CollectionOptions collectionOptions; - uassertStatusOK(collectionOptions.parse( + CollectionOptions collectionOptions = uassertStatusOK(CollectionOptions::parse( from_options, CollectionOptions::ParseKind::parseForCommand)); auto indexSpec = fixIndexSpec(to_collection.db().toString(), from_id_index); invariant( @@ -372,9 +371,8 @@ void Cloner::copyIndexes(OperationContext* opCtx, opCtx->checkForInterrupt(); WriteUnitOfWork wunit(opCtx); - CollectionOptions collectionOptions; - uassertStatusOK( - collectionOptions.parse(from_opts, CollectionOptions::ParseKind::parseForCommand)); + CollectionOptions collectionOptions = uassertStatusOK( + CollectionOptions::parse(from_opts, CollectionOptions::ParseKind::parseForCommand)); const bool createDefaultIndexes = true; invariant(db->userCreateNS(opCtx, to_collection, @@ -492,8 +490,8 @@ bool Cloner::copyCollection(OperationContext* opCtx, opCtx->checkForInterrupt(); WriteUnitOfWork wunit(opCtx); - CollectionOptions collectionOptions; - uassertStatusOK(collectionOptions.parse(options, optionsParser)); + CollectionOptions collectionOptions = + uassertStatusOK(CollectionOptions::parse(options, optionsParser)); const bool createDefaultIndexes = true; Status status = db->userCreateNS(opCtx, nss, collectionOptions, createDefaultIndexes, idIndexSpec); @@ -539,10 +537,10 @@ StatusWith<std::vector<BSONObj>> Cloner::filterCollectionsForClone( BSONElement collectionOptions = collection["options"]; if (collectionOptions.isABSONObj()) { - auto parseOptionsStatus = CollectionOptions().parse( + auto statusWithCollectionOptions = CollectionOptions::parse( collectionOptions.Obj(), CollectionOptions::ParseKind::parseForCommand); - if (!parseOptionsStatus.isOK()) { - return parseOptionsStatus; + if (!statusWithCollectionOptions.isOK()) { + return statusWithCollectionOptions.getStatus(); } } @@ -644,8 +642,7 @@ Status Cloner::createCollectionsForDb( const bool createDefaultIndexes = true; auto options = optionsBuilder.obj(); - CollectionOptions collectionOptions; - uassertStatusOK(collectionOptions.parse( + CollectionOptions collectionOptions = uassertStatusOK(CollectionOptions::parse( options, CollectionOptions::ParseKind::parseForStorage)); auto indexSpec = fixIndexSpec(nss.db().toString(), params.idIndexSpec); Status createStatus = db->userCreateNS( |