SERVER-37643 replace MultiIndexBlock reference in test with IndexCatalog::createIndexOnEmptyCollection

Author: benety

src/mongo/db/catalog/SConscript

@@ -477,7 +477,6 @@ env.CppUnitTest(
     ],
     LIBDEPS=[
         'catalog_helpers',
-        'multi_index_block',
         '$BUILD_DIR/mongo/db/auth/authmocks',
         '$BUILD_DIR/mongo/db/db_raii',
         '$BUILD_DIR/mongo/db/namespace_string',

src/mongo/db/catalog/rename_collection_test.cpp

@@ -37,12 +37,13 @@
 #include "mongo/db/catalog/collection_catalog_entry.h"
 #include "mongo/db/catalog/collection_options.h"
 #include "mongo/db/catalog/database_holder.h"
-#include "mongo/db/catalog/multi_index_block.h"
+#include "mongo/db/catalog/index_catalog.h"
 #include "mongo/db/catalog/rename_collection.h"
 #include "mongo/db/catalog/uuid_catalog.h"
 #include "mongo/db/client.h"
 #include "mongo/db/concurrency/write_conflict_exception.h"
 #include "mongo/db/db_raii.h"
+#include "mongo/db/index/index_descriptor.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/op_observer.h"
@@ -399,15 +400,15 @@ bool _isTempCollection(OperationContext* opCtx, const NamespaceString& nss) {
 }
 
 /**
- * Creates an index using the given index name with a bogus key spec.
+ * Creates an index on an empty collection using the given index name with a bogus key spec.
  */
-void _createIndex(OperationContext* opCtx,
-                  const NamespaceString& nss,
-                  const std::string& indexName) {
-    writeConflictRetry(opCtx, "_createIndex", nss.ns(), [=] {
+void _createIndexOnEmptyCollection(OperationContext* opCtx,
+                                   const NamespaceString& nss,
+                                   const std::string& indexName) {
+    writeConflictRetry(opCtx, "_createIndexOnEmptyCollection", nss.ns(), [=] {
         AutoGetCollection autoColl(opCtx, nss, MODE_X);
         auto collection = autoColl.getCollection();
-        ASSERT_TRUE(collection) << "Cannot create index in collection " << nss
+        ASSERT_TRUE(collection) << "Cannot create index on empty collection " << nss
                                 << " because collection " << nss.ns() << " does not exist.";
 
         auto indexInfoObj = BSON(
@@ -416,10 +417,9 @@ void _createIndex(OperationContext* opCtx,
                 << "ns"
                 << nss.ns());
 
-        MultiIndexBlock indexer(opCtx, collection);
-        ASSERT_OK(indexer.init(indexInfoObj).getStatus());
+        auto indexCatalog = collection->getIndexCatalog();
         WriteUnitOfWork wuow(opCtx);
-        ASSERT_OK(indexer.commit());
+        ASSERT_OK(indexCatalog->createIndexOnEmptyCollection(opCtx, indexInfoObj).getStatus());
         wuow.commit();
     });
 
@@ -503,7 +503,7 @@ TEST_F(RenameCollectionTest, LongIndexNameAllowedForTargetCollection) {
 
     _createCollection(_opCtx.get(), _sourceNss);
     const std::string indexName(longestIndexNameAllowedForSource, 'a');
-    _createIndex(_opCtx.get(), _sourceNss, indexName);
+    _createIndexOnEmptyCollection(_opCtx.get(), _sourceNss, indexName);
     ASSERT_OK(renameCollection(_opCtx.get(), _sourceNss, _targetNssDifferentDb, {}));
 }
 
@@ -522,7 +522,7 @@ TEST_F(RenameCollectionTest, LongIndexNameAllowedForTemporaryCollectionForRename
 
     _createCollection(_opCtx.get(), _sourceNss);
     const std::string indexName(longestIndexNameAllowedForTarget, 'a');
-    _createIndex(_opCtx.get(), _sourceNss, indexName);
+    _createIndexOnEmptyCollection(_opCtx.get(), _sourceNss, indexName);
     ASSERT_OK(renameCollection(_opCtx.get(), _sourceNss, _targetNssDifferentDb, {}));
 }
 
@@ -1005,7 +1005,7 @@ void _testRenameCollectionAcrossDatabaseOplogEntries(
     const std::vector<std::string>& expectedOplogEntries) {
     ASSERT_NOT_EQUALS(sourceNss.db(), targetNss.db());
     _createCollection(opCtx, sourceNss);
-    _createIndex(opCtx, sourceNss, "a_1");
+    _createIndexOnEmptyCollection(opCtx, sourceNss, "a_1");
     _insertDocument(opCtx, sourceNss, BSON("_id" << 0));
     oplogEntries->clear();
     if (forApplyOps) {
@@ -1091,7 +1091,7 @@ TEST_F(RenameCollectionTest,
 
 TEST_F(RenameCollectionTest, RenameCollectionAcrossDatabaseDropsTemporaryCollectionOnException) {
     _createCollection(_opCtx.get(), _sourceNss);
-    _createIndex(_opCtx.get(), _sourceNss, "a_1");
+    _createIndexOnEmptyCollection(_opCtx.get(), _sourceNss, "a_1");
     _insertDocument(_opCtx.get(), _sourceNss, BSON("_id" << 0));
     _opObserver->onInsertsThrows = true;
     _opObserver->oplogEntries.clear();

src/mongo/db/repl/SConscript

@@ -277,7 +277,6 @@ env.CppUnitTest(
         'replmocks',
         'storage_interface_impl',
         '$BUILD_DIR/mongo/db/auth/authmocks',
-        '$BUILD_DIR/mongo/db/catalog/multi_index_block',
         '$BUILD_DIR/mongo/db/service_context_d_test_fixture',
     ],
 )
@@ -587,7 +586,6 @@ env.CppUnitTest(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/auth/authmocks',
-        '$BUILD_DIR/mongo/db/catalog/multi_index_block',
         'oplog_interface_local',
         'rollback_test_fixture',
         'rs_rollback',

src/mongo/db/repl/rs_rollback_test.cpp

@@ -39,7 +39,6 @@
 #include "mongo/db/catalog/database_holder.h"
 #include "mongo/db/catalog/drop_indexes.h"
 #include "mongo/db/catalog/index_catalog.h"
-#include "mongo/db/catalog/multi_index_block.h"
 #include "mongo/db/catalog/uuid_catalog.h"
 #include "mongo/db/client.h"
 #include "mongo/db/concurrency/d_concurrency.h"
@@ -169,20 +168,17 @@ OplogInterfaceMock::Operation makeOpAndRecordId(long long seconds, long long has
     return std::make_pair(makeOp(seconds, hash), RecordId(++recordId));
 }
 
-// Create an index on the given collection. Returns the number of indexes that exist on the
+// Create an index on an empty collection. Returns the number of indexes that exist on the
 // collection after the given index is created.
-int createIndexForColl(OperationContext* opCtx,
-                       Collection* coll,
-                       NamespaceString nss,
-                       BSONObj indexSpec) {
+int _createIndexOnEmptyCollection(OperationContext* opCtx,
+                                  Collection* coll,
+                                  NamespaceString nss,
+                                  BSONObj indexSpec) {
     Lock::DBLock dbLock(opCtx, nss.db(), MODE_X);
-    MultiIndexBlock indexer(opCtx, coll);
-    ASSERT_OK(indexer.init(indexSpec).getStatus());
+    auto indexCatalog = coll->getIndexCatalog();
     WriteUnitOfWork wunit(opCtx);
-    ASSERT_OK(indexer.commit());
+    ASSERT_OK(indexCatalog->createIndexOnEmptyCollection(opCtx, indexSpec).getStatus());
     wunit.commit();
-    auto indexCatalog = coll->getIndexCatalog();
-    ASSERT(indexCatalog);
     return indexCatalog->numIndexesReady(opCtx);
 }
 
@@ -481,7 +477,7 @@ TEST_F(RSRollbackTest, RollbackCreateIndexCommand) {
                                << "name"
                                << "a_1");
 
-    int numIndexes = createIndexForColl(_opCtx.get(), collection, nss, indexSpec);
+    int numIndexes = _createIndexOnEmptyCollection(_opCtx.get(), collection, nss, indexSpec);
     ASSERT_EQUALS(2, numIndexes);
 
     auto commonOperation = makeOpAndRecordId(1, 1);
@@ -679,7 +675,7 @@ TEST_F(RSRollbackTest, RollingBackCreateIndexAndRenameWithLongName) {
                                << "name"
                                << longName);
 
-    int numIndexes = createIndexForColl(_opCtx.get(), collection, nss, indexSpec);
+    int numIndexes = _createIndexOnEmptyCollection(_opCtx.get(), collection, nss, indexSpec);
     ASSERT_EQUALS(2, numIndexes);
 
     auto commonOperation = makeOpAndRecordId(1, 1);
@@ -734,7 +730,7 @@ TEST_F(RSRollbackTest, RollingBackDropAndCreateOfSameIndexNameWithDifferentSpecs
                                << "name"
                                << "a_1");
 
-    int numIndexes = createIndexForColl(_opCtx.get(), collection, nss, indexSpec);
+    int numIndexes = _createIndexOnEmptyCollection(_opCtx.get(), collection, nss, indexSpec);
     ASSERT_EQUALS(2, numIndexes);
 
     auto commonOperation = makeOpAndRecordId(1, 1);
@@ -862,7 +858,7 @@ TEST_F(RSRollbackTest, RollbackDropIndexOnCollectionWithTwoExistingIndexes) {
 
     // Create the necessary indexes. Index 0 is created and dropped in the sequence of ops that will
     // be rolled back, so we only create index 1.
-    int numIndexes = createIndexForColl(_opCtx.get(), coll, nss, idxSpec(nss, "1"));
+    int numIndexes = _createIndexOnEmptyCollection(_opCtx.get(), coll, nss, idxSpec(nss, "1"));
     ASSERT_EQUALS(2, numIndexes);
 
     auto commonOp = makeOpAndRecordId(1, 1);
@@ -929,9 +925,9 @@ TEST_F(RSRollbackTest, RollbackMultipleCreateIndexesOnSameCollection) {
     auto commonOp = makeOpAndRecordId(1, 1);
 
     // Create all of the necessary indexes.
-    createIndexForColl(_opCtx.get(), coll, nss, idxSpec(nss, "0"));
-    createIndexForColl(_opCtx.get(), coll, nss, idxSpec(nss, "1"));
-    createIndexForColl(_opCtx.get(), coll, nss, idxSpec(nss, "2"));
+    _createIndexOnEmptyCollection(_opCtx.get(), coll, nss, idxSpec(nss, "0"));
+    _createIndexOnEmptyCollection(_opCtx.get(), coll, nss, idxSpec(nss, "1"));
+    _createIndexOnEmptyCollection(_opCtx.get(), coll, nss, idxSpec(nss, "2"));
     ASSERT_EQUALS(4, numIndexesOnColl(_opCtx.get(), nss, coll));
 
     // The ops that will be rolled back.
@@ -969,7 +965,7 @@ TEST_F(RSRollbackTest, RollbackCreateDropRecreateIndexOnCollection) {
                                << "name"
                                << idxName("0"));
 
-    int numIndexes = createIndexForColl(_opCtx.get(), coll, nss, indexSpec);
+    int numIndexes = _createIndexOnEmptyCollection(_opCtx.get(), coll, nss, indexSpec);
     ASSERT_EQUALS(2, numIndexes);
 
     auto commonOp = makeOpAndRecordId(1, 1);

src/mongo/db/repl/storage_interface_impl_test.cpp

@@ -39,11 +39,12 @@
 #include "mongo/db/catalog/collection_options.h"
 #include "mongo/db/catalog/database.h"
 #include "mongo/db/catalog/document_validation.h"
-#include "mongo/db/catalog/multi_index_block.h"
+#include "mongo/db/catalog/index_catalog.h"
 #include "mongo/db/client.h"
 #include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/concurrency/write_conflict_exception.h"
 #include "mongo/db/db_raii.h"
+#include "mongo/db/index/index_access_method.h"
 #include "mongo/db/index/index_descriptor.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/operation_context.h"
@@ -129,23 +130,21 @@ void createCollection(OperationContext* opCtx,
 }
 
 /**
- * Create an index on the given collection. Returns the number of indexes that exist on the
+ * Create an index on an empty collection. Returns the number of indexes that exist on the
  * collection after the given index is created.
  */
-int createIndexForColl(OperationContext* opCtx, NamespaceString nss, BSONObj indexSpec) {
+int _createIndexOnEmptyCollection(OperationContext* opCtx, NamespaceString nss, BSONObj indexSpec) {
     Lock::DBLock dbLock(opCtx, nss.db(), MODE_X);
     AutoGetCollection autoColl(opCtx, nss, MODE_X);
     auto coll = autoColl.getCollection();
 
-    MultiIndexBlock indexer(opCtx, coll);
-    ASSERT_OK(indexer.init(indexSpec).getStatus());
+    auto indexCatalog = coll->getIndexCatalog();
+    ASSERT(indexCatalog);
 
     WriteUnitOfWork wunit(opCtx);
-    ASSERT_OK(indexer.commit());
+    ASSERT_OK(indexCatalog->createIndexOnEmptyCollection(opCtx, indexSpec).getStatus());
     wunit.commit();
 
-    auto indexCatalog = coll->getIndexCatalog();
-    ASSERT(indexCatalog);
     return indexCatalog->numIndexesReady(opCtx);
 }
 
@@ -2687,7 +2686,7 @@ TEST_F(StorageInterfaceImplTest, SetIndexIsMultikeySucceeds) {
     auto indexSpec =
         BSON("name" << indexName << "ns" << nss.ns() << "key" << BSON("a.b" << 1) << "v"
                     << static_cast<int>(kIndexVersion));
-    ASSERT_EQUALS(createIndexForColl(opCtx, nss, indexSpec), 2);
+    ASSERT_EQUALS(_createIndexOnEmptyCollection(opCtx, nss, indexSpec), 2);
 
     MultikeyPaths paths = {{1}};
     ASSERT_OK(storage.setIndexIsMultikey(opCtx, nss, indexName, paths, Timestamp(3, 3)));