diff options
Diffstat (limited to 'storage/src')
21 files changed, 34 insertions, 43 deletions
diff --git a/storage/src/tests/bucketdb/bucketmanagertest.cpp b/storage/src/tests/bucketdb/bucketmanagertest.cpp index bb72887f69b..7491a3aae1d 100644 --- a/storage/src/tests/bucketdb/bucketmanagertest.cpp +++ b/storage/src/tests/bucketdb/bucketmanagertest.cpp @@ -156,7 +156,7 @@ void BucketManagerTest::setupTestEnvironment(bool fakePersistenceLayer, _node->setTypeRepo(repo); _node->setupDummyPersistence(); // Set up the 3 links - auto manager = std::make_unique<BucketManager>(config.getConfigId(), _node->getComponentRegister()); + auto manager = std::make_unique<BucketManager>(config::ConfigUri(config.getConfigId()), _node->getComponentRegister()); _manager = manager.get(); _top->push_back(std::move(manager)); if (fakePersistenceLayer) { @@ -165,8 +165,8 @@ void BucketManagerTest::setupTestEnvironment(bool fakePersistenceLayer, _top->push_back(std::move(bottom)); } else { auto bottom = std::make_unique<FileStorManager>( - config.getConfigId(), - _node->getPersistenceProvider(), _node->getComponentRegister(), *_node, _node->get_host_info()); + config::ConfigUri(config.getConfigId()), + _node->getPersistenceProvider(), _node->getComponentRegister(), *_node, _node->get_host_info()); _top->push_back(std::move(bottom)); } // Generate a doc to use for testing.. diff --git a/storage/src/tests/common/metricstest.cpp b/storage/src/tests/common/metricstest.cpp index 9c63f05b453..d2a4f994bda 100644 --- a/storage/src/tests/common/metricstest.cpp +++ b/storage/src/tests/common/metricstest.cpp @@ -103,7 +103,7 @@ void MetricsTest::SetUp() { _visitorMetrics = std::make_shared<VisitorMetrics>(); _visitorMetrics->initThreads(4); _topSet->registerMetric(*_visitorMetrics); - _metricManager->init(_config->getConfigId(), _node->getThreadPool()); + _metricManager->init(config::ConfigUri(_config->getConfigId()), _node->getThreadPool()); } void MetricsTest::TearDown() { diff --git a/storage/src/tests/frameworkimpl/status/statustest.cpp b/storage/src/tests/frameworkimpl/status/statustest.cpp index 97bfa41aece..77d23314221 100644 --- a/storage/src/tests/frameworkimpl/status/statustest.cpp +++ b/storage/src/tests/frameworkimpl/status/statustest.cpp @@ -108,7 +108,7 @@ TEST_F(StatusTest, index_status_page) { "barid", "Bar impl", "<p>info</p>")); StatusWebServer webServer(_node->getComponentRegister(), _node->getComponentRegister(), - "raw:httpport 0"); + config::ConfigUri("raw:httpport 0")); auto actual = fetch(webServer.getListenPort(), "/"); std::string expected( "HTTP\\/1.1 200 OK\r\n" @@ -143,7 +143,7 @@ TEST_F(StatusTest, html_status) { "fooid", "Foo impl", "<p>info</p>", "<!-- script -->")); StatusWebServer webServer(_node->getComponentRegister(), _node->getComponentRegister(), - "raw:httpport 0"); + config::ConfigUri("raw:httpport 0")); auto actual = fetch(webServer.getListenPort(), "/fooid?unusedParam"); std::string expected( "HTTP/1.1 200 OK\r\n" @@ -175,7 +175,7 @@ TEST_F(StatusTest, xml_sStatus) { "fooid", "Foo impl")); StatusWebServer webServer(_node->getComponentRegister(), _node->getComponentRegister(), - "raw:httpport 0"); + config::ConfigUri("raw:httpport 0")); auto actual = fetch(webServer.getListenPort(), "/fooid?unusedParam"); std::string expected( "HTTP/1.1 200 OK\r\n" @@ -200,7 +200,7 @@ TEST_F(StatusTest, xml_sStatus) { TEST_F(StatusTest, test404) { StatusWebServer webServer(_node->getComponentRegister(), _node->getComponentRegister(), - "raw:httpport 0"); + config::ConfigUri("raw:httpport 0")); auto actual = fetch(webServer.getListenPort(), "/fooid?unusedParam"); std::string expected( "HTTP/1.1 404 Not Found\r\n" diff --git a/storage/src/tests/persistence/common/filestortestfixture.cpp b/storage/src/tests/persistence/common/filestortestfixture.cpp index 8ab1790d9bc..24504a2006b 100644 --- a/storage/src/tests/persistence/common/filestortestfixture.cpp +++ b/storage/src/tests/persistence/common/filestortestfixture.cpp @@ -76,7 +76,7 @@ FileStorTestFixture::TestFileStorComponents::TestFileStorComponents( manager(nullptr) { injector.inject(top); - auto fsm = std::make_unique<FileStorManager>(fixture._config->getConfigId(), fixture._node->getPersistenceProvider(), + auto fsm = std::make_unique<FileStorManager>(config::ConfigUri(fixture._config->getConfigId()), fixture._node->getPersistenceProvider(), fixture._node->getComponentRegister(), *fixture._node, fixture._node->get_host_info()); manager = fsm.get(); top.push_back(std::move(fsm)); diff --git a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp index 939e7ae7b6a..baed51663f8 100644 --- a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp +++ b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp @@ -247,7 +247,7 @@ struct TestFileStorComponents { explicit TestFileStorComponents(FileStorTestBase& test, bool use_small_config = false) : manager(nullptr) { - auto fsm = std::make_unique<FileStorManager>((use_small_config ? test.smallConfig : test.config)->getConfigId(), + auto fsm = std::make_unique<FileStorManager>(config::ConfigUri((use_small_config ? test.smallConfig : test.config)->getConfigId()), test._node->getPersistenceProvider(), test._node->getComponentRegister(), *test._node, test._node->get_host_info()); manager = fsm.get(); diff --git a/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp b/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp index c6ee69f2bf2..3a1f41cb82c 100644 --- a/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp +++ b/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp @@ -39,7 +39,7 @@ struct BucketCheckerInjector : FileStorTestFixture::StorageLinkInjector link.push_back(std::make_unique<ModifiedBucketChecker>( _node.getComponentRegister(), _node.getPersistenceProvider(), - _fixture._config->getConfigId())); + config::ConfigUri(_fixture._config->getConfigId()))); } }; diff --git a/storage/src/tests/persistence/filestorage/modifiedbucketcheckertest.cpp b/storage/src/tests/persistence/filestorage/modifiedbucketcheckertest.cpp index 9130b469794..55fd2680832 100644 --- a/storage/src/tests/persistence/filestorage/modifiedbucketcheckertest.cpp +++ b/storage/src/tests/persistence/filestorage/modifiedbucketcheckertest.cpp @@ -47,7 +47,7 @@ ModifiedBucketCheckerTest::SetUp() _top.reset(new DummyStorageLink); _handler = new ModifiedBucketChecker(_node->getComponentRegister(), _node->getPersistenceProvider(), - _config->getConfigId()); + config::ConfigUri(_config->getConfigId())); _top->push_back(std::unique_ptr<StorageLink>(_handler)); _bottom = new DummyStorageLink; _handler->push_back(std::unique_ptr<StorageLink>(_bottom)); diff --git a/storage/src/tests/storageserver/bouncertest.cpp b/storage/src/tests/storageserver/bouncertest.cpp index 2b87fd3cabf..acd2d978f9e 100644 --- a/storage/src/tests/storageserver/bouncertest.cpp +++ b/storage/src/tests/storageserver/bouncertest.cpp @@ -72,7 +72,7 @@ void BouncerTest::setUpAsNode(const lib::NodeType& type) { _node.reset(new TestDistributorApp(NodeIndex(2), config.getConfigId())); } _upper.reset(new DummyStorageLink()); - _manager = new Bouncer(_node->getComponentRegister(), config.getConfigId()); + _manager = new Bouncer(_node->getComponentRegister(), config::ConfigUri(config.getConfigId())); _lower = new DummyStorageLink(); _upper->push_back(std::unique_ptr<StorageLink>(_manager)); _upper->push_back(std::unique_ptr<StorageLink>(_lower)); diff --git a/storage/src/tests/storageserver/changedbucketownershiphandlertest.cpp b/storage/src/tests/storageserver/changedbucketownershiphandlertest.cpp index c96deaff321..1aaca53d15a 100644 --- a/storage/src/tests/storageserver/changedbucketownershiphandlertest.cpp +++ b/storage/src/tests/storageserver/changedbucketownershiphandlertest.cpp @@ -125,7 +125,7 @@ ChangedBucketOwnershipHandlerTest::SetUp() _app.reset(new TestServiceLayerApp); _top.reset(new DummyStorageLink); - _handler = new ChangedBucketOwnershipHandler(config.getConfigId(), + _handler = new ChangedBucketOwnershipHandler(config::ConfigUri(config.getConfigId()), _app->getComponentRegister()); _top->push_back(std::unique_ptr<StorageLink>(_handler)); _bottom = new DummyStorageLink; diff --git a/storage/src/tests/storageserver/communicationmanagertest.cpp b/storage/src/tests/storageserver/communicationmanagertest.cpp index ba5e0c3c116..f8462d528c7 100644 --- a/storage/src/tests/storageserver/communicationmanagertest.cpp +++ b/storage/src/tests/storageserver/communicationmanagertest.cpp @@ -60,9 +60,9 @@ TEST_F(CommunicationManagerTest, simple) { TestDistributorApp distNode(distConfig.getConfigId()); CommunicationManager distributor(distNode.getComponentRegister(), - distConfig.getConfigId()); + config::ConfigUri(distConfig.getConfigId())); CommunicationManager storage(storNode.getComponentRegister(), - storConfig.getConfigId()); + config::ConfigUri(storConfig.getConfigId())); DummyStorageLink *distributorLink = new DummyStorageLink(); DummyStorageLink *storageLink = new DummyStorageLink(); distributor.push_back(std::unique_ptr<StorageLink>(distributorLink)); @@ -112,7 +112,7 @@ CommunicationManagerTest::doTestConfigPropagation(bool isContentNode) } CommunicationManager commMgr(node->getComponentRegister(), - config.getConfigId()); + config::ConfigUri(config.getConfigId())); DummyStorageLink *storageLink = new DummyStorageLink(); commMgr.push_back(std::unique_ptr<StorageLink>(storageLink)); commMgr.open(); @@ -158,7 +158,7 @@ TEST_F(CommunicationManagerTest, commands_are_dequeued_in_fifo_order) { TestServiceLayerApp storNode(storConfig.getConfigId()); CommunicationManager storage(storNode.getComponentRegister(), - storConfig.getConfigId()); + config::ConfigUri(storConfig.getConfigId())); DummyStorageLink *storageLink = new DummyStorageLink(); storage.push_back(std::unique_ptr<StorageLink>(storageLink)); storage.open(); @@ -191,7 +191,7 @@ TEST_F(CommunicationManagerTest, replies_are_dequeued_in_fifo_order) { TestServiceLayerApp storNode(storConfig.getConfigId()); CommunicationManager storage(storNode.getComponentRegister(), - storConfig.getConfigId()); + config::ConfigUri(storConfig.getConfigId())); DummyStorageLink *storageLink = new DummyStorageLink(); storage.push_back(std::unique_ptr<StorageLink>(storageLink)); storage.open(); @@ -232,7 +232,7 @@ struct CommunicationManagerFixture { node = std::make_unique<TestServiceLayerApp>(stor_config.getConfigId()); comm_mgr = std::make_unique<CommunicationManager>(node->getComponentRegister(), - stor_config.getConfigId()); + config::ConfigUri(stor_config.getConfigId())); bottom_link = new DummyStorageLink(); comm_mgr->push_back(std::unique_ptr<StorageLink>(bottom_link)); comm_mgr->open(); diff --git a/storage/src/tests/storageserver/documentapiconvertertest.cpp b/storage/src/tests/storageserver/documentapiconvertertest.cpp index d4d9d54557d..4b3cd3dfe17 100644 --- a/storage/src/tests/storageserver/documentapiconvertertest.cpp +++ b/storage/src/tests/storageserver/documentapiconvertertest.cpp @@ -3,7 +3,6 @@ #include <vespa/config/subscription/configuri.h> #include <vespa/document/base/testdocrepo.h> #include <vespa/document/bucket/bucketidfactory.h> -#include <vespa/document/config/documenttypes_config_fwd.h> #include <vespa/document/datatype/documenttype.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/select/parser.h> @@ -74,7 +73,7 @@ struct DocumentApiConverterTest : Test { } void SetUp() override { - _converter = std::make_unique<DocumentApiConverter>("raw:", _bucketResolver); + _converter = std::make_unique<DocumentApiConverter>(config::ConfigUri("raw:"), _bucketResolver); }; template <typename DerivedT, typename BaseT> diff --git a/storage/src/tests/storageserver/mergethrottlertest.cpp b/storage/src/tests/storageserver/mergethrottlertest.cpp index 89b769078cc..77c674ff1e6 100644 --- a/storage/src/tests/storageserver/mergethrottlertest.cpp +++ b/storage/src/tests/storageserver/mergethrottlertest.cpp @@ -2,23 +2,19 @@ #include <tests/common/testhelper.h> #include <tests/common/dummystoragelink.h> #include <tests/common/teststorageapp.h> -#include <tests/common/dummystoragelink.h> #include <vespa/document/test/make_document_bucket.h> #include <vespa/messagebus/dynamicthrottlepolicy.h> -#include <vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h> #include <vespa/storage/storageserver/mergethrottler.h> #include <vespa/storage/persistence/messages.h> #include <vespa/storageapi/message/bucket.h> #include <vespa/storageapi/message/state.h> #include <vespa/vdslib/state/clusterstate.h> #include <vespa/vespalib/gtest/gtest.h> -#include <vespa/vespalib/util/document_runnable.h> #include <vespa/vespalib/util/exceptions.h> #include <unordered_set> #include <memory> #include <iterator> #include <vector> -#include <algorithm> #include <chrono> #include <thread> @@ -178,7 +174,7 @@ MergeThrottlerTest::SetUp() std::unique_ptr<DummyStorageLink> top; top = std::make_unique<DummyStorageLink>(); - MergeThrottler* throttler = new MergeThrottler(config.getConfigId(), server->getComponentRegister()); + MergeThrottler* throttler = new MergeThrottler(::config::ConfigUri(config.getConfigId()), server->getComponentRegister()); // MergeThrottler will be sandwiched in between two dummy links top->push_back(std::unique_ptr<StorageLink>(throttler)); DummyStorageLink* bottom = new DummyStorageLink; diff --git a/storage/src/tests/storageserver/priorityconvertertest.cpp b/storage/src/tests/storageserver/priorityconvertertest.cpp index 2f79a14af58..c18f36f9b6c 100644 --- a/storage/src/tests/storageserver/priorityconvertertest.cpp +++ b/storage/src/tests/storageserver/priorityconvertertest.cpp @@ -1,6 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/documentapi/documentapi.h> #include <vespa/storage/storageserver/priorityconverter.h> #include <tests/common/testhelper.h> #include <vespa/vespalib/gtest/gtest.h> @@ -14,16 +13,14 @@ struct PriorityConverterTest : Test { void SetUp() override { vdstestlib::DirConfig config(getStandardConfig(true)); - _converter = std::make_unique<PriorityConverter>(config.getConfigId()); + _converter = std::make_unique<PriorityConverter>(config::ConfigUri(config.getConfigId())); }; }; TEST_F(PriorityConverterTest, normal_usage) { for (int p = 0; p < 16; ++p) { - EXPECT_EQ( - (50 + p * 10), - _converter->toStoragePriority( - static_cast<documentapi::Priority::Value>(p))); + EXPECT_EQ((50 + p * 10), + _converter->toStoragePriority(static_cast<documentapi::Priority::Value>(p))); } for (int i = 0; i < 256; ++i) { uint8_t p = i; diff --git a/storage/src/tests/storageserver/rpc/cluster_controller_rpc_api_service_test.cpp b/storage/src/tests/storageserver/rpc/cluster_controller_rpc_api_service_test.cpp index 8bfe9c1e692..bac1ab34574 100644 --- a/storage/src/tests/storageserver/rpc/cluster_controller_rpc_api_service_test.cpp +++ b/storage/src/tests/storageserver/rpc/cluster_controller_rpc_api_service_test.cpp @@ -57,7 +57,7 @@ struct FixtureBase { config.getConfig("stor-server").set("node_index", "1"); addSlobrokConfig(config, slobrok); - shared_rpc_resources = std::make_unique<SharedRpcResources>(config.getConfigId(), 0, 1, 1); + shared_rpc_resources = std::make_unique<SharedRpcResources>(config::ConfigUri(config.getConfigId()), 0, 1, 1); cc_service = std::make_unique<ClusterControllerApiRpcService>(dispatcher, *shared_rpc_resources); shared_rpc_resources->start_server_and_register_slobrok("my_cool_rpc_test"); } diff --git a/storage/src/tests/storageserver/rpc/storage_api_rpc_service_test.cpp b/storage/src/tests/storageserver/rpc/storage_api_rpc_service_test.cpp index 47d7d9fbdeb..07b009bf981 100644 --- a/storage/src/tests/storageserver/rpc/storage_api_rpc_service_test.cpp +++ b/storage/src/tests/storageserver/rpc/storage_api_rpc_service_test.cpp @@ -119,7 +119,7 @@ public: cfg.set("is_distributor", is_distributor ? "true" : "false"); addSlobrokConfig(_config, slobrok); - _shared_rpc_resources = std::make_unique<SharedRpcResources>(_config.getConfigId(), 0, 1, 1); + _shared_rpc_resources = std::make_unique<SharedRpcResources>(config::ConfigUri(_config.getConfigId()), 0, 1, 1); // TODO make codec provider into interface so we can test decode-failures more easily? _codec_provider = std::make_unique<MessageCodecProvider>(_doc_type_repo); } diff --git a/storage/src/tests/storageserver/service_layer_error_listener_test.cpp b/storage/src/tests/storageserver/service_layer_error_listener_test.cpp index acc3e49e345..571bebd9c86 100644 --- a/storage/src/tests/storageserver/service_layer_error_listener_test.cpp +++ b/storage/src/tests/storageserver/service_layer_error_listener_test.cpp @@ -37,7 +37,7 @@ struct Fixture { vdstestlib::DirConfig config{getStandardConfig(true)}; TestServiceLayerApp app; ServiceLayerComponent component{app.getComponentRegister(), "dummy"}; - MergeThrottler merge_throttler{config.getConfigId(), app.getComponentRegister()}; + MergeThrottler merge_throttler{config::ConfigUri(config.getConfigId()), app.getComponentRegister()}; TestShutdownListener shutdown_listener; ServiceLayerErrorListener error_listener{component, merge_throttler}; diff --git a/storage/src/tests/storageserver/statereportertest.cpp b/storage/src/tests/storageserver/statereportertest.cpp index 16d313ce5d1..77192d24786 100644 --- a/storage/src/tests/storageserver/statereportertest.cpp +++ b/storage/src/tests/storageserver/statereportertest.cpp @@ -95,7 +95,7 @@ void StateReporterTest::SetUp() { _filestorMetrics->initDiskMetrics(1, 1); _topSet->registerMetric(*_filestorMetrics); - _metricManager->init(_config->getConfigId(), _node->getThreadPool()); + _metricManager->init(config::ConfigUri(_config->getConfigId()), _node->getThreadPool()); } void StateReporterTest::TearDown() { diff --git a/storage/src/tests/storageserver/testvisitormessagesession.h b/storage/src/tests/storageserver/testvisitormessagesession.h index 548d4c0b69a..d10e8f0c285 100644 --- a/storage/src/tests/storageserver/testvisitormessagesession.h +++ b/storage/src/tests/storageserver/testvisitormessagesession.h @@ -54,7 +54,7 @@ struct TestVisitorMessageSessionFactory : public VisitorMessageSessionFactory TestVisitorMessageSessionFactory(vespalib::stringref configId = "") : _createAutoReplyVisitorSessions(false), - _priConverter(configId) {} + _priConverter(config::ConfigUri(configId)) {} VisitorMessageSession::UP createSession(Visitor& v, VisitorThread& vt) override { std::lock_guard lock(_accessLock); diff --git a/storage/src/tests/visiting/visitormanagertest.cpp b/storage/src/tests/visiting/visitormanagertest.cpp index abd871dad23..99172264d47 100644 --- a/storage/src/tests/visiting/visitormanagertest.cpp +++ b/storage/src/tests/visiting/visitormanagertest.cpp @@ -1,6 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/document/datatype/datatype.h> #include <vespa/document/fieldvalue/intfieldvalue.h> #include <vespa/document/fieldvalue/stringfieldvalue.h> #include <vespa/storageapi/message/datagram.h> @@ -89,10 +88,10 @@ VisitorManagerTest::initializeTest() _node->setupDummyPersistence(); _node->getStateUpdater().setClusterState(std::make_shared<lib::ClusterState>("storage:1 distributor:1")); _top = std::make_unique<DummyStorageLink>(); - auto vm = std::make_unique<VisitorManager>(config.getConfigId(), _node->getComponentRegister(), *_messageSessionFactory); + auto vm = std::make_unique<VisitorManager>(config::ConfigUri(config.getConfigId()), _node->getComponentRegister(), *_messageSessionFactory); _manager = vm.get(); _top->push_back(std::move(vm)); - _top->push_back(std::make_unique<FileStorManager>(config.getConfigId(), _node->getPersistenceProvider(), + _top->push_back(std::make_unique<FileStorManager>(config::ConfigUri(config.getConfigId()), _node->getPersistenceProvider(), _node->getComponentRegister(), *_node, _node->get_host_info())); _manager->setTimeBetweenTicks(10); _top->open(); diff --git a/storage/src/tests/visiting/visitortest.cpp b/storage/src/tests/visiting/visitortest.cpp index 945a08d910e..f159bf85d22 100644 --- a/storage/src/tests/visiting/visitortest.cpp +++ b/storage/src/tests/visiting/visitortest.cpp @@ -166,7 +166,7 @@ VisitorTest::initializeTest(const TestParams& params) _top.reset(new DummyStorageLink()); _top->push_back(std::unique_ptr<StorageLink>(_manager = new VisitorManager( - config.getConfigId(), + config::ConfigUri(config.getConfigId()), _node->getComponentRegister(), *_messageSessionFactory))); _bottom = new DummyStorageLink(); _top->push_back(std::unique_ptr<StorageLink>(_bottom)); diff --git a/storage/src/vespa/storage/tools/storage-cmd.cpp b/storage/src/vespa/storage/tools/storage-cmd.cpp index 0f3cde759c5..8c2a1f40529 100644 --- a/storage/src/vespa/storage/tools/storage-cmd.cpp +++ b/storage/src/vespa/storage/tools/storage-cmd.cpp @@ -61,7 +61,7 @@ public: int retCode = 0; fnet::frt::StandaloneFRT supervisor; - slobrok::ConfiguratorFactory sbcfg("client"); + slobrok::ConfiguratorFactory sbcfg(config::ConfigUri("client")); slobrok::api::MirrorAPI mirror(supervisor.supervisor(), sbcfg); while (!mirror.ready()) { |