diff options
Diffstat (limited to 'src/mongo/db/catalog/coll_mod.cpp')
| -rw-r--r-- | src/mongo/db/catalog/coll_mod.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/mongo/db/catalog/coll_mod.cpp b/src/mongo/db/catalog/coll_mod.cpp index 747de3e044a..670dae8ef09 100644 --- a/src/mongo/db/catalog/coll_mod.cpp +++ b/src/mongo/db/catalog/coll_mod.cpp @@ -303,23 +303,22 @@ StatusWith<ParsedCollModRequest> parseCollModRequest(OperationContext* opCtx, auto indexObjForOplog = indexObj; if (cmdIndex.getUnique()) { - // Disallow one-step unique convertion. The user has to set - // 'prepareUnique' to true first. - if (!cmrIndex->idx->prepareUnique()) { - return Status(ErrorCodes::InvalidOptions, - "Cannot make index unique with 'prepareUnique=false'. " - "Run collMod to set it first."); - } - cmr.numModifications++; if (bool unique = *cmdIndex.getUnique(); !unique) { return Status(ErrorCodes::BadValue, "'Unique: false' option is not supported"); } - // Attempting to converting a unique index should be treated as a no-op. + // Attempting to convert a unique index should be treated as a no-op. if (cmrIndex->idx->unique()) { indexObjForOplog = indexObjForOplog.removeField(CollModIndex::kUniqueFieldName); } else { + // Disallow one-step unique convertion. The user has to set + // 'prepareUnique' to true first. + if (!cmrIndex->idx->prepareUnique()) { + return Status(ErrorCodes::InvalidOptions, + "Cannot make index unique with 'prepareUnique=false'. " + "Run collMod to set it first."); + } cmrIndex->indexUnique = true; } } |