diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-08-20 14:47:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-20 14:47:39 +0200 |
commit | 2d68435a3261b3a70c472ab5138d39a5074cf9d5 (patch) | |
tree | a02190d11c90148a44c41964d412abbabed1d3d9 /storage/src/tests/persistence/filestorage/operationabortingtest.cpp | |
parent | b214393ad98132794d6c7a09f00599541c6ed372 (diff) |
Revert "Revert "Balder/use an actual fieldset repo""
Diffstat (limited to 'storage/src/tests/persistence/filestorage/operationabortingtest.cpp')
-rw-r--r-- | storage/src/tests/persistence/filestorage/operationabortingtest.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/storage/src/tests/persistence/filestorage/operationabortingtest.cpp b/storage/src/tests/persistence/filestorage/operationabortingtest.cpp index 93c484368de..7810a595012 100644 --- a/storage/src/tests/persistence/filestorage/operationabortingtest.cpp +++ b/storage/src/tests/persistence/filestorage/operationabortingtest.cpp @@ -77,18 +77,19 @@ spi::LoadType defaultLoadType(0, "default"); } struct OperationAbortingTest : FileStorTestFixture { - spi::PersistenceProvider::UP _dummyProvider; - BlockingMockProvider* _blockingProvider; + std::unique_ptr<spi::dummy::DummyPersistence> _dummyProvider; + BlockingMockProvider * _blockingProvider; std::unique_ptr<vespalib::Barrier> _queueBarrier; std::unique_ptr<vespalib::Barrier> _completionBarrier; void setupProviderAndBarriers(uint32_t queueBarrierThreads) { FileStorTestFixture::setupPersistenceThreads(1); - _dummyProvider.reset(new spi::dummy::DummyPersistence(_node->getTypeRepo(), 1)); - _queueBarrier.reset(new vespalib::Barrier(queueBarrierThreads)); - _completionBarrier.reset(new vespalib::Barrier(2)); - _blockingProvider = new BlockingMockProvider(*_dummyProvider, *_queueBarrier, *_completionBarrier); - _node->setPersistenceProvider(spi::PersistenceProvider::UP(_blockingProvider)); + _dummyProvider = std::make_unique<spi::dummy::DummyPersistence>(_node->getTypeRepo(), 1); + _queueBarrier = std::make_unique<vespalib::Barrier>(queueBarrierThreads); + _completionBarrier = std::make_unique<vespalib::Barrier>(2); + auto blockingProvider = std::make_unique<BlockingMockProvider>(*_dummyProvider, *_queueBarrier, *_completionBarrier); + _blockingProvider = blockingProvider.get(); + _node->setPersistenceProvider(std::move(blockingProvider)); } void validateReplies(DummyStorageLink& link, size_t repliesTotal, |