SERVER-23750: remove init impl from header and add invariant checks

2 files changed, 10 insertions, 4 deletions

diff --git a/src/mongo/db/catalog/index_create.cpp b/src/mongo/db/catalog/index_create.cpp
index 2abcaf2c00e..fa206180e5f 100644
--- a/src/mongo/db/catalog/index_create.cpp
+++ b/src/mongo/db/catalog/index_create.cpp
@@ -143,6 +143,11 @@ void MultiIndexBlock::removeExistingIndexes(std::vector<BSONObj>* specs) const {
     }
 }
 
+Status MultiIndexBlock::init(const BSONObj& spec) {
+    const auto indexes = std::vector<BSONObj>(1, spec);
+    return init(indexes);
+}
+
 Status MultiIndexBlock::init(const std::vector<BSONObj>& indexSpecs) {
     WriteUnitOfWork wunit(_txn);
 
@@ -151,7 +156,10 @@ Status MultiIndexBlock::init(const std::vector<BSONObj>& indexSpecs) {
 
     const string& ns = _collection->ns().ns();
 
-    Status status = _collection->getIndexCatalog()->checkUnfinished();
+    const auto idxCat = _collection->getIndexCatalog();
+    invariant(idxCat);
+    invariant(idxCat->ok());
+    Status status = idxCat->checkUnfinished();
     if (!status.isOK())
         return status;
 
diff --git a/src/mongo/db/catalog/index_create.h b/src/mongo/db/catalog/index_create.h
index 084149529f1..e5f18a42ed3 100644
--- a/src/mongo/db/catalog/index_create.h
+++ b/src/mongo/db/catalog/index_create.h
@@ -113,9 +113,7 @@ public:
      * Requires holding an exclusive database lock.
      */
     Status init(const std::vector<BSONObj>& specs);
-    Status init(const BSONObj& spec) {
-        return init(std::vector<BSONObj>(1, spec));
-    }
+    Status init(const BSONObj& spec);
 
     /**
      * Inserts all documents in the Collection into the indexes and logs with timing info.