diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2020-09-25 13:30:19 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2020-09-25 13:30:19 +0200 |
commit | f8d5b66a8c3a474be1da3b1f4e782a883bbfd4ba (patch) | |
tree | fce4f021bd55e2ec8e3b8b4b01c5125d524ce058 /storage | |
parent | 7d67467f05753ad5fb3c72dd42ea66f6b44b1ca9 (diff) |
Style fixes for storage link setup.
Diffstat (limited to 'storage')
-rw-r--r-- | storage/src/vespa/storage/storageserver/servicelayernode.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/storage/src/vespa/storage/storageserver/servicelayernode.cpp b/storage/src/vespa/storage/storageserver/servicelayernode.cpp index 1b90e235d20..b64f6db60fc 100644 --- a/storage/src/vespa/storage/storageserver/servicelayernode.cpp +++ b/storage/src/vespa/storage/storageserver/servicelayernode.cpp @@ -227,29 +227,29 @@ ServiceLayerNode::createChain() StorageLink::UP chain; chain.reset(_communicationManager = new CommunicationManager(compReg, _configUri)); - chain->push_back(StorageLink::UP(new Bouncer(compReg, _configUri))); + chain->push_back(std::make_unique<Bouncer>(compReg, _configUri)); if (_noUsablePartitionMode) { /* * No usable partitions. Use minimal chain. Still needs to be * able to report state back to cluster controller. */ - chain->push_back(StorageLink::UP(releaseStateManager().release())); + chain->push_back(releaseStateManager()); return chain; } - chain->push_back(StorageLink::UP(new OpsLogger(compReg, _configUri))); + chain->push_back(std::make_unique<OpsLogger>(compReg, _configUri)); auto* merge_throttler = new MergeThrottler(_configUri, compReg); chain->push_back(StorageLink::UP(merge_throttler)); - chain->push_back(StorageLink::UP(new ChangedBucketOwnershipHandler(_configUri, compReg))); - chain->push_back(StorageLink::UP(new StorageBucketDBInitializer( - _configUri, _partitions, getDoneInitializeHandler(), compReg))); - chain->push_back(StorageLink::UP(new BucketManager(_configUri, _context.getComponentRegister()))); + chain->push_back(std::make_unique<ChangedBucketOwnershipHandler>(_configUri, compReg)); + chain->push_back(std::make_unique<StorageBucketDBInitializer>( + _configUri, _partitions, getDoneInitializeHandler(), compReg)); + chain->push_back(std::make_unique<BucketManager>(_configUri, _context.getComponentRegister())); chain->push_back(StorageLink::UP(new VisitorManager( _configUri, _context.getComponentRegister(), *this, _externalVisitors))); - chain->push_back(StorageLink::UP(new ModifiedBucketChecker( - _context.getComponentRegister(), _persistenceProvider, _configUri))); + chain->push_back(std::make_unique<ModifiedBucketChecker>( + _context.getComponentRegister(), _persistenceProvider, _configUri)); chain->push_back(StorageLink::UP(_fileStorManager = new FileStorManager( _configUri, _partitions, _persistenceProvider, _context.getComponentRegister()))); - chain->push_back(StorageLink::UP(releaseStateManager().release())); + chain->push_back(releaseStateManager()); // Lifetimes of all referenced components shall outlive the last call going // through the SPI, as queues are flushed and worker threads joined when |