diff options
author | Tor Egge <Tor.Egge@yahoo-inc.com> | 2017-05-26 13:51:50 +0000 |
---|---|---|
committer | Tor Egge <Tor.Egge@yahoo-inc.com> | 2017-05-26 13:51:50 +0000 |
commit | 241861ecce51e8057fee7ee18abb074e4a057c0b (patch) | |
tree | 251acc32125f09cf5f24a877fddbbbd689640a41 /searchcore | |
parent | 85f1f695c27b33106649a073f8f36babc5124eec (diff) |
Reduce exposure of generated ranking constants config header.
Diffstat (limited to 'searchcore')
7 files changed, 4 insertions, 3 deletions
diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp b/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp index cc953423604..ef5a1d67cd7 100644 --- a/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp +++ b/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp @@ -18,7 +18,6 @@ using namespace vespa::config::search; using proton::matching::RankingConstants; using std::make_shared; using std::shared_ptr; -using vespa::config::search::core::RankingConstantsConfig; using document::config_builder::DocumenttypesConfigBuilderHelper; using document::config_builder::Struct; diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp b/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp index 31d580b0756..24c5cbb5a11 100644 --- a/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp +++ b/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp @@ -13,7 +13,6 @@ using namespace search::index; using namespace vespa::config::search; using std::shared_ptr; using std::make_shared; -using vespa::config::search::core::RankingConstantsConfig; typedef shared_ptr<DocumentDBConfig> DDBCSP; 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 904cce00fc4..45c2ac10019 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 @@ -15,6 +15,7 @@ #include <vespa/searchcore/proton/server/proton_config_snapshot.h> #include <vespa/searchcore/proton/server/i_proton_configurer.h> #include <vespa/searchsummary/config/config-juniperrc.h> +#include <vespa/searchcore/config/config-ranking-constants.h> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/vespalib/util/varholder.h> #include <mutex> 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 7a8247c8944..56c3e80ad17 100644 --- a/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp +++ b/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp @@ -16,6 +16,7 @@ #include <vespa/searchcore/proton/server/proton_configurer.h> #include <vespa/searchcore/proton/server/i_proton_configurer_owner.h> #include <vespa/searchsummary/config/config-juniperrc.h> +#include <vespa/searchcore/config/config-ranking-constants.h> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/searchcommon/common/schemaconfigurer.h> #include <vespa/vespalib/util/threadstackexecutor.h> diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.cpp index c766318a294..4a645ea7888 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-summarymap.h> #include <vespa/searchsummary/config/config-juniperrc.h> #include <vespa/document/config/config-documenttypes.h> +#include <vespa/searchcore/config/config-ranking-constants.h> #include <vespa/searchcore/proton/attribute/attribute_aspect_delayer.h> #include <vespa/searchcore/proton/common/document_type_inspector.h> #include <vespa/searchcore/proton/common/indexschema_inspector.h> diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.h b/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.h index 30633ec122a..757259411e6 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.h +++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.h @@ -6,7 +6,6 @@ #include <vespa/document/repo/documenttyperepo.h> #include <vespa/searchlib/common/tunefileinfo.h> #include <vespa/searchcommon/common/schema.h> -#include <vespa/searchcore/config/config-ranking-constants.h> #include <vespa/searchcore/proton/matching/ranking_constants.h> #include <vespa/config/retriever/configkeyset.h> #include <vespa/config/retriever/configsnapshot.h> diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp index 959e5565753..8c737f26af7 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp @@ -11,6 +11,7 @@ #include <vespa/searchcommon/common/schemaconfigurer.h> #include <vespa/searchlib/index/schemautil.h> #include <vespa/searchsummary/config/config-juniperrc.h> +#include <vespa/searchcore/config/config-ranking-constants.h> #include <vespa/vespalib/time/time_box.h> LOG_SETUP(".proton.server.documentdbconfigmanager"); |