SERVER-34364 replace references to invariantOK with invariant

Author: benety

src/mongo/db/auth/action_set.cpp

@@ -97,7 +97,7 @@ Status ActionSet::parseActionSetFromString(const std::string& actionsString, Act
     splitStringDelim(actionsString, &actionsList, ',');
     std::vector<std::string> unrecognizedActions;
     Status status = parseActionSetFromStringVector(actionsList, result, &unrecognizedActions);
-    invariantOK(status);
+    invariant(status);
     if (unrecognizedActions.empty()) {
         return Status::OK();
     }
@@ -118,7 +118,7 @@ Status ActionSet::parseActionSetFromStringVector(const std::vector<std::string>&
         if (status == ErrorCodes::FailedToParse) {
             unrecognizedActions->push_back(actionsVector[i]);
         } else {
-            invariantOK(status);
+            invariant(status);
             if (action == ActionType::anyAction) {
                 result->addAllActions();
                 return Status::OK();

src/mongo/db/catalog/coll_mod.cpp

@@ -410,11 +410,11 @@ Status _collModInternal(OperationContext* opCtx,
 
     // The Validator, ValidationAction and ValidationLevel are already parsed and must be OK.
     if (!cmr.collValidator.eoo())
-        invariantOK(coll->setValidator(opCtx, cmr.collValidator.Obj()));
+        invariant(coll->setValidator(opCtx, cmr.collValidator.Obj()));
     if (!cmr.collValidationAction.empty())
-        invariantOK(coll->setValidationAction(opCtx, cmr.collValidationAction));
+        invariant(coll->setValidationAction(opCtx, cmr.collValidationAction));
     if (!cmr.collValidationLevel.empty())
-        invariantOK(coll->setValidationLevel(opCtx, cmr.collValidationLevel));
+        invariant(coll->setValidationLevel(opCtx, cmr.collValidationLevel));
 
     // UsePowerof2Sizes
     if (!cmr.usePowerOf2Sizes.eoo())

src/mongo/db/catalog/collection_impl.cpp

@@ -129,7 +129,7 @@ std::unique_ptr<CollatorInterface> parseCollation(OperationContext* opCtx,
               << collationSpec;
         fassertFailedNoTrace(40144);
     }
-    invariantOK(collator.getStatus());
+    invariant(collator.getStatus());
 
     return std::move(collator.getValue());
 }

src/mongo/db/catalog/index_catalog_entry_impl.cpp

@@ -120,7 +120,7 @@ IndexCatalogEntryImpl::IndexCatalogEntryImpl(IndexCatalogEntry* const this_,
             CollatorFactoryInterface::get(opCtx->getServiceContext())->makeFromBSON(collation);
 
         // Index spec should have already been validated.
-        invariantOK(statusWithCollator.getStatus());
+        invariant(statusWithCollator.getStatus());
 
         _collator = std::move(statusWithCollator.getValue());
     }
@@ -138,7 +138,7 @@ IndexCatalogEntryImpl::IndexCatalogEntryImpl(IndexCatalogEntry* const this_,
                                          std::move(expCtx),
                                          ExtensionsCallbackNoop(),
                                          MatchExpressionParser::kBanAllSpecialFeatures);
-        invariantOK(statusWithMatcher.getStatus());
+        invariant(statusWithMatcher.getStatus());
         _filterExpression = std::move(statusWithMatcher.getValue());
         LOG(2) << "have filter expression for " << _ns << " " << _descriptor->indexName() << " "
                << redact(filter);

src/mongo/db/commands/create_indexes.cpp

@@ -182,7 +182,7 @@ StatusWith<std::vector<BSONObj>> resolveCollectionDefaultProperties(
                                           ->makeFromBSON(collationElem.Obj());
                 // validateIndexSpecCollation() should have checked that the index collation spec is
                 // valid.
-                invariantOK(collatorStatus.getStatus());
+                invariant(collatorStatus.getStatus());
                 indexCollator = std::move(collatorStatus.getValue());
             }
             if (!CollatorInterface::collatorsMatch(collection->getDefaultCollator(),

src/mongo/db/commands/index_filter_commands.cpp

@@ -313,7 +313,7 @@ Status ClearFilters::clear(OperationContext* opCtx,
                                          expCtx,
                                          extensionsCallback,
                                          MatchExpressionParser::kAllowAllSpecialFeatures);
-        invariantOK(statusWithCQ.getStatus());
+        invariant(statusWithCQ.getStatus());
         std::unique_ptr<CanonicalQuery> cq = std::move(statusWithCQ.getValue());
 
         // Remove plan cache entry.

src/mongo/db/matcher/expression_text_noop.cpp

@@ -40,7 +40,7 @@ TextNoOpMatchExpression::TextNoOpMatchExpression(TextParams params)
     _ftsQuery.setLanguage(std::move(params.language));
     _ftsQuery.setCaseSensitive(params.caseSensitive);
     _ftsQuery.setDiacriticSensitive(params.diacriticSensitive);
-    invariantOK(_ftsQuery.parse(fts::TEXT_INDEX_VERSION_INVALID));
+    invariant(_ftsQuery.parse(fts::TEXT_INDEX_VERSION_INVALID));
 }
 
 std::unique_ptr<MatchExpression> TextNoOpMatchExpression::shallowClone() const {

src/mongo/db/matcher/expression_with_placeholder.cpp

@@ -118,7 +118,7 @@ void ExpressionWithPlaceholder::optimizeFilter() {
     _filter = MatchExpression::optimize(std::move(_filter));
 
     auto newPlaceholder = parseTopLevelFieldName(_filter.get());
-    invariantOK(newPlaceholder.getStatus());
+    invariant(newPlaceholder.getStatus());
 
     if (newPlaceholder.getValue()) {
         _placeholder = newPlaceholder.getValue()->toString();

src/mongo/db/matcher/extensions_callback.cpp

@@ -63,7 +63,7 @@ ExtensionsCallback::extractTextMatchExpressionParams(BSONElement text) {
     } else if (languageStatus == ErrorCodes::NoSuchKey) {
         params.language = std::string();
     } else {
-        invariantOK(languageStatus);
+        invariant(languageStatus);
         expectedFieldCount++;
     }
 
@@ -74,7 +74,7 @@ ExtensionsCallback::extractTextMatchExpressionParams(BSONElement text) {
     } else if (caseSensitiveStatus == ErrorCodes::NoSuchKey) {
         params.caseSensitive = TextMatchExpressionBase::kCaseSensitiveDefault;
     } else {
-        invariantOK(caseSensitiveStatus);
+        invariant(caseSensitiveStatus);
         expectedFieldCount++;
     }
 
@@ -85,7 +85,7 @@ ExtensionsCallback::extractTextMatchExpressionParams(BSONElement text) {
     } else if (diacriticSensitiveStatus == ErrorCodes::NoSuchKey) {
         params.diacriticSensitive = TextMatchExpressionBase::kDiacriticSensitiveDefault;
     } else {
-        invariantOK(diacriticSensitiveStatus);
+        invariant(diacriticSensitiveStatus);
         expectedFieldCount++;
     }
 

src/mongo/db/query/internal_plans.cpp

@@ -88,7 +88,7 @@ std::unique_ptr<PlanExecutor, PlanExecutor::Deleter> InternalPlanner::deleteWith
 
     auto executor =
         PlanExecutor::make(opCtx, std::move(ws), std::move(root), collection, yieldPolicy);
-    invariantOK(executor.getStatus());
+    invariant(executor.getStatus());
     return std::move(executor.getValue());
 }
 
@@ -117,7 +117,7 @@ std::unique_ptr<PlanExecutor, PlanExecutor::Deleter> InternalPlanner::indexScan(
 
     auto executor =
         PlanExecutor::make(opCtx, std::move(ws), std::move(root), collection, yieldPolicy);
-    invariantOK(executor.getStatus());
+    invariant(executor.getStatus());
     return std::move(executor.getValue());
 }
 
@@ -147,7 +147,7 @@ std::unique_ptr<PlanExecutor, PlanExecutor::Deleter> InternalPlanner::deleteWith
 
     auto executor =
         PlanExecutor::make(opCtx, std::move(ws), std::move(root), collection, yieldPolicy);
-    invariantOK(executor.getStatus());
+    invariant(executor.getStatus());
     return std::move(executor.getValue());
 }
 
@@ -166,7 +166,7 @@ std::unique_ptr<PlanExecutor, PlanExecutor::Deleter> InternalPlanner::updateWith
 
     auto executor =
         PlanExecutor::make(opCtx, std::move(ws), std::move(root), collection, yieldPolicy);
-    invariantOK(executor.getStatus());
+    invariant(executor.getStatus());
     return std::move(executor.getValue());
 }