diff options
Diffstat (limited to 'storage/src/tests/common')
-rw-r--r-- | storage/src/tests/common/metricstest.cpp | 5 | ||||
-rw-r--r-- | storage/src/tests/common/teststorageapp.cpp | 6 | ||||
-rw-r--r-- | storage/src/tests/common/teststorageapp.h | 2 |
3 files changed, 1 insertions, 12 deletions
diff --git a/storage/src/tests/common/metricstest.cpp b/storage/src/tests/common/metricstest.cpp index 2c09b2974e5..f816816a051 100644 --- a/storage/src/tests/common/metricstest.cpp +++ b/storage/src/tests/common/metricstest.cpp @@ -80,8 +80,7 @@ void MetricsTest::SetUp() { } catch (config::InvalidConfigException& e) { fprintf(stderr, "%s\n", e.what()); } - _metricManager = std::make_unique<metrics::MetricManager>( - std::make_unique<MetricClock>(*_clock)); + _metricManager = std::make_unique<metrics::MetricManager>(std::make_unique<MetricClock>(*_clock)); _topSet.reset(new metrics::MetricSet("vds", {}, "")); { metrics::MetricLockGuard guard(_metricManager->getMetricLock()); @@ -93,8 +92,6 @@ void MetricsTest::SetUp() { *_metricManager, "status"); - documentapi::LoadTypeSet::SP loadTypes(_node->getLoadTypes()); - _filestorMetrics = std::make_shared<FileStorMetrics>(); _filestorMetrics->initDiskMetrics(1, 1); _topSet->registerMetric(*_filestorMetrics); diff --git a/storage/src/tests/common/teststorageapp.cpp b/storage/src/tests/common/teststorageapp.cpp index e904f690bde..b6acff804a8 100644 --- a/storage/src/tests/common/teststorageapp.cpp +++ b/storage/src/tests/common/teststorageapp.cpp @@ -47,7 +47,6 @@ TestStorageApp::TestStorageApp(StorageComponentRegisterImpl::UP compReg, vespalib::string clusterName = "mycluster"; uint32_t redundancy = 2; uint32_t nodeCount = 10; - documentapi::LoadTypeSet::SP loadTypes; if (!configId.empty()) { config::ConfigUri uri(configId); std::unique_ptr<vespa::config::content::core::StorServerConfig> serverConfig = config::ConfigGetter<vespa::config::content::core::StorServerConfig>::getConfig(uri.getConfigId(), uri.getContext()); @@ -58,12 +57,8 @@ TestStorageApp::TestStorageApp(StorageComponentRegisterImpl::UP compReg, _compReg.setPriorityConfig( *config::ConfigGetter<StorageComponent::PriorityConfig> ::getConfig(uri.getConfigId(), uri.getContext())); - loadTypes = std::make_shared<documentapi::LoadTypeSet>( - *config::ConfigGetter<vespa::config::content::LoadTypeConfig> - ::getConfig(uri.getConfigId(), uri.getContext())); } else { if (index == 0xffff) index = 0; - loadTypes.reset(new documentapi::LoadTypeSet); } if (index >= nodeCount) nodeCount = index + 1; if (redundancy > nodeCount) redundancy = nodeCount; @@ -71,7 +66,6 @@ TestStorageApp::TestStorageApp(StorageComponentRegisterImpl::UP compReg, _compReg.setNodeInfo(clusterName, type, index); _compReg.setNodeStateUpdater(_nodeStateUpdater); _compReg.setDocumentTypeRepo(_docMan.getTypeRepoSP()); - _compReg.setLoadTypes(loadTypes); _compReg.setBucketIdFactory(document::BucketIdFactory()); auto distr = std::make_shared<lib::Distribution>( lib::Distribution::getDefaultDistributionConfig(redundancy, nodeCount)); diff --git a/storage/src/tests/common/teststorageapp.h b/storage/src/tests/common/teststorageapp.h index dffe1da7a9a..376b1afd9c6 100644 --- a/storage/src/tests/common/teststorageapp.h +++ b/storage/src/tests/common/teststorageapp.h @@ -81,8 +81,6 @@ public: const document::BucketIdFactory& getBucketIdFactory() { return _compReg.getBucketIdFactory(); } TestNodeStateUpdater& getStateUpdater() { return _nodeStateUpdater; } - documentapi::LoadTypeSet::SP getLoadTypes() - { return _compReg.getLoadTypes(); } lib::Distribution::SP getDistribution() { return _compReg.getDistribution(); } TestNodeStateUpdater& getNodeStateUpdater() { return _nodeStateUpdater; } |