diff options
Diffstat (limited to 'searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp')
-rw-r--r-- | searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp index 2540a991015..a88b36ea489 100644 --- a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp +++ b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp @@ -404,8 +404,7 @@ public: void setPruneConfig(const DocumentDBPruneRemovedDocumentsConfig &pruneConfig) { - DocumentDBMaintenanceConfig::SP - newCfg(new DocumentDBMaintenanceConfig( + auto newCfg = std::make_shared<DocumentDBMaintenanceConfig>( pruneConfig, _mcCfg->getHeartBeatConfig(), _mcCfg->getSessionCachePruneInterval(), @@ -414,7 +413,7 @@ public: _mcCfg->getAttributeUsageFilterConfig(), _mcCfg->getAttributeUsageSampleInterval(), _mcCfg->getBlockableJobConfig(), - _mcCfg->getFlushConfig())); + _mcCfg->getFlushConfig()); _mcCfg = newCfg; forwardMaintenanceConfig(); } @@ -422,8 +421,7 @@ public: void setHeartBeatConfig(const DocumentDBHeartBeatConfig &heartBeatConfig) { - DocumentDBMaintenanceConfig::SP - newCfg(new DocumentDBMaintenanceConfig( + auto newCfg = std::make_shared<DocumentDBMaintenanceConfig>( _mcCfg->getPruneRemovedDocumentsConfig(), heartBeatConfig, _mcCfg->getSessionCachePruneInterval(), @@ -432,7 +430,7 @@ public: _mcCfg->getAttributeUsageFilterConfig(), _mcCfg->getAttributeUsageSampleInterval(), _mcCfg->getBlockableJobConfig(), - _mcCfg->getFlushConfig())); + _mcCfg->getFlushConfig()); _mcCfg = newCfg; forwardMaintenanceConfig(); } @@ -440,8 +438,7 @@ public: void setGroupingSessionPruneInterval(vespalib::duration groupingSessionPruneInterval) { - DocumentDBMaintenanceConfig::SP - newCfg(new DocumentDBMaintenanceConfig( + auto newCfg = std::make_shared<DocumentDBMaintenanceConfig>( _mcCfg->getPruneRemovedDocumentsConfig(), _mcCfg->getHeartBeatConfig(), groupingSessionPruneInterval, @@ -450,14 +447,13 @@ public: _mcCfg->getAttributeUsageFilterConfig(), _mcCfg->getAttributeUsageSampleInterval(), _mcCfg->getBlockableJobConfig(), - _mcCfg->getFlushConfig())); + _mcCfg->getFlushConfig()); _mcCfg = newCfg; forwardMaintenanceConfig(); } void setLidSpaceCompactionConfig(const DocumentDBLidSpaceCompactionConfig &cfg) { - DocumentDBMaintenanceConfig::SP - newCfg(new DocumentDBMaintenanceConfig( + auto newCfg = std::make_shared<DocumentDBMaintenanceConfig>( _mcCfg->getPruneRemovedDocumentsConfig(), _mcCfg->getHeartBeatConfig(), _mcCfg->getSessionCachePruneInterval(), @@ -466,21 +462,19 @@ public: _mcCfg->getAttributeUsageFilterConfig(), _mcCfg->getAttributeUsageSampleInterval(), _mcCfg->getBlockableJobConfig(), - _mcCfg->getFlushConfig())); + _mcCfg->getFlushConfig()); _mcCfg = newCfg; forwardMaintenanceConfig(); } void - performNotifyBucketStateChanged(document::BucketId bucketId, - BucketInfo::ActiveState newState) + performNotifyBucketStateChanged(document::BucketId bucketId, BucketInfo::ActiveState newState) { _bucketHandler.notifyBucketStateChanged(bucketId, newState); } void - notifyBucketStateChanged(const document::BucketId &bucketId, - BucketInfo::ActiveState newState) + notifyBucketStateChanged(const document::BucketId &bucketId, BucketInfo::ActiveState newState) { _executor.execute(makeTask(makeClosure(this, &MaintenanceControllerFixture:: @@ -494,7 +488,7 @@ public: MaintenanceDocumentSubDB MyDocumentSubDB::getSubDB() { - IDocumentRetriever::SP retriever(new MyDocumentRetriever(*this)); + auto retriever = std::make_shared<MyDocumentRetriever>(*this); return MaintenanceDocumentSubDB("my_sub_db", _subDBId, _metaStoreSP, |