1 files changed, 15 insertions, 16 deletions

diff --git a/src/mongo/dbtests/index_access_method_test.cpp b/src/mongo/dbtests/index_access_method_test.cpp
index 04015b6787a..e4e92f8d99d 100644
--- a/src/mongo/dbtests/index_access_method_test.cpp
+++ b/src/mongo/dbtests/index_access_method_test.cpp
@@ -40,7 +40,6 @@
 namespace mongo {
 
 namespace {
-using std::vector;
 
 KeyStringSet makeKeyStringSet(std::initializer_list<BSONObj> objs) {
     KeyStringSet keyStrings;
@@ -237,8 +236,8 @@ TEST(IndexAccessMethodInsertKeys, DuplicatesCheckingOnSecondaryUniqueIndexes) {
     AutoGetCollection autoColl(opCtx, nss, LockMode::MODE_X);
     const auto& coll = autoColl.getCollection();
     auto indexDescriptor = coll->getIndexCatalog()->findIndexByName(opCtx, indexName);
-    IndexAccessMethod* indexAccessMethod =
-        coll->getIndexCatalog()->getEntry(indexDescriptor)->accessMethod();
+    auto indexAccessMethod =
+        coll->getIndexCatalog()->getEntry(indexDescriptor)->accessMethod()->asSortedData();
 
     KeyString::HeapBuilder keyString1(
         KeyString::Version::kLatestVersion, BSON("" << 1), Ordering::make(BSONObj()), RecordId(1));
@@ -249,13 +248,13 @@ TEST(IndexAccessMethodInsertKeys, DuplicatesCheckingOnSecondaryUniqueIndexes) {
     int64_t numInserted;
 
     // Checks duplicates and returns the error code when constraints are enforced.
-    auto status = indexAccessMethod->insertKeys(opCtx, coll, keys, {}, options, {}, &numInserted);
+    auto status = indexAccessMethod->insertKeys(opCtx, coll, keys, options, {}, &numInserted);
     ASSERT_EQ(status.code(), ErrorCodes::DuplicateKey);
     ASSERT_EQ(numInserted, 0);
 
     // Skips the check on duplicates when constraints are not enforced.
     opCtx->setEnforceConstraints(false);
-    ASSERT_OK(indexAccessMethod->insertKeys(opCtx, coll, keys, {}, options, {}, &numInserted));
+    ASSERT_OK(indexAccessMethod->insertKeys(opCtx, coll, keys, options, {}, &numInserted));
     ASSERT_EQ(numInserted, 2);
 }
 
@@ -271,8 +270,8 @@ TEST(IndexAccessMethodInsertKeys, InsertWhenEnforcingDuplicateConstraints) {
     AutoGetCollection autoColl(opCtx, nss, LockMode::MODE_X);
     const auto& coll = autoColl.getCollection();
     auto indexDescriptor = coll->getIndexCatalog()->findIndexByName(opCtx, indexName);
-    IndexAccessMethod* indexAccessMethod =
-        coll->getIndexCatalog()->getEntry(indexDescriptor)->accessMethod();
+    auto indexAccessMethod =
+        coll->getIndexCatalog()->getEntry(indexDescriptor)->accessMethod()->asSortedData();
 
     KeyString::HeapBuilder keyString1(
         KeyString::Version::kLatestVersion, BSON("" << 1), Ordering::make(BSONObj()), RecordId(1));
@@ -286,18 +285,18 @@ TEST(IndexAccessMethodInsertKeys, InsertWhenEnforcingDuplicateConstraints) {
     int64_t numInserted;
 
     // Allows duplicates in a regular index.
-    ASSERT_OK(indexAccessMethod->insertKeys(opCtx, coll, keys1, {}, options, {}, &numInserted));
+    ASSERT_OK(indexAccessMethod->insertKeys(opCtx, coll, keys1, options, {}, &numInserted));
     ASSERT_EQ(numInserted, 2);
 
     // Enforces the duplicate constraint on the index and rejects duplicates when inserting.
     indexAccessMethod->setEnforceDuplicateConstraints(true);
-    auto status = indexAccessMethod->insertKeys(opCtx, coll, keys2, {}, options, {}, &numInserted);
+    auto status = indexAccessMethod->insertKeys(opCtx, coll, keys2, options, {}, &numInserted);
     ASSERT_EQ(status.code(), ErrorCodes::DuplicateKey);
     ASSERT_EQ(numInserted, 0);
 
     // Resets the duplicate constraint and accepts duplicates again.
     indexAccessMethod->setEnforceDuplicateConstraints(false);
-    ASSERT_OK(indexAccessMethod->insertKeys(opCtx, coll, keys2, {}, options, {}, &numInserted));
+    ASSERT_OK(indexAccessMethod->insertKeys(opCtx, coll, keys2, options, {}, &numInserted));
     ASSERT_EQ(numInserted, 1);
 }
 
@@ -313,8 +312,8 @@ TEST(IndexAccessMethodUpdateKeys, UpdateWhenEnforcingDuplicateConstraints) {
     AutoGetCollection autoColl(opCtx, nss, LockMode::MODE_X);
     const auto& coll = autoColl.getCollection();
     auto indexDescriptor = coll->getIndexCatalog()->findIndexByName(opCtx, indexName);
-    IndexAccessMethod* indexAccessMethod =
-        coll->getIndexCatalog()->getEntry(indexDescriptor)->accessMethod();
+    auto indexAccessMethod =
+        coll->getIndexCatalog()->getEntry(indexDescriptor)->accessMethod()->asSortedData();
 
     KeyString::HeapBuilder keyString1(
         KeyString::Version::kLatestVersion, BSON("" << 1), Ordering::make(BSONObj()), RecordId(1));
@@ -331,21 +330,21 @@ TEST(IndexAccessMethodUpdateKeys, UpdateWhenEnforcingDuplicateConstraints) {
     int64_t numDeleted;
 
     // Inserts two keys.
-    ASSERT_OK(indexAccessMethod->insertKeys(opCtx, coll, key1, {}, options, {}, &numInserted));
+    ASSERT_OK(indexAccessMethod->insertKeys(opCtx, coll, key1, options, {}, &numInserted));
     ASSERT_EQ(numInserted, 1);
-    ASSERT_OK(indexAccessMethod->insertKeys(opCtx, coll, key2_old, {}, options, {}, &numInserted));
+    ASSERT_OK(indexAccessMethod->insertKeys(opCtx, coll, key2_old, options, {}, &numInserted));
     ASSERT_EQ(numInserted, 1);
 
     // Enforces the duplicate constraint on the index and rejects duplicates when updating.
     indexAccessMethod->setEnforceDuplicateConstraints(true);
-    auto status = indexAccessMethod->update(opCtx, coll, ticket, &numInserted, &numDeleted);
+    auto status = indexAccessMethod->doUpdate(opCtx, coll, ticket, &numInserted, &numDeleted);
     ASSERT_EQ(status.code(), ErrorCodes::DuplicateKey);
     ASSERT_EQ(numInserted, 0);
     ASSERT_EQ(numDeleted, 0);
 
     // Resets the duplicate constraint and accepts duplicates again.
     indexAccessMethod->setEnforceDuplicateConstraints(false);
-    ASSERT_OK(indexAccessMethod->update(opCtx, coll, ticket, &numInserted, &numDeleted));
+    ASSERT_OK(indexAccessMethod->doUpdate(opCtx, coll, ticket, &numInserted, &numDeleted));
     ASSERT_EQ(numInserted, 1);
     ASSERT_EQ(numDeleted, 1);
 }