diff options
| author | Haavard <havardpe@yahoo-inc.com> | 2017-03-20 13:04:33 +0000 |
|---|---|---|
| committer | Haavard <havardpe@yahoo-inc.com> | 2017-03-27 09:53:26 +0000 |
| commit | 23abed1a0bc4f4c5ea47b43fc7ea0645e63a26e6 (patch) | |
| tree | 6d943bbe31738f7e9b84979e4fd63dfd76eef580 /storage/src/tests/persistence | |
| parent | 8844ccb7297e8a5120dd903c85e923f2f93aa693 (diff) | |
remove most usage of LinkedPtr from vespa
Diffstat (limited to 'storage/src/tests/persistence')
| -rw-r--r-- | storage/src/tests/persistence/persistencetestutils.cpp | 2 | ||||
| -rw-r--r-- | storage/src/tests/persistence/persistencetestutils.h | 2 | ||||
| -rw-r--r-- | storage/src/tests/persistence/splitbitdetectortest.cpp | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/storage/src/tests/persistence/persistencetestutils.cpp b/storage/src/tests/persistence/persistencetestutils.cpp index e6a401548aa..faaaaac178d 100644 --- a/storage/src/tests/persistence/persistencetestutils.cpp +++ b/storage/src/tests/persistence/persistencetestutils.cpp @@ -55,7 +55,7 @@ PersistenceTestEnvironment::PersistenceTestEnvironment(DiskCount numDisks, const _node.getComponentRegister(), 255, 0)); for (uint32_t i = 0; i < numDisks; i++) { _diskEnvs.push_back( - vespalib::LinkedPtr<PersistenceUtil>( + std::unique_ptr<PersistenceUtil>( new PersistenceUtil( _config.getConfigId(), _node.getComponentRegister(), diff --git a/storage/src/tests/persistence/persistencetestutils.h b/storage/src/tests/persistence/persistencetestutils.h index 4f6c6ba3bbb..4a51faafe05 100644 --- a/storage/src/tests/persistence/persistencetestutils.h +++ b/storage/src/tests/persistence/persistencetestutils.h @@ -32,7 +32,7 @@ struct PersistenceTestEnvironment { StorageComponent _component; FileStorMetrics _metrics; std::unique_ptr<FileStorHandler> _handler; - std::vector<vespalib::LinkedPtr<PersistenceUtil> > _diskEnvs; + std::vector<std::unique_ptr<PersistenceUtil> > _diskEnvs; }; class PersistenceTestUtils : public CppUnit::TestFixture { diff --git a/storage/src/tests/persistence/splitbitdetectortest.cpp b/storage/src/tests/persistence/splitbitdetectortest.cpp index cdec8e3e3f6..65ea629ad81 100644 --- a/storage/src/tests/persistence/splitbitdetectortest.cpp +++ b/storage/src/tests/persistence/splitbitdetectortest.cpp @@ -28,14 +28,14 @@ struct SplitBitDetectorTest : public CppUnit::TestFixture { void testZeroDocLimitFallbacksToOneBitIncreaseOnGidCollision(); void findBucketCollisionIds(); - spi::DocEntry::LP + spi::DocEntry::UP generateDocEntry(uint32_t userId, uint32_t docNum, spi::Timestamp timestamp) { std::ostringstream ost; ost << "id:storage_test:testdoctype1:n=" << userId << ":" << docNum; - return spi::DocEntry::LP(new spi::DocEntry( + return spi::DocEntry::UP(new spi::DocEntry( timestamp, 0, document::DocumentId(ost.str()))); }; @@ -68,7 +68,7 @@ SplitBitDetectorTest::testTwoUsers() provider.createBucket(bucket, context); - std::vector<spi::DocEntry::LP> entries; + std::vector<spi::DocEntry::UP> entries; for (uint32_t i = 0; i < 5; ++i) { document::Document::SP doc( testDocMan.createRandomDocumentAtLocation(1, i, 1, 1)); @@ -102,7 +102,7 @@ SplitBitDetectorTest::testSingleUser() provider.createBucket(bucket, context); - std::vector<spi::DocEntry::LP> entries; + std::vector<spi::DocEntry::UP> entries; for (uint32_t i = 0; i < 10; ++i) { document::Document::SP doc( testDocMan.createRandomDocumentAtLocation(1, i, 1, 1)); @@ -131,7 +131,7 @@ SplitBitDetectorTest::testMaxBits() provider.createBucket(bucket, context); - std::vector<spi::DocEntry::LP> entries; + std::vector<spi::DocEntry::UP> entries; for (uint32_t seed = 0; seed < 10; ++seed) { int location = 1; document::Document::SP doc(testDocMan.createRandomDocumentAtLocation( @@ -160,7 +160,7 @@ SplitBitDetectorTest::testMaxBitsOneBelowMax() provider.createBucket(bucket, context); - std::vector<spi::DocEntry::LP> entries; + std::vector<spi::DocEntry::UP> entries; for (uint32_t seed = 0; seed < 10; ++seed) { int location = 1 | (seed % 2 == 0 ? 0x8000 : 0); document::Document::SP doc(testDocMan.createRandomDocumentAtLocation( @@ -198,7 +198,7 @@ SplitBitDetectorTest::testUnsplittable() provider.createBucket(bucket, context); - std::vector<spi::DocEntry::LP> entries; + std::vector<spi::DocEntry::UP> entries; for (uint32_t i = 0; i < 10; ++i) { document::Document::SP doc( @@ -227,7 +227,7 @@ SplitBitDetectorTest::testUnsplittableMinCount() provider.createBucket(bucket, context); - std::vector<spi::DocEntry::LP> entries; + std::vector<spi::DocEntry::UP> entries; for (uint32_t i = 0; i < 10; ++i) { document::Document::SP doc( |