diff options
author | Tor Egge <Tor.Egge@oath.com> | 2018-01-09 15:10:12 +0000 |
---|---|---|
committer | Tor Egge <Tor.Egge@oath.com> | 2018-01-09 15:10:12 +0000 |
commit | 19c0c4bdc483a7eaec97c73ab2217d51880dd333 (patch) | |
tree | d1656b8f52ff12b10dc3fb630299fe81bd3d7c2b /searchcore/src/tests/proton/documentdb | |
parent | e8b197ceb9652cb85f3473675725e3c3d894c98f (diff) |
Let proton subscribe to bucketspaces config.
Diffstat (limited to 'searchcore/src/tests/proton/documentdb')
3 files changed, 9 insertions, 0 deletions
diff --git a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp index 1b94ba36dad..e655ae0d739 100644 --- a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp +++ b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp @@ -30,6 +30,7 @@ #include <vespa/vespalib/io/fileutil.h> #include <vespa/vespalib/test/insertion_operators.h> #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/config-bucketspaces.h> #include <iostream> @@ -54,6 +55,7 @@ using searchcorespi::IFlushTarget; using searchcorespi::index::IThreadingService; using storage::spi::Timestamp; using vespa::config::search::core::ProtonConfig; +using vespa::config::content::core::BucketspacesConfig; using vespalib::mkdir; typedef StoreOnlyDocSubDB::Config StoreOnlyConfig; @@ -281,6 +283,7 @@ struct MyConfigSnapshot _builder.getDocumentTypeRepo(), std::make_shared<ProtonConfig>(), std::make_shared<FiledistributorrpcConfig>(), + std::make_shared<BucketspacesConfig>(), tuneFileDocumentDB); config::DirSpec spec(cfgDir); DocumentDBConfigHelper mgr(spec, "searchdocument"); diff --git a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp index 58372c59193..f93930d189b 100644 --- a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp +++ b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp @@ -23,6 +23,7 @@ #include <vespa/searchlib/index/dummyfileheadercontext.h> #include <vespa/searchlib/transactionlog/translogserver.h> #include <vespa/vespalib/data/slime/slime.h> +#include <vespa/config-bucketspaces.h> #include <vespa/vespalib/testkit/test_kit.h> using namespace cloud::config::filedistribution; @@ -40,6 +41,7 @@ using search::transactionlog::TransLogServer; using searchcorespi::IFlushTarget; using searchcorespi::index::IndexFlushTarget; using vespa::config::search::core::ProtonConfig; +using vespa::config::content::core::BucketspacesConfig; using vespalib::Slime; namespace { @@ -96,6 +98,7 @@ Fixture::Fixture() b(new BootstrapConfig(1, documenttypesConfig, repo, std::make_shared<ProtonConfig>(), std::make_shared<FiledistributorrpcConfig>(), + std::make_shared<BucketspacesConfig>(), tuneFileDocumentDB)); mgr.forwardConfig(b); mgr.nextGeneration(0); diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp index 9bb9766024a..a781085769c 100644 --- a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp +++ b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp @@ -13,6 +13,7 @@ #include <vespa/searchcore/proton/test/documentdb_config_builder.h> #include <vespa/searchsummary/config/config-juniperrc.h> #include <vespa/vespalib/io/fileutil.h> +#include <vespa/config-bucketspaces.h> #include <vespa/vespalib/testkit/test_kit.h> using namespace cloud::config::filedistribution; @@ -23,6 +24,7 @@ using namespace search::index; using namespace search; using namespace vespa::config::search::core; using namespace vespa::config::search; +using vespa::config::content::core::BucketspacesConfig; using proton::matching::RankingConstants; typedef DocumentDBConfigHelper DBCM; @@ -44,6 +46,7 @@ makeBaseConfigSnapshot() DocumentTypeRepo::SP(new DocumentTypeRepo(*dtcfg)), std::make_shared<ProtonConfig>(), std::make_shared<FiledistributorrpcConfig>(), + std::make_shared<BucketspacesConfig>(), std::make_shared<TuneFileDocumentDB>())); dbcm.forwardConfig(b); dbcm.nextGeneration(0); |