diff options
-rw-r--r-- | configdefinitions/src/vespa/CMakeLists.txt | 2 | ||||
-rw-r--r-- | configdefinitions/src/vespa/ranking-constants.def (renamed from searchcore/src/vespa/searchcore/config/ranking-constants.def) | 0 | ||||
-rw-r--r-- | model-evaluation/pom.xml | 5 | ||||
-rw-r--r-- | searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp | 2 | ||||
-rw-r--r-- | searchcore/src/main/java/com/yahoo/vespa/config/search/package-info.java | 7 | ||||
-rw-r--r-- | searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp | 2 | ||||
-rw-r--r-- | searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp | 2 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/config/CMakeLists.txt | 2 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/server/documentdbconfig.cpp | 2 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp | 2 |
10 files changed, 7 insertions, 19 deletions
diff --git a/configdefinitions/src/vespa/CMakeLists.txt b/configdefinitions/src/vespa/CMakeLists.txt index 0a7d4ef4381..94239f81bbe 100644 --- a/configdefinitions/src/vespa/CMakeLists.txt +++ b/configdefinitions/src/vespa/CMakeLists.txt @@ -44,6 +44,8 @@ vespa_generate_config(configdefinitions persistence.def) install_config_definition(persistence.def vespa.config.content.persistence.def) vespa_generate_config(configdefinitions rank-profiles.def) install_config_definition(rank-profiles.def vespa.config.search.rank-profiles.def) +vespa_generate_config(configdefinitions ranking-constants.def) +install_config_definition(ranking-constants.def vespa.config.search.core.ranking-constants.def) vespa_generate_config(configdefinitions routing.def) install_config_definition(routing.def cloud.config.routing.def) vespa_generate_config(configdefinitions routing-provider.def) diff --git a/searchcore/src/vespa/searchcore/config/ranking-constants.def b/configdefinitions/src/vespa/ranking-constants.def index 3b55eda3308..3b55eda3308 100644 --- a/searchcore/src/vespa/searchcore/config/ranking-constants.def +++ b/configdefinitions/src/vespa/ranking-constants.def diff --git a/model-evaluation/pom.xml b/model-evaluation/pom.xml index 328d475c501..edb22c1b529 100644 --- a/model-evaluation/pom.xml +++ b/model-evaluation/pom.xml @@ -40,11 +40,6 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>searchcore</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>config</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp b/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp index f60863ef0b0..4f2720718ff 100644 --- a/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp +++ b/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp @@ -4,6 +4,7 @@ #include <vespa/config-imported-fields.h> #include <vespa/config-indexschema.h> #include <vespa/config-rank-profiles.h> +#include <vespa/config-ranking-constants.h> #include <vespa/config/config.h> #include <vespa/config/helper/legacy.h> #include <vespa/config/common/exceptions.h> @@ -11,7 +12,6 @@ #include <vespa/eval/eval/value_cache/constant_value.h> #include <vespa/eval/tensor/default_tensor_engine.h> #include <vespa/searchcommon/common/schemaconfigurer.h> -#include <vespa/searchcore/config/config-ranking-constants.h> #include <vespa/searchcore/proton/matching/error_constant_value.h> #include <vespa/searchcore/proton/matching/indexenvironment.h> #include <vespa/searchlib/features/setup.h> diff --git a/searchcore/src/main/java/com/yahoo/vespa/config/search/package-info.java b/searchcore/src/main/java/com/yahoo/vespa/config/search/package-info.java deleted file mode 100644 index 0e739ec238c..00000000000 --- a/searchcore/src/main/java/com/yahoo/vespa/config/search/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -@ExportPackage -package com.yahoo.vespa.config.search; - -import com.yahoo.osgi.annotation.ExportPackage; - 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 2817ddb1b85..f2e5fa7c152 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 @@ -5,6 +5,7 @@ #include <vespa/config-imported-fields.h> #include <vespa/config-indexschema.h> #include <vespa/config-rank-profiles.h> +#include <vespa/config-ranking-constants.h> #include <vespa/config-summary.h> #include <vespa/config-summarymap.h> #include <vespa/document/repo/documenttyperepo.h> @@ -17,7 +18,6 @@ #include <vespa/searchcore/proton/server/i_proton_configurer.h> #include <vespa/searchcore/proton/common/hw_info.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 <vespa/config-bucketspaces.h> 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 dfb1268aaa6..e42016c9577 100644 --- a/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp +++ b/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp @@ -5,6 +5,7 @@ #include <vespa/config-imported-fields.h> #include <vespa/config-indexschema.h> #include <vespa/config-rank-profiles.h> +#include <vespa/config-ranking-constants.h> #include <vespa/config-summary.h> #include <vespa/config-summarymap.h> #include <vespa/document/repo/documenttyperepo.h> @@ -18,7 +19,6 @@ #include <vespa/searchcore/proton/server/i_proton_configurer_owner.h> #include <vespa/searchcore/proton/server/i_proton_disk_layout.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/config/CMakeLists.txt b/searchcore/src/vespa/searchcore/config/CMakeLists.txt index 3d62309161c..186c9b68d34 100644 --- a/searchcore/src/vespa/searchcore/config/CMakeLists.txt +++ b/searchcore/src/vespa/searchcore/config/CMakeLists.txt @@ -9,6 +9,4 @@ vespa_generate_config(searchcore_fconfig fdispatchrc.def) install_config_definition(fdispatchrc.def vespa.config.search.core.fdispatchrc.def) vespa_generate_config(searchcore_fconfig proton.def) install_config_definition(proton.def vespa.config.search.core.proton.def) -vespa_generate_config(searchcore_fconfig ranking-constants.def) -install_config_definition(ranking-constants.def vespa.config.search.core.ranking-constants.def) vespa_generate_config(searchcore_fconfig hwinfo.def) diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.cpp index fd1f9f1155d..b9a3d055cd1 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfig.cpp @@ -5,12 +5,12 @@ #include <vespa/config-imported-fields.h> #include <vespa/config-indexschema.h> #include <vespa/config-rank-profiles.h> +#include <vespa/config-ranking-constants.h> #include <vespa/config-summary.h> #include <vespa/config-summarymap.h> #include <vespa/searchsummary/config/config-juniperrc.h> #include <vespa/document/config/config-documenttypes.h> #include <vespa/document/repo/documenttyperepo.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/documentdbconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp index f2230215c3d..431f7554416 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp @@ -3,9 +3,9 @@ #include "documentdbconfigmanager.h" #include "bootstrapconfig.h" #include <vespa/searchcore/proton/common/hw_info.h> -#include <vespa/searchcore/config/config-ranking-constants.h> #include <vespa/config-imported-fields.h> #include <vespa/config-rank-profiles.h> +#include <vespa/config-ranking-constants.h> #include <vespa/config-summarymap.h> #include <vespa/config/file_acquirer/file_acquirer.h> #include <vespa/config/helper/legacy.h> |