Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 2 insertions, 127 deletions

diff --git a/src/mongo/dbtests/indexcatalogtests.cpp b/src/mongo/dbtests/indexcatalogtests.cpp
index d80fd3a471d..6e6da7e8c7a 100644
--- a/src/mongo/dbtests/indexcatalogtests.cpp
+++ b/src/mongo/dbtests/indexcatalogtests.cpp
@@ -90,8 +90,8 @@ public:
 
         ASSERT_TRUE(indexCatalog(&opCtx)->numIndexesReady(&opCtx) == numFinishedIndexesStart + 2);
 
-        auto ii =
-            indexCatalog(&opCtx)->getIndexIterator(&opCtx, IndexCatalog::InclusionPolicy::kReady);
+        std::unique_ptr<IndexCatalog::IndexIterator> ii =
+            indexCatalog(&opCtx)->getIndexIterator(&opCtx, false);
         int indexesIterated = 0;
         bool foundIndex = false;
         while (ii->more()) {
@@ -229,129 +229,6 @@ public:
     }
 };
 
-class PrepareUniqueIndexRecords : IndexCatalogTestBase {
-public:
-    ~PrepareUniqueIndexRecords() {
-        auto opCtx = cc().makeOperationContext();
-        AutoGetDb db{opCtx.get(), _nss.db(), LockMode::MODE_X};
-        WriteUnitOfWork wuow{opCtx.get()};
-        ASSERT_OK(db.getDb()->dropCollection(opCtx.get(), _nss));
-        wuow.commit();
-    }
-
-    void run() {
-        auto opCtx = cc().makeOperationContext();
-        dbtests::WriteContextForTests ctx{opCtx.get(), _nss.ns()};
-
-        ASSERT_OK(dbtests::createIndexFromSpec(
-            opCtx.get(),
-            _nss.ns(),
-            BSON(IndexDescriptor::kIndexVersionFieldName
-                 << static_cast<int>(kIndexVersion) << IndexDescriptor::kIndexNameFieldName << "a_1"
-                 << IndexDescriptor::kKeyPatternFieldName << BSON("a" << 1)
-                 << IndexDescriptor::kPrepareUniqueFieldName << true)));
-
-        AutoGetCollection coll{opCtx.get(), _nss, LockMode::MODE_X};
-        auto doc1 = BSON("_id" << 1 << "a" << 1);
-        auto doc2 = BSON("_id" << 2 << "a" << 1);
-
-        {
-            WriteUnitOfWork wuow{opCtx.get()};
-            ASSERT_OK(indexCatalog(opCtx.get())
-                          ->indexRecords(opCtx.get(), *coll, {{RecordId{1}, {}, &doc1}}, nullptr));
-            wuow.commit();
-        }
-
-        {
-            WriteUnitOfWork wuow{opCtx.get()};
-            ASSERT_NOT_OK(
-                indexCatalog(opCtx.get())
-                    ->indexRecords(opCtx.get(), *coll, {{RecordId{2}, {}, &doc2}}, nullptr));
-        }
-
-        opCtx->setEnforceConstraints(false);
-
-        {
-            WriteUnitOfWork wuow{opCtx.get()};
-            ASSERT_OK(indexCatalog(opCtx.get())
-                          ->indexRecords(opCtx.get(), *coll, {{RecordId{2}, {}, &doc2}}, nullptr));
-            wuow.commit();
-        }
-    }
-};
-
-class PrepareUniqueUpdateRecord : IndexCatalogTestBase {
-public:
-    ~PrepareUniqueUpdateRecord() {
-        auto opCtx = cc().makeOperationContext();
-        AutoGetDb db{opCtx.get(), _nss.db(), LockMode::MODE_X};
-        WriteUnitOfWork wuow{opCtx.get()};
-        ASSERT_OK(db.getDb()->dropCollection(opCtx.get(), _nss));
-        wuow.commit();
-    }
-
-    void run() {
-        auto opCtx = cc().makeOperationContext();
-        dbtests::WriteContextForTests ctx{opCtx.get(), _nss.ns()};
-
-        ASSERT_OK(dbtests::createIndexFromSpec(
-            opCtx.get(),
-            _nss.ns(),
-            BSON(IndexDescriptor::kIndexVersionFieldName
-                 << static_cast<int>(kIndexVersion) << IndexDescriptor::kIndexNameFieldName << "a_1"
-                 << IndexDescriptor::kKeyPatternFieldName << BSON("a" << 1)
-                 << IndexDescriptor::kPrepareUniqueFieldName << true)));
-
-        AutoGetCollection coll{opCtx.get(), _nss, LockMode::MODE_X};
-        auto doc1 = BSON("_id" << 1 << "a" << 1);
-        auto doc2 = BSON("_id" << 2 << "a" << 2);
-        auto updatedDoc2 = BSON("_id" << 2 << "a" << 1);
-
-        {
-            WriteUnitOfWork wuow{opCtx.get()};
-            ASSERT_OK(indexCatalog(opCtx.get())
-                          ->indexRecords(opCtx.get(),
-                                         *coll,
-                                         {{RecordId{1}, {}, &doc1}, {RecordId{2}, {}, &doc2}},
-                                         nullptr));
-            wuow.commit();
-        }
-
-        {
-            WriteUnitOfWork wuow{opCtx.get()};
-            int64_t keysInsertedOut, keysDeletedOut;
-            ASSERT_NOT_OK(indexCatalog(opCtx.get())
-                              ->updateRecord(opCtx.get(),
-                                             *coll,
-                                             doc2,
-                                             updatedDoc2,
-                                             RecordId{2},
-                                             &keysInsertedOut,
-                                             &keysDeletedOut));
-            ASSERT_EQ(keysInsertedOut, 0);
-            ASSERT_EQ(keysDeletedOut, 0);
-        }
-
-        opCtx->setEnforceConstraints(false);
-
-        {
-            WriteUnitOfWork wuow{opCtx.get()};
-            int64_t keysInsertedOut, keysDeletedOut;
-            ASSERT_OK(indexCatalog(opCtx.get())
-                          ->updateRecord(opCtx.get(),
-                                         *coll,
-                                         doc2,
-                                         updatedDoc2,
-                                         RecordId{2},
-                                         &keysInsertedOut,
-                                         &keysDeletedOut));
-            ASSERT_EQ(keysInsertedOut, 1);
-            ASSERT_EQ(keysDeletedOut, 1);
-            wuow.commit();
-        }
-    }
-};
-
 class IndexCatalogTests : public OldStyleSuiteSpecification {
 public:
     IndexCatalogTests() : OldStyleSuiteSpecification("indexcatalogtests") {}
@@ -359,8 +236,6 @@ public:
         add<IndexIteratorTests>();
         add<IndexCatalogEntryDroppedTest>();
         add<RefreshEntry>();
-        add<PrepareUniqueIndexRecords>();
-        add<PrepareUniqueUpdateRecord>();
     }
 };