diff options
| author | Louis Williams <louis.williams@mongodb.com> | 2019-09-05 15:44:10 +0000 |
|---|---|---|
| committer | evergreen <evergreen@mongodb.com> | 2019-09-05 15:44:10 +0000 |
| commit | 352bebddcf6200927fed414e2ef1416fe835af65 (patch) | |
| tree | 6c3f34616269984fa558fe438f36da90cd3933b5 /src/mongo/db/storage/sorted_data_interface_test_dupkeycheck.cpp | |
| parent | 59079867e7bba25e1201f50d6e470d7157825f84 (diff) | |
| download | mongo-352bebddcf6200927fed414e2ef1416fe835af65.tar.gz | |
SERVER-43054 Remove RecordId argument from insert and unindex functions on SortedDataInterface
Diffstat (limited to 'src/mongo/db/storage/sorted_data_interface_test_dupkeycheck.cpp')
| -rw-r--r-- | src/mongo/db/storage/sorted_data_interface_test_dupkeycheck.cpp | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/src/mongo/db/storage/sorted_data_interface_test_dupkeycheck.cpp b/src/mongo/db/storage/sorted_data_interface_test_dupkeycheck.cpp index 3e5634eabf4..c7d503b50d4 100644 --- a/src/mongo/db/storage/sorted_data_interface_test_dupkeycheck.cpp +++ b/src/mongo/db/storage/sorted_data_interface_test_dupkeycheck.cpp @@ -54,8 +54,7 @@ TEST(SortedDataInterface, DupKeyCheckAfterInsert) { const ServiceContext::UniqueOperationContext opCtx(harnessHelper->newOperationContext()); { WriteUnitOfWork uow(opCtx.get()); - ASSERT_OK( - sorted->insert(opCtx.get(), makeKeyString(sorted.get(), key1, loc1), loc1, false)); + ASSERT_OK(sorted->insert(opCtx.get(), makeKeyString(sorted.get(), key1, loc1), false)); uow.commit(); } } @@ -95,7 +94,7 @@ TEST(SortedDataInterface, DupKeyCheckAfterInsertKeyString) { const ServiceContext::UniqueOperationContext opCtx(harnessHelper->newOperationContext()); { WriteUnitOfWork uow(opCtx.get()); - ASSERT_OK(sorted->insert(opCtx.get(), keyString1, loc1, false)); + ASSERT_OK(sorted->insert(opCtx.get(), keyString1, false)); uow.commit(); } } @@ -165,8 +164,7 @@ TEST(SortedDataInterface, DupKeyCheckWhenDiskLocBefore) { const ServiceContext::UniqueOperationContext opCtx(harnessHelper->newOperationContext()); { WriteUnitOfWork uow(opCtx.get()); - ASSERT_OK( - sorted->insert(opCtx.get(), makeKeyString(sorted.get(), key1, loc1), loc1, true)); + ASSERT_OK(sorted->insert(opCtx.get(), makeKeyString(sorted.get(), key1, loc1), true)); uow.commit(); } } @@ -202,8 +200,7 @@ TEST(SortedDataInterface, DupKeyCheckWhenDiskLocAfter) { const ServiceContext::UniqueOperationContext opCtx(harnessHelper->newOperationContext()); { WriteUnitOfWork uow(opCtx.get()); - ASSERT_OK( - sorted->insert(opCtx.get(), makeKeyString(sorted.get(), key1, loc1), loc1, true)); + ASSERT_OK(sorted->insert(opCtx.get(), makeKeyString(sorted.get(), key1, loc1), true)); uow.commit(); } } @@ -233,8 +230,8 @@ TEST(SortedDataInterface, DupKeyCheckWithDuplicates) { ASSERT(sorted->isEmpty(opCtx.get())); WriteUnitOfWork uow(opCtx.get()); - ASSERT_OK(sorted->insert(opCtx.get(), makeKeyString(sorted.get(), key1, loc1), loc1, true)); - ASSERT_OK(sorted->insert(opCtx.get(), makeKeyString(sorted.get(), key1, loc2), loc2, true)); + ASSERT_OK(sorted->insert(opCtx.get(), makeKeyString(sorted.get(), key1, loc1), true)); + ASSERT_OK(sorted->insert(opCtx.get(), makeKeyString(sorted.get(), key1, loc2), true)); uow.commit(); } @@ -259,8 +256,8 @@ TEST(SortedDataInterface, DupKeyCheckWithDuplicateKeyStrings) { ASSERT(sorted->isEmpty(opCtx.get())); WriteUnitOfWork uow(opCtx.get()); - ASSERT_OK(sorted->insert(opCtx.get(), keyString1, loc1, true)); - ASSERT_OK(sorted->insert(opCtx.get(), keyString2, loc2, true)); + ASSERT_OK(sorted->insert(opCtx.get(), keyString1, true)); + ASSERT_OK(sorted->insert(opCtx.get(), keyString2, true)); uow.commit(); } @@ -281,15 +278,15 @@ TEST(SortedDataInterface, DupKeyCheckWithDeletedFirstEntry) { ASSERT(sorted->isEmpty(opCtx.get())); WriteUnitOfWork uow(opCtx.get()); - ASSERT_OK(sorted->insert(opCtx.get(), makeKeyString(sorted.get(), key1, loc1), loc1, true)); - ASSERT_OK(sorted->insert(opCtx.get(), makeKeyString(sorted.get(), key1, loc2), loc2, true)); + ASSERT_OK(sorted->insert(opCtx.get(), makeKeyString(sorted.get(), key1, loc1), true)); + ASSERT_OK(sorted->insert(opCtx.get(), makeKeyString(sorted.get(), key1, loc2), true)); uow.commit(); } { const ServiceContext::UniqueOperationContext opCtx(harnessHelper->newOperationContext()); WriteUnitOfWork uow(opCtx.get()); - sorted->unindex(opCtx.get(), makeKeyString(sorted.get(), key1, loc1), loc1, true); + sorted->unindex(opCtx.get(), makeKeyString(sorted.get(), key1, loc1), true); uow.commit(); } @@ -310,15 +307,15 @@ TEST(SortedDataInterface, DupKeyCheckWithDeletedSecondEntry) { ASSERT(sorted->isEmpty(opCtx.get())); WriteUnitOfWork uow(opCtx.get()); - ASSERT_OK(sorted->insert(opCtx.get(), makeKeyString(sorted.get(), key1, loc1), loc1, true)); - ASSERT_OK(sorted->insert(opCtx.get(), makeKeyString(sorted.get(), key1, loc2), loc2, true)); + ASSERT_OK(sorted->insert(opCtx.get(), makeKeyString(sorted.get(), key1, loc1), true)); + ASSERT_OK(sorted->insert(opCtx.get(), makeKeyString(sorted.get(), key1, loc2), true)); uow.commit(); } { const ServiceContext::UniqueOperationContext opCtx(harnessHelper->newOperationContext()); WriteUnitOfWork uow(opCtx.get()); - sorted->unindex(opCtx.get(), makeKeyString(sorted.get(), key1, loc2), loc2, true); + sorted->unindex(opCtx.get(), makeKeyString(sorted.get(), key1, loc2), true); uow.commit(); } { |