diff options
Diffstat (limited to 'memfilepersistence/src/tests')
7 files changed, 30 insertions, 44 deletions
diff --git a/memfilepersistence/src/tests/device/devicemanagertest.cpp b/memfilepersistence/src/tests/device/devicemanagertest.cpp index eeb5007f452..7e26543349b 100644 --- a/memfilepersistence/src/tests/device/devicemanagertest.cpp +++ b/memfilepersistence/src/tests/device/devicemanagertest.cpp @@ -94,7 +94,7 @@ void DeviceManagerTest::testEventSending() DeviceManager manager(DeviceMapper::UP(new SimpleDeviceMapper), _clock); Listener l; manager.addIOEventListener(l); - Directory::LP dir(manager.getDirectory("/home/foo/var", 0)); + Directory::SP dir(manager.getDirectory("/home/foo/var", 0)); // IO failures are disk events. Will mark all partitions and // directories on that disk bad dir->addEvent(IOEvent::createEventFromErrno(1, EIO, "/home/foo/var/foo")); @@ -117,7 +117,7 @@ void DeviceManagerTest::testEventSending() void DeviceManagerTest::testXml() { DeviceManager manager(DeviceMapper::UP(new SimpleDeviceMapper), _clock); - Directory::LP dir(manager.getDirectory("/home/", 0)); + Directory::SP dir(manager.getDirectory("/home/", 0)); dir->getPartition().initializeMonitor(); std::string xml = manager.toXml(" "); CPPUNIT_ASSERT_MSG(xml, diff --git a/memfilepersistence/src/tests/device/devicestest.cpp b/memfilepersistence/src/tests/device/devicestest.cpp index bd6898cb7ac..8bcc93e5fc9 100644 --- a/memfilepersistence/src/tests/device/devicestest.cpp +++ b/memfilepersistence/src/tests/device/devicestest.cpp @@ -31,11 +31,11 @@ CPPUNIT_TEST_SUITE_REGISTRATION(DevicesTest); void DevicesTest::testDisk() { DeviceManager manager(DeviceMapper::UP(new SimpleDeviceMapper), _clock); - Disk::LP disk1(manager.getDisk("/something/on/disk")); - Disk::LP disk2(manager.getDisk("/something/on/disk")); + Disk::SP disk1(manager.getDisk("/something/on/disk")); + Disk::SP disk2(manager.getDisk("/something/on/disk")); CPPUNIT_ASSERT_EQUAL(disk1->getId(), disk2->getId()); CPPUNIT_ASSERT_EQUAL(disk1.get(), disk2.get()); - Disk::LP disk3(manager.getDisk("/something/on/disk2")); + Disk::SP disk3(manager.getDisk("/something/on/disk2")); CPPUNIT_ASSERT(disk2->getId() != disk3->getId()); disk3->toString(); // Add code coverage } @@ -43,7 +43,7 @@ void DevicesTest::testDisk() void DevicesTest::testPartition() { DeviceManager manager(DeviceMapper::UP(new SimpleDeviceMapper), _clock); - Partition::LP part(manager.getPartition("/etc")); + Partition::SP part(manager.getPartition("/etc")); CPPUNIT_ASSERT_EQUAL(std::string("/etc"), part->getMountPoint()); part->toString(); // Add code coverage } @@ -51,7 +51,7 @@ void DevicesTest::testPartition() void DevicesTest::testDirectory() { DeviceManager manager(DeviceMapper::UP(new SimpleDeviceMapper), _clock); - Directory::LP dir1(manager.getDirectory("/on/disk", 0)); + Directory::SP dir1(manager.getDirectory("/on/disk", 0)); CPPUNIT_ASSERT_EQUAL(std::string("/on/disk"), dir1->getPath()); CPPUNIT_ASSERT(dir1->getLastEvent() == 0); CPPUNIT_ASSERT_EQUAL(Device::OK, dir1->getState()); diff --git a/memfilepersistence/src/tests/device/mountpointlisttest.cpp b/memfilepersistence/src/tests/device/mountpointlisttest.cpp index 4cb5822ceb7..aaeff981af8 100644 --- a/memfilepersistence/src/tests/device/mountpointlisttest.cpp +++ b/memfilepersistence/src/tests/device/mountpointlisttest.cpp @@ -7,7 +7,6 @@ #include <vespa/vespalib/io/fileutil.h> #include <vespa/storageframework/defaultimplementation/clock/fakeclock.h> -using vespalib::LinkedPtr; using vespalib::fileExists; using vespalib::isDirectory; using vespalib::isSymLink; @@ -37,8 +36,8 @@ public: framework::defaultimplementation::FakeClock _clock; private: - LinkedPtr<DeviceManager> newDeviceManager() { - return LinkedPtr<DeviceManager>( + DeviceManager::UP newDeviceManager() { + return DeviceManager::UP( new DeviceManager( DeviceMapper::UP(new SimpleDeviceMapper), _clock)); @@ -88,7 +87,7 @@ void MountPointList_Test::testScanning() init(); MountPointList list(_prefix, std::vector<vespalib::string>(), - vespalib::LinkedPtr<DeviceManager>( + DeviceManager::UP( new DeviceManager( DeviceMapper::UP(new SimpleDeviceMapper), _clock))); @@ -133,7 +132,7 @@ void MountPointList_Test::testStatusFile() { MountPointList list(_prefix, std::vector<vespalib::string>(), - vespalib::LinkedPtr<DeviceManager>( + DeviceManager::UP( new DeviceManager( DeviceMapper::UP(new SimpleDeviceMapper), _clock))); @@ -195,7 +194,7 @@ void MountPointList_Test::testStatusFile() { MountPointList list(_prefix, std::vector<vespalib::string>(), - vespalib::LinkedPtr<DeviceManager>( + DeviceManager::UP( new DeviceManager( DeviceMapper::UP(new SimpleDeviceMapper), _clock))); diff --git a/memfilepersistence/src/tests/init/filescannertest.cpp b/memfilepersistence/src/tests/init/filescannertest.cpp index 8b49a21dad0..2a69804a295 100644 --- a/memfilepersistence/src/tests/init/filescannertest.cpp +++ b/memfilepersistence/src/tests/init/filescannertest.cpp @@ -375,7 +375,7 @@ FileScannerTest::runTest(const TestParameters& params) MountPointList mountPoints("./vdsroot", std::vector<vespalib::string>(), - vespalib::LinkedPtr<DeviceManager>( + DeviceManager::UP( new DeviceManager( DeviceMapper::UP(new SimpleDeviceMapper), clock))); diff --git a/memfilepersistence/src/tests/spi/iteratorhandlertest.cpp b/memfilepersistence/src/tests/spi/iteratorhandlertest.cpp index 5b622987e73..6fb2a8393be 100644 --- a/memfilepersistence/src/tests/spi/iteratorhandlertest.cpp +++ b/memfilepersistence/src/tests/spi/iteratorhandlertest.cpp @@ -63,7 +63,7 @@ public: struct Chunk { - std::vector<spi::DocEntry::LP> _entries; + std::vector<spi::DocEntry::UP> _entries; }; private: @@ -144,18 +144,12 @@ IteratorHandlerTest::doIterate(spi::IteratorId id, std::vector<Chunk> chunks; while (true) { - std::vector<spi::DocEntry::LP> entries; - spi::IterateResult result(getPersistenceProvider().iterate( id, maxByteSize, context)); CPPUNIT_ASSERT_EQUAL(spi::Result::NONE, result.getErrorCode()); CPPUNIT_ASSERT(result.getEntries().size() > 0 || allowEmptyResult); - for (size_t i = 0; i < result.getEntries().size(); ++i) { - entries.push_back(result.getEntries()[i]); - } - chunks.push_back(Chunk()); - chunks.back()._entries.swap(entries); + chunks.push_back(Chunk{std::move(result.steal_entries())}); if (result.isCompleted() || (maxChunks != 0 && chunks.size() >= maxChunks)) { @@ -178,7 +172,7 @@ getDocCount(const std::vector<IteratorHandlerTest::Chunk>& chunks) } size_t -getRemoveEntryCount(const std::vector<spi::DocEntry::LP>& entries) +getRemoveEntryCount(const std::vector<spi::DocEntry::UP>& entries) { size_t ret = 0; for (size_t i = 0; i < entries.size(); ++i) { @@ -191,20 +185,20 @@ getRemoveEntryCount(const std::vector<spi::DocEntry::LP>& entries) struct DocEntryIndirectTimestampComparator { - bool operator()(const spi::DocEntry::LP& e1, - const spi::DocEntry::LP& e2) const + bool operator()(const spi::DocEntry::UP& e1, + const spi::DocEntry::UP& e2) const { return e1->getTimestamp() < e2->getTimestamp(); } }; -std::vector<spi::DocEntry::LP> +std::vector<spi::DocEntry::UP> getEntriesFromChunks(const std::vector<IteratorHandlerTest::Chunk>& chunks) { - std::vector<spi::DocEntry::LP> ret; + std::vector<spi::DocEntry::UP> ret; for (size_t chunk = 0; chunk < chunks.size(); ++chunk) { for (size_t i = 0; i < chunks[chunk]._entries.size(); ++i) { - ret.push_back(chunks[chunk]._entries[i]); + ret.push_back(spi::DocEntry::UP(chunks[chunk]._entries[i]->clone())); } } std::sort(ret.begin(), @@ -233,7 +227,7 @@ IteratorHandlerTest::verifyDocs(const std::vector<DocAndTimestamp>& wanted, const std::vector<IteratorHandlerTest::Chunk>& chunks, const std::set<vespalib::string>& removes) const { - std::vector<spi::DocEntry::LP> retrieved( + std::vector<spi::DocEntry::UP> retrieved( getEntriesFromChunks(chunks)); size_t removeCount = getRemoveEntryCount(retrieved); // Ensure that we've got the correct number of puts and removes @@ -321,9 +315,7 @@ IteratorHandlerTest::testSomeSlotsRemovedBetweenInvocations() std::vector<Chunk> chunks2 = doIterate(iter.getIteratorId(), 10000); CPPUNIT_ASSERT_EQUAL(size_t(24), chunks2.size()); - std::copy(chunks2.begin(), - chunks2.end(), - std::back_insert_iterator<std::vector<Chunk> >(chunks)); + std::move(chunks2.begin(), chunks2.end(), std::back_inserter(chunks)); verifyDocs(docs, chunks); @@ -393,7 +385,7 @@ IteratorHandlerTest::testIterateMetadataOnly() create(b, sel, spi::NEWEST_DOCUMENT_OR_REMOVE, document::NoFields())); std::vector<Chunk> chunks = doIterate(iter.getIteratorId(), 4096); - std::vector<spi::DocEntry::LP> entries = getEntriesFromChunks(chunks); + std::vector<spi::DocEntry::UP> entries = getEntriesFromChunks(chunks); CPPUNIT_ASSERT_EQUAL(docs.size(), entries.size()); std::vector<DocAndTimestamp>::const_iterator docIter( docs.begin()); @@ -495,9 +487,7 @@ IteratorHandlerTest::testDocumentsRemovedBetweenInvocations() std::vector<Chunk> chunks2 = doIterate(iter.getIteratorId(), 1); CPPUNIT_ASSERT_EQUAL(size_t(75), chunks2.size()); - std::copy(chunks2.begin(), - chunks2.end(), - std::back_insert_iterator<std::vector<Chunk> >(chunks)); + std::move(chunks2.begin(), chunks2.end(), std::back_inserter(chunks)); verifyDocs(docs, chunks); @@ -539,7 +529,7 @@ IteratorHandlerTest::doTestUnrevertableRemoveBetweenInvocations(bool includeRemo flush(b.getBucketId()); std::vector<Chunk> chunks2 = doIterate(iter.getIteratorId(), 1); - std::vector<spi::DocEntry::LP> entries = getEntriesFromChunks(chunks2); + std::vector<spi::DocEntry::UP> entries = getEntriesFromChunks(chunks2); if (!includeRemoves) { CPPUNIT_ASSERT_EQUAL(nonRemovedDocs.size(), chunks2.size()); verifyDocs(nonRemovedDocs, chunks2); @@ -764,7 +754,7 @@ IteratorHandlerTest::testFieldSetFiltering() spi::CreateIteratorResult iter( create(b, sel, spi::NEWEST_DOCUMENT_ONLY, *repo.parse(*getTypeRepo(), "testdoctype1:hstringval,content"))); - std::vector<spi::DocEntry::LP> entries( + std::vector<spi::DocEntry::UP> entries( getEntriesFromChunks(doIterate(iter.getIteratorId(), 4096))); CPPUNIT_ASSERT_EQUAL(size_t(1), entries.size()); CPPUNIT_ASSERT_EQUAL(std::string("content: fancy content\n" diff --git a/memfilepersistence/src/tests/spi/simplememfileiobuffertest.cpp b/memfilepersistence/src/tests/spi/simplememfileiobuffertest.cpp index d7dc3354316..3eac7b57e81 100644 --- a/memfilepersistence/src/tests/spi/simplememfileiobuffertest.cpp +++ b/memfilepersistence/src/tests/spi/simplememfileiobuffertest.cpp @@ -31,13 +31,13 @@ class SimpleMemFileIOBufferTest : public SingleDiskMemFileTestUtils CPPUNIT_TEST_SUITE_END(); using BufferType = SimpleMemFileIOBuffer::BufferType; - using BufferLP = BufferType::LP; + using BufferSP = BufferType::SP; using BufferAllocation = SimpleMemFileIOBuffer::BufferAllocation; using HeaderChunkEncoder = SimpleMemFileIOBuffer::HeaderChunkEncoder; using SimpleMemFileIOBufferUP = std::unique_ptr<SimpleMemFileIOBuffer>; BufferAllocation allocateBuffer(size_t sz) { - return BufferAllocation(BufferLP(new BufferType(sz)), 0, sz); + return BufferAllocation(BufferSP(new BufferType(sz)), 0, sz); } /** diff --git a/memfilepersistence/src/tests/tools/vdsdisktooltest.cpp b/memfilepersistence/src/tests/tools/vdsdisktooltest.cpp index 29e780bc900..08bfa3bcab3 100644 --- a/memfilepersistence/src/tests/tools/vdsdisktooltest.cpp +++ b/memfilepersistence/src/tests/tools/vdsdisktooltest.cpp @@ -14,7 +14,6 @@ namespace memfile { struct VdsDiskToolTest : public SingleDiskMemFileTestUtils { framework::defaultimplementation::FakeClock _clock; - DeviceManager::LP _deviceManager; void setUp(); void setupRoot(); @@ -55,8 +54,6 @@ void VdsDiskToolTest::setUp() { system("rm -rf vdsroot"); - _deviceManager.reset(new DeviceManager( - DeviceMapper::UP(new SimpleDeviceMapper), _clock)); } void @@ -94,7 +91,7 @@ VdsDiskToolTest::testSimple() createDisk(1); MountPointList mountPoints("vdsroot/mycluster/storage/3", std::vector<vespalib::string>(), - _deviceManager); + std::make_unique<DeviceManager>(std::make_unique<SimpleDeviceMapper>(), _clock)); mountPoints.scanForDisks(); CPPUNIT_ASSERT_EQUAL(2u, mountPoints.getSize()); mountPoints[1].addEvent(Device::IO_FAILURE, "Bad", "Found in test"); |