diff options
author | Arne H Juul <arnej@yahooinc.com> | 2021-12-02 08:07:30 +0000 |
---|---|---|
committer | Arne H Juul <arnej@yahooinc.com> | 2021-12-02 09:35:08 +0000 |
commit | 98b760a33c142227cd88448bc6666eb9809aa4a2 (patch) | |
tree | b36c7e4cdd582267f5a605bb8a2ebeb55d734e8c /searchcore | |
parent | a7aa496c28792461b7e252a3046cf003ed0113b1 (diff) |
track namespace move in documenttypes.def
* For C++ code this introduces a "document::config" namespace, which will
sometimes conflict with the global "config" namespace.
* Move all forward-declarations of the types DocumenttypesConfig and
DocumenttypesConfigBuilder to a common header file.
Diffstat (limited to 'searchcore')
30 files changed, 43 insertions, 44 deletions
diff --git a/searchcore/src/apps/tests/persistenceconformance_test.cpp b/searchcore/src/apps/tests/persistenceconformance_test.cpp index be9d394a2b6..38af604c4eb 100644 --- a/searchcore/src/apps/tests/persistenceconformance_test.cpp +++ b/searchcore/src/apps/tests/persistenceconformance_test.cpp @@ -11,6 +11,7 @@ #include <vespa/config-summary.h> #include <vespa/config-summarymap.h> #include <vespa/document/base/testdocman.h> +#include <vespa/document/config/doctypecfg.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/test/make_bucket_space.h> #include <vespa/fastos/file.h> @@ -55,7 +56,6 @@ using std::shared_ptr; using document::BucketSpace; using document::DocumentType; using document::DocumentTypeRepo; -using document::DocumenttypesConfig; using document::TestDocMan; using document::test::makeBucketSpace; using search::TuneFileDocumentDB; diff --git a/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp b/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp index 8db828920c0..9819a1d50af 100644 --- a/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp +++ b/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp @@ -146,7 +146,7 @@ std::unique_ptr<CFG> getConfig() { } std::shared_ptr<const document::DocumentTypeRepo> getRepo() { - typedef document::DocumenttypesConfig DCFG; + typedef document::config::DocumenttypesConfig DCFG; std::unique_ptr<DCFG> dcfg = getConfig<DCFG>(); std::shared_ptr<const document::DocumentTypeRepo> ret; if (dcfg.get() != 0) { @@ -180,7 +180,7 @@ App::Main() fprintf(stderr, "input feed: %s\n", feedFile.c_str()); fprintf(stderr, "output directory: %s\n", dirName.c_str()); vespalib::mkdir(dirName); - typedef document::DocumenttypesConfig DCFG; + typedef document::config::DocumenttypesConfig DCFG; if (!writeConfig(getConfig<DCFG>(), dirName)) { fprintf(stderr, "error: could not save config to disk\n"); return 1; diff --git a/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp b/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp index 1ccd8221aff..4e29166e9c4 100644 --- a/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp +++ b/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp @@ -1,5 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include <vespa/document/config/doctypecfg.h> #include <vespa/document/repo/configbuilder.h> #include <vespa/document/repo/document_type_repo_factory.h> #include <vespa/document/repo/documenttyperepo.h> @@ -36,8 +37,6 @@ using namespace std::chrono_literals; using document::DocumentTypeRepo; using document::DocumentTypeRepoFactory; -using document::DocumenttypesConfig; -using document::DocumenttypesConfigBuilder; using search::bmcluster::AvgSampler; using search::bmcluster::BmClusterController; using search::bmcluster::IBmFeedHandler; diff --git a/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp b/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp index f9833b430a0..335db5d3b08 100644 --- a/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp +++ b/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp @@ -1,5 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include <vespa/document/config/doctypecfg.h> #include <vespa/document/repo/configbuilder.h> #include <vespa/document/repo/document_type_repo_factory.h> #include <vespa/document/repo/documenttyperepo.h> @@ -38,8 +39,6 @@ using namespace std::chrono_literals; using document::DocumentTypeRepo; using document::DocumentTypeRepoFactory; -using document::DocumenttypesConfig; -using document::DocumenttypesConfigBuilder; using search::bmcluster::AvgSampler; using search::bmcluster::BmClusterController; using search::bmcluster::IBmFeedHandler; diff --git a/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp b/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp index 5c777baa3bb..8d286d599c4 100644 --- a/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp +++ b/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp @@ -8,6 +8,7 @@ #include <vespa/vespalib/util/programoptions.h> #include <vespa/vespalib/util/xmlstream.h> #include <vespa/vespalib/util/time.h> +#include <vespa/document/config/doctypecfg.h> #include <vespa/document/config/config-documenttypes.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/fieldvalue/document.h> @@ -25,7 +26,6 @@ using namespace search; using namespace search::common; using namespace search::transactionlog; -using document::DocumenttypesConfig; using document::DocumentTypeRepo; typedef std::shared_ptr<DocumenttypesConfig> DocumenttypesConfigSP; diff --git a/searchcore/src/tests/proton/attribute/attribute_populator/attribute_populator_test.cpp b/searchcore/src/tests/proton/attribute/attribute_populator/attribute_populator_test.cpp index 62145a118b0..3318105220c 100644 --- a/searchcore/src/tests/proton/attribute/attribute_populator/attribute_populator_test.cpp +++ b/searchcore/src/tests/proton/attribute/attribute_populator/attribute_populator_test.cpp @@ -1,5 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include <vespa/document/config/doctypecfg.h> #include <vespa/document/fieldvalue/intfieldvalue.h> #include <vespa/document/repo/configbuilder.h> #include <vespa/searchcore/proton/attribute/attribute_populator.h> diff --git a/searchcore/src/tests/proton/common/cachedselect_test.cpp b/searchcore/src/tests/proton/common/cachedselect_test.cpp index 5799753f075..d888063643b 100644 --- a/searchcore/src/tests/proton/common/cachedselect_test.cpp +++ b/searchcore/src/tests/proton/common/cachedselect_test.cpp @@ -1,6 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/document/base/documentid.h> +#include <vespa/document/config/doctypecfg.h> #include <vespa/document/datatype/documenttype.h> #include <vespa/document/fieldvalue/document.h> #include <vespa/document/fieldvalue/intfieldvalue.h> diff --git a/searchcore/src/tests/proton/common/selectpruner_test.cpp b/searchcore/src/tests/proton/common/selectpruner_test.cpp index 3c793c4e6c3..0e980ab9db7 100644 --- a/searchcore/src/tests/proton/common/selectpruner_test.cpp +++ b/searchcore/src/tests/proton/common/selectpruner_test.cpp @@ -1,6 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/stllike/string.h> #include <vespa/vespalib/testkit/testapp.h> +#include <vespa/document/config/doctypecfg.h> #include <vespa/document/repo/configbuilder.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/datatype/documenttype.h> diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp index c5a01de6b3b..d7285121647 100644 --- a/searchcore/src/tests/proton/docsummary/docsummary.cpp +++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp @@ -3,6 +3,7 @@ #include <tests/proton/common/dummydbowner.h> #include <vespa/config-bucketspaces.h> #include <vespa/config/helper/configgetter.hpp> +#include <vespa/document/config/doctypecfg.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/test/make_bucket_space.h> #include <vespa/eval/eval/simple_value.h> @@ -46,6 +47,8 @@ #include <vespa/log/log.h> LOG_SETUP("docsummary_test"); +using config::ConfigGetter; + using namespace cloud::config::filedistribution; using namespace document; using namespace search::docsummary; @@ -56,7 +59,6 @@ using namespace search; using namespace std::chrono_literals; using vespalib::IDestructorCallback; -using document::DocumenttypesConfig; using document::test::makeBucketSpace; using search::TuneFileDocumentDB; using search::index::DummyFileHeaderContext; @@ -183,7 +185,7 @@ public: matching::QueryLimiter _queryLimiter; vespalib::Clock _clock; DummyWireService _dummy; - config::DirSpec _spec; + ::config::DirSpec _spec; DocumentDBConfigHelper _configMgr; DocumentDBConfig::DocumenttypesConfigSP _documenttypesConfig; const std::shared_ptr<const DocumentTypeRepo> _repo; @@ -1127,12 +1129,12 @@ Fixture::Fixture() _markupFields() { std::string cfgId("summary"); - _summaryCfg = config::ConfigGetter<vespa::config::search::SummaryConfig>::getConfig( - cfgId, config::FileSpec(TEST_PATH("summary.cfg"))); + _summaryCfg = ConfigGetter<vespa::config::search::SummaryConfig>::getConfig( + cfgId, ::config::FileSpec(TEST_PATH("summary.cfg"))); _resultCfg.ReadConfig(*_summaryCfg, cfgId.c_str()); std::string mapCfgId("summarymap"); - std::unique_ptr<vespa::config::search::SummarymapConfig> mapCfg = config::ConfigGetter<vespa::config::search::SummarymapConfig>::getConfig( - mapCfgId, config::FileSpec(TEST_PATH("summarymap.cfg"))); + std::unique_ptr<vespa::config::search::SummarymapConfig> mapCfg = ::config::ConfigGetter<vespa::config::search::SummarymapConfig>::getConfig( + mapCfgId, ::config::FileSpec(TEST_PATH("summarymap.cfg"))); for (size_t i = 0; i < mapCfg->override.size(); ++i) { const vespa::config::search::SummarymapConfig::Override & o = mapCfg->override[i]; if (o.command == "dynamicteaser") { diff --git a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp index 1fe32c8c1b3..7649949dc0e 100644 --- a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp +++ b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp @@ -8,6 +8,7 @@ #include <vespa/document/base/documentid.h> #include <vespa/document/base/exceptions.h> #include <vespa/document/base/field.h> +#include <vespa/document/config/doctypecfg.h> #include <vespa/document/datatype/annotationtype.h> #include <vespa/document/datatype/arraydatatype.h> #include <vespa/document/datatype/datatype.h> @@ -61,8 +62,6 @@ using document::Document; using document::DocumentId; using document::DocumentType; using document::DocumentTypeRepo; -using document::DocumenttypesConfig; -using document::DocumenttypesConfigBuilder; using document::DoubleFieldValue; using document::FeatureSet; using document::Field; diff --git a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp index cd694cb938c..85b0774c748 100644 --- a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp +++ b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp @@ -2,6 +2,7 @@ #include <vespa/vespalib/testkit/testapp.h> +#include <vespa/document/config/doctypecfg.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/searchcore/proton/attribute/attribute_writer.h> #include <vespa/searchcore/proton/attribute/attributemanager.h> 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 b80cd08ae8e..7f28ccd0737 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 @@ -274,7 +274,7 @@ struct MyConfigSnapshot std::make_shared<FiledistributorrpcConfig>(), std::make_shared<BucketspacesConfig>(), tuneFileDocumentDB, HwInfo()); - config::DirSpec spec(cfgDir); + ::config::DirSpec spec(cfgDir); DocumentDBConfigHelper mgr(spec, "searchdocument"); mgr.forwardConfig(_bootstrap); mgr.nextGeneration(1ms); diff --git a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp index b31534c011c..7e99789476f 100644 --- a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp +++ b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp @@ -2,6 +2,7 @@ #include <tests/proton/common/dummydbowner.h> #include <vespa/config-bucketspaces.h> +#include <vespa/document/config/doctypecfg.h> #include <vespa/document/datatype/documenttype.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/test/make_bucket_space.h> @@ -43,7 +44,6 @@ using namespace std::chrono_literals; using document::DocumentType; using document::DocumentTypeRepo; -using document::DocumenttypesConfig; using document::test::makeBucketSpace; using search::SerialNum; using search::TuneFileDocumentDB; diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp b/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp index 0d07da8858a..94ea7e07322 100644 --- a/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp +++ b/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp @@ -8,6 +8,7 @@ #include <vespa/vespalib/testkit/testapp.h> #include <vespa/config-summary.h> #include <vespa/config-summarymap.h> +#include <vespa/document/config/doctypecfg.h> #include <vespa/document/repo/configbuilder.h> #include <vespa/document/repo/documenttyperepo.h> diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp index 469cffaa31a..2fa2742b3df 100644 --- a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp +++ b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp @@ -8,6 +8,7 @@ #include <vespa/config-summary.h> #include <vespa/config-summarymap.h> #include <vespa/config/helper/configgetter.hpp> +#include <vespa/document/config/doctypecfg.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/searchcore/proton/server/bootstrapconfig.h> #include <vespa/searchcore/proton/server/fileconfigmanager.h> @@ -40,10 +41,10 @@ vespalib::string myId("myconfigid"); DocumentDBConfig::SP makeBaseConfigSnapshot() { - config::DirSpec spec(TEST_PATH("cfg")); + ::config::DirSpec spec(TEST_PATH("cfg")); DBCM dbcm(spec, "test"); - DocumenttypesConfigSP dtcfg(config::ConfigGetter<DocumenttypesConfig>::getConfig("", spec).release()); + DocumenttypesConfigSP dtcfg(::config::ConfigGetter<DocumenttypesConfig>::getConfig("", spec).release()); auto b = std::make_shared<BootstrapConfig>(1, dtcfg, std::make_shared<DocumentTypeRepo>(*dtcfg), std::make_shared<ProtonConfig>(), diff --git a/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp b/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp index 567fbf5dfec..56b1f7ec1cc 100644 --- a/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp +++ b/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp @@ -16,6 +16,7 @@ #include <vespa/searchlib/query/base.h> #include <persistence/spi/types.h> #include <vespa/document/base/documentid.h> +#include <vespa/document/config/doctypecfg.h> #include <vespa/document/datatype/datatype.h> #include <vespa/document/fieldvalue/document.h> #include <vespa/document/update/documentupdate.h> diff --git a/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp b/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp index a95c4a00f0b..2496de0aaa0 100644 --- a/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp +++ b/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp @@ -13,6 +13,7 @@ #include <vespa/searchcore/config/config-ranking-expressions.h> #include <vespa/searchcore/config/config-onnx-models.h> #include <vespa/searchsummary/config/config-juniperrc.h> +#include <vespa/document/config/doctypecfg.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/fileacquirer/config-filedistributorrpc.h> #include <vespa/vespalib/util/varholder.h> @@ -40,8 +41,6 @@ using vespa::config::content::core::BucketspacesConfigBuilder; using config::ConfigUri; using document::DocumentTypeRepo; -using document::DocumenttypesConfig; -using document::DocumenttypesConfigBuilder; using search::TuneFileDocumentDB; using std::map; using vespalib::VarHolder; diff --git a/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp b/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp index 55b2c7194ba..e3999e8f3a9 100644 --- a/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp +++ b/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp @@ -7,6 +7,7 @@ #include <vespa/config-rank-profiles.h> #include <vespa/config-summary.h> #include <vespa/config-summarymap.h> +#include <vespa/document/config/doctypecfg.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/fileacquirer/config-filedistributorrpc.h> #include <vespa/searchcore/proton/common/alloc_config.h> @@ -41,8 +42,6 @@ using vespa::config::content::core::BucketspacesConfigBuilder; using InitializeThreads = std::shared_ptr<vespalib::ThreadStackExecutorBase>; using config::ConfigUri; using document::DocumentTypeRepo; -using document::DocumenttypesConfig; -using document::DocumenttypesConfigBuilder; using search::TuneFileDocumentDB; using std::map; using search::index::Schema; diff --git a/searchcore/src/tests/proton/server/documentretriever_test.cpp b/searchcore/src/tests/proton/server/documentretriever_test.cpp index aed9f44799a..e631388c9b8 100644 --- a/searchcore/src/tests/proton/server/documentretriever_test.cpp +++ b/searchcore/src/tests/proton/server/documentretriever_test.cpp @@ -190,7 +190,7 @@ struct MyDocumentStore : proton::test::DummyDocumentStore { MyDocumentStore::~MyDocumentStore() = default; -document::DocumenttypesConfig getRepoConfig() { +DocumenttypesConfig getRepoConfig() { const int32_t doc_type_id = 787121340; DocumenttypesConfigBuilderHelper builder; diff --git a/searchcore/src/vespa/searchcore/bmcluster/bm_cluster.h b/searchcore/src/vespa/searchcore/bmcluster/bm_cluster.h index 9fd1743321e..1c679ab5b14 100644 --- a/searchcore/src/vespa/searchcore/bmcluster/bm_cluster.h +++ b/searchcore/src/vespa/searchcore/bmcluster/bm_cluster.h @@ -2,6 +2,7 @@ #pragma once +#include <vespa/document/config/doctypecfg.h> #include "bm_cluster_params.h" #include <memory> #include <vector> @@ -19,7 +20,6 @@ class DocumentTypeRepo; class FieldSetRepo; } -namespace document::internal { class InternalDocumenttypesType; } namespace mbus { class Slobrok; } namespace storage::rpc { class SharedRpcResources; } @@ -41,7 +41,6 @@ class IBmFeedHandler; class BmCluster { struct MessageBusConfigSet; struct RpcClientConfigSet; - using DocumenttypesConfig = const document::internal::InternalDocumenttypesType; BmClusterParams _params; int _slobrok_port; int _rpc_client_port; diff --git a/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp b/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp index 62d86ce895d..d4b12e96f1f 100644 --- a/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp +++ b/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp @@ -29,6 +29,7 @@ #include <vespa/config-upgrading.h> #include <vespa/config/common/configcontext.h> #include <vespa/document/bucket/bucketspace.h> +#include <vespa/document/config/doctypecfg.h> #include <vespa/document/repo/configbuilder.h> #include <vespa/document/repo/document_type_repo_factory.h> #include <vespa/document/repo/documenttyperepo.h> @@ -85,8 +86,6 @@ using cloud::config::SlobroksConfigBuilder; using cloud::config::filedistribution::FiledistributorrpcConfig; using config::ConfigSet; using document::BucketSpace; -using document::DocumenttypesConfig; -using document::DocumenttypesConfigBuilder; using document::DocumentType; using document::DocumentTypeRepo; using document::Field; @@ -483,7 +482,7 @@ class MyBmNode : public BmNode void create_document_db(const BmClusterParams& params); public: - MyBmNode(const vespalib::string &base_dir, int base_port, uint32_t node_idx, BmCluster& cluster, const BmClusterParams& params, std::shared_ptr<document::DocumenttypesConfig> document_types, int slobrok_port); + MyBmNode(const vespalib::string &base_dir, int base_port, uint32_t node_idx, BmCluster& cluster, const BmClusterParams& params, std::shared_ptr<DocumenttypesConfig> document_types, int slobrok_port); ~MyBmNode() override; void initialize_persistence_provider() override; void create_bucket(const document::Bucket& bucket) override; @@ -500,7 +499,7 @@ public: void merge_node_stats(std::vector<BmNodeStats>& node_stats, storage::lib::ClusterState &baseline_state) override; }; -MyBmNode::MyBmNode(const vespalib::string& base_dir, int base_port, uint32_t node_idx, BmCluster& cluster, const BmClusterParams& params, std::shared_ptr<document::DocumenttypesConfig> document_types, int slobrok_port) +MyBmNode::MyBmNode(const vespalib::string& base_dir, int base_port, uint32_t node_idx, BmCluster& cluster, const BmClusterParams& params, std::shared_ptr<DocumenttypesConfig> document_types, int slobrok_port) : BmNode(), _cluster(cluster), _document_types(std::move(document_types)), @@ -800,7 +799,7 @@ MyBmNode::merge_node_stats(std::vector<BmNodeStats>& node_stats, storage::lib::C } std::unique_ptr<BmNode> -BmNode::create(const vespalib::string& base_dir, int base_port, uint32_t node_idx, BmCluster &cluster, const BmClusterParams& params, std::shared_ptr<document::DocumenttypesConfig> document_types, int slobrok_port) +BmNode::create(const vespalib::string& base_dir, int base_port, uint32_t node_idx, BmCluster &cluster, const BmClusterParams& params, std::shared_ptr<DocumenttypesConfig> document_types, int slobrok_port) { return std::make_unique<MyBmNode>(base_dir, base_port, node_idx, cluster, params, std::move(document_types), slobrok_port); } diff --git a/searchcore/src/vespa/searchcore/bmcluster/bm_node.h b/searchcore/src/vespa/searchcore/bmcluster/bm_node.h index 49c80db44ce..86c5b2ee095 100644 --- a/searchcore/src/vespa/searchcore/bmcluster/bm_node.h +++ b/searchcore/src/vespa/searchcore/bmcluster/bm_node.h @@ -15,8 +15,6 @@ class Field; }; -namespace document::internal { class InternalDocumenttypesType; } - namespace storage::lib { class ClusterState; } namespace storage::spi { struct PersistenceProvider; } @@ -52,7 +50,7 @@ public: virtual storage::spi::PersistenceProvider *get_persistence_provider() = 0; virtual void merge_node_stats(std::vector<BmNodeStats>& node_stats, storage::lib::ClusterState &baseline_state) = 0; static unsigned int num_ports(); - static std::unique_ptr<BmNode> create(const vespalib::string &base_dir, int base_port, uint32_t node_idx, BmCluster& cluster, const BmClusterParams& params, std::shared_ptr<const document::internal::InternalDocumenttypesType> document_types, int slobrok_port); + static std::unique_ptr<BmNode> create(const vespalib::string &base_dir, int base_port, uint32_t node_idx, BmCluster& cluster, const BmClusterParams& params, std::shared_ptr<DocumenttypesConfig> document_types, int slobrok_port); }; } diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp index 6f65d76789a..eaf5a907808 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp +++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp @@ -96,7 +96,7 @@ SummarySetup(const vespalib::string & baseDir, const DocTypeName & docTypeName, auto resultConfig = std::make_unique<ResultConfig>(); if (!resultConfig->ReadConfig(summaryCfg, make_string("SummaryManager(%s)", baseDir.c_str()).c_str())) { std::ostringstream oss; - config::OstreamConfigWriter writer(oss); + ::config::OstreamConfigWriter writer(oss); writer.write(summaryCfg); throw IllegalArgumentException (make_string("Could not initialize summary result config for directory '%s' based on summary config '%s'", diff --git a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.cpp b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.cpp index bc1c16ed5b9..4286f5ffbfa 100644 --- a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.cpp @@ -2,13 +2,13 @@ #include "bootstrapconfig.h" #include <vespa/config-bucketspaces.h> +#include <vespa/document/config/doctypecfg.h> using namespace vespa::config::search; using namespace config; using document::DocumentTypeRepo; using search::TuneFileDocumentDB; using vespa::config::search::core::ProtonConfig; -using document::DocumenttypesConfig; namespace { template <typename T> diff --git a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.h b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.h index b8ed1226220..4ae0adeb5a6 100644 --- a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.h +++ b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.h @@ -50,7 +50,7 @@ public: const HwInfo & hwInfo); ~BootstrapConfig(); - const document::DocumenttypesConfig &getDocumenttypesConfig() const { return *_documenttypes; } + const document::config::DocumenttypesConfig &getDocumenttypesConfig() const { return *_documenttypes; } const FiledistributorrpcConfig &getFiledistributorrpcConfig() const { return *_fileDistributorRpc; } const FiledistributorrpcConfigSP &getFiledistributorrpcConfigSP() const { return _fileDistributorRpc; } const DocumenttypesConfigSP &getDocumenttypesConfigSP() const { return _documenttypes; } diff --git a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.cpp index e81f576cf46..a581c602380 100644 --- a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.cpp @@ -2,6 +2,7 @@ #include "bootstrapconfigmanager.h" #include "bootstrapconfig.h" +#include <vespa/document/config/doctypecfg.h> #include <vespa/document/repo/document_type_repo_factory.h> #include <vespa/searchcore/proton/common/hw_info_sampler.h> #include <vespa/config-bucketspaces.h> @@ -19,7 +20,6 @@ using search::TuneFileDocumentDB; using vespa::config::search::core::ProtonConfig; using cloud::config::filedistribution::FiledistributorrpcConfig; using vespa::config::content::core::BucketspacesConfig; -using document::DocumenttypesConfig; using document::DocumentTypeRepoFactory; using BucketspacesConfigSP = std::shared_ptr<BucketspacesConfig>; diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.cpp index 4b2ef276077..51b7934111f 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.cpp @@ -9,6 +9,7 @@ #include <vespa/config-summary.h> #include <vespa/config-summarymap.h> #include <vespa/searchsummary/config/config-juniperrc.h> +#include <vespa/document/config/doctypecfg.h> #include <vespa/document/config/config-documenttypes.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/searchcore/config/config-ranking-constants.h> @@ -23,7 +24,6 @@ using namespace vespa::config::search::summary; using namespace vespa::config::search; using document::DocumentTypeRepo; -using document::DocumenttypesConfig; using search::TuneFileDocumentDB; using search::index::Schema; using vespa::config::search::SummarymapConfig; diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.h b/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.h index fb29b086718..983460797c1 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.h +++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.h @@ -3,6 +3,7 @@ #pragma once #include "document_db_maintenance_config.h" +#include <vespa/document/config/doctypecfg.h> #include <vespa/searchlib/common/tunefileinfo.h> #include <vespa/searchcommon/common/schema.h> #include <vespa/searchcore/proton/matching/ranking_constants.h> @@ -26,7 +27,6 @@ namespace document { class DocumentTypeRepo; class DocumentType; } -namespace document::internal { class InternalDocumenttypesType; } namespace proton { @@ -112,7 +112,6 @@ public: using SummarymapConfigSP = std::shared_ptr<SummarymapConfig>; using JuniperrcConfig = const vespa::config::search::summary::internal::InternalJuniperrcType; using JuniperrcConfigSP = std::shared_ptr<JuniperrcConfig>; - using DocumenttypesConfig = const document::internal::InternalDocumenttypesType; using DocumenttypesConfigSP = std::shared_ptr<DocumenttypesConfig>; using MaintenanceConfigSP = DocumentDBMaintenanceConfig::SP; using ImportedFieldsConfig = const vespa::config::search::internal::InternalImportedFieldsType; diff --git a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp index 9641f6157c4..cde6875526d 100644 --- a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp @@ -5,6 +5,7 @@ #include <vespa/searchcore/proton/common/hw_info_sampler.h> #include <vespa/config/print/fileconfigwriter.h> #include <vespa/config-bucketspaces.h> +#include <vespa/document/config/doctypecfg.h> #include <vespa/document/repo/document_type_repo_factory.h> #include <vespa/searchcommon/common/schemaconfigurer.h> #include <vespa/vespalib/io/fileutil.h> @@ -25,7 +26,6 @@ LOG_SETUP(".proton.server.fileconfigmanager"); using document::DocumentTypeRepo; using document::DocumentTypeRepoFactory; -using document::DocumenttypesConfig; using search::IndexMetaInfo; using search::SerialNum; using search::index::Schema; diff --git a/searchcore/src/vespa/searchcore/proton/test/documentdb_config_builder.cpp b/searchcore/src/vespa/searchcore/proton/test/documentdb_config_builder.cpp index b147667202a..c4f10d084bc 100644 --- a/searchcore/src/vespa/searchcore/proton/test/documentdb_config_builder.cpp +++ b/searchcore/src/vespa/searchcore/proton/test/documentdb_config_builder.cpp @@ -6,6 +6,7 @@ #include <vespa/config-rank-profiles.h> #include <vespa/config-attributes.h> #include <vespa/config-indexschema.h> +#include <vespa/document/config/doctypecfg.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/searchsummary/config/config-juniperrc.h> #include <vespa/document/config/config-documenttypes.h> @@ -13,7 +14,6 @@ #include <vespa/searchcore/proton/common/alloc_config.h> #include <vespa/searchcore/proton/server/threading_service_config.h> -using document::DocumenttypesConfig; using search::TuneFileDocumentDB; using search::index::Schema; using vespa::config::search::RankProfilesConfig; |