diff options
| author | Sam Rossi <sam.rossi@mongodb.com> | 2016-09-29 18:03:12 -0400 |
|---|---|---|
| committer | Sam Rossi <sam.rossi@mongodb.com> | 2016-10-04 16:34:21 -0400 |
| commit | 32e57b5547d8bb1ee9693f043130af62beac4a96 (patch) | |
| tree | 02c6afdddefb2106466214325c3bef7b5796ae87 /src/mongo/db/storage/kv/kv_engine_test_harness.cpp | |
| parent | 5221b639ad5012de9cc671a962248b15f6d89971 (diff) | |
| download | mongo-32e57b5547d8bb1ee9693f043130af62beac4a96.tar.gz | |
SERVER-26434 Change `KVEngine::getRecordStore` to return a unique pointer
Diffstat (limited to 'src/mongo/db/storage/kv/kv_engine_test_harness.cpp')
| -rw-r--r-- | src/mongo/db/storage/kv/kv_engine_test_harness.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mongo/db/storage/kv/kv_engine_test_harness.cpp b/src/mongo/db/storage/kv/kv_engine_test_harness.cpp index 98f00ff1d07..a7e169a4610 100644 --- a/src/mongo/db/storage/kv/kv_engine_test_harness.cpp +++ b/src/mongo/db/storage/kv/kv_engine_test_harness.cpp @@ -63,7 +63,7 @@ TEST(KVEngineTestHarness, SimpleRS1) { { MyOperationContext opCtx(engine); ASSERT_OK(engine->createRecordStore(&opCtx, ns, ns, CollectionOptions())); - rs.reset(engine->getRecordStore(&opCtx, ns, ns, CollectionOptions())); + rs = engine->getRecordStore(&opCtx, ns, ns, CollectionOptions()); ASSERT(rs); } @@ -105,7 +105,7 @@ TEST(KVEngineTestHarness, Restart1) { { MyOperationContext opCtx(engine); ASSERT_OK(engine->createRecordStore(&opCtx, ns, ns, CollectionOptions())); - rs.reset(engine->getRecordStore(&opCtx, ns, ns, CollectionOptions())); + rs = engine->getRecordStore(&opCtx, ns, ns, CollectionOptions()); ASSERT(rs); } @@ -129,7 +129,7 @@ TEST(KVEngineTestHarness, Restart1) { { unique_ptr<RecordStore> rs; MyOperationContext opCtx(engine); - rs.reset(engine->getRecordStore(&opCtx, ns, ns, CollectionOptions())); + rs = engine->getRecordStore(&opCtx, ns, ns, CollectionOptions()); ASSERT_EQUALS(string("abc"), rs->dataFor(&opCtx, loc).data()); } } @@ -173,7 +173,7 @@ TEST(KVCatalogTest, Coll1) { MyOperationContext opCtx(engine); WriteUnitOfWork uow(&opCtx); ASSERT_OK(engine->createRecordStore(&opCtx, "catalog", "catalog", CollectionOptions())); - rs.reset(engine->getRecordStore(&opCtx, "catalog", "catalog", CollectionOptions())); + rs = engine->getRecordStore(&opCtx, "catalog", "catalog", CollectionOptions()); catalog.reset(new KVCatalog(rs.get(), true, false, false)); uow.commit(); } @@ -217,7 +217,7 @@ TEST(KVCatalogTest, Idx1) { MyOperationContext opCtx(engine); WriteUnitOfWork uow(&opCtx); ASSERT_OK(engine->createRecordStore(&opCtx, "catalog", "catalog", CollectionOptions())); - rs.reset(engine->getRecordStore(&opCtx, "catalog", "catalog", CollectionOptions())); + rs = engine->getRecordStore(&opCtx, "catalog", "catalog", CollectionOptions()); catalog.reset(new KVCatalog(rs.get(), true, false, false)); uow.commit(); } @@ -290,7 +290,7 @@ TEST(KVCatalogTest, DirectoryPerDb1) { MyOperationContext opCtx(engine); WriteUnitOfWork uow(&opCtx); ASSERT_OK(engine->createRecordStore(&opCtx, "catalog", "catalog", CollectionOptions())); - rs.reset(engine->getRecordStore(&opCtx, "catalog", "catalog", CollectionOptions())); + rs = engine->getRecordStore(&opCtx, "catalog", "catalog", CollectionOptions()); catalog.reset(new KVCatalog(rs.get(), true, true, false)); uow.commit(); } @@ -332,7 +332,7 @@ TEST(KVCatalogTest, Split1) { MyOperationContext opCtx(engine); WriteUnitOfWork uow(&opCtx); ASSERT_OK(engine->createRecordStore(&opCtx, "catalog", "catalog", CollectionOptions())); - rs.reset(engine->getRecordStore(&opCtx, "catalog", "catalog", CollectionOptions())); + rs = engine->getRecordStore(&opCtx, "catalog", "catalog", CollectionOptions()); catalog.reset(new KVCatalog(rs.get(), true, false, true)); uow.commit(); } @@ -374,7 +374,7 @@ TEST(KVCatalogTest, DirectoryPerAndSplit1) { MyOperationContext opCtx(engine); WriteUnitOfWork uow(&opCtx); ASSERT_OK(engine->createRecordStore(&opCtx, "catalog", "catalog", CollectionOptions())); - rs.reset(engine->getRecordStore(&opCtx, "catalog", "catalog", CollectionOptions())); + rs = engine->getRecordStore(&opCtx, "catalog", "catalog", CollectionOptions()); catalog.reset(new KVCatalog(rs.get(), true, true, true)); uow.commit(); } |