From f6c4597346209ff4a4827aa64f3883f24ee27333 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Wed, 30 Aug 2017 09:26:38 +0200 Subject: version in def files are deprecated --- .../src/main/resources/configdefinitions/documentdb-info.def | 1 - container-search/src/main/resources/configdefinitions/emulation.def | 1 - container-search/src/main/resources/configdefinitions/federation.def | 1 - container-search/src/main/resources/configdefinitions/fs4.def | 1 - container-search/src/main/resources/configdefinitions/index-info.def | 1 - container-search/src/main/resources/configdefinitions/lowercasing.def | 1 - container-search/src/main/resources/configdefinitions/measure-qps.def | 1 - container-search/src/main/resources/configdefinitions/page-templates.def | 1 - container-search/src/main/resources/configdefinitions/provider.def | 1 - .../src/main/resources/configdefinitions/qr-binary-cache-region.def | 1 - .../src/main/resources/configdefinitions/qr-binary-cache.def | 1 - container-search/src/main/resources/configdefinitions/qr-monitor.def | 1 - container-search/src/main/resources/configdefinitions/qr-quotetable.def | 1 - container-search/src/main/resources/configdefinitions/query-profiles.def | 1 - container-search/src/main/resources/configdefinitions/resolvers.def | 1 - container-search/src/main/resources/configdefinitions/rewrites.def | 1 - .../main/resources/configdefinitions/search-with-renderer-handler.def | 1 - .../src/main/resources/configdefinitions/searchchain-forward.def | 1 - container-search/src/main/resources/configdefinitions/semantic-rules.def | 1 - .../src/main/resources/configdefinitions/strict-contracts.def | 1 - .../src/main/resources/configdefinitions/timing-searcher.def | 1 - container-search/src/test/vespa-configdef/int.def | 1 - container-search/src/test/vespa-configdef/string.def | 1 - 23 files changed, 23 deletions(-) (limited to 'container-search/src') diff --git a/container-search/src/main/resources/configdefinitions/documentdb-info.def b/container-search/src/main/resources/configdefinitions/documentdb-info.def index af010f1c161..76096b4a6f7 100644 --- a/container-search/src/main/resources/configdefinitions/documentdb-info.def +++ b/container-search/src/main/resources/configdefinitions/documentdb-info.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 namespace=prelude.fastsearch ## The name of the search definition that this document database info applies to diff --git a/container-search/src/main/resources/configdefinitions/emulation.def b/container-search/src/main/resources/configdefinitions/emulation.def index 26dedb77b69..70d2d4954a4 100644 --- a/container-search/src/main/resources/configdefinitions/emulation.def +++ b/container-search/src/main/resources/configdefinitions/emulation.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 namespace=prelude ## Keep emulating old (4.2, 5.0, early 5.1) string type fields for structured data diff --git a/container-search/src/main/resources/configdefinitions/federation.def b/container-search/src/main/resources/configdefinitions/federation.def index da9846d5246..36eb5d4b4c8 100644 --- a/container-search/src/main/resources/configdefinitions/federation.def +++ b/container-search/src/main/resources/configdefinitions/federation.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=7 namespace=search.federation target[].id string diff --git a/container-search/src/main/resources/configdefinitions/fs4.def b/container-search/src/main/resources/configdefinitions/fs4.def index a4af65bef02..d0c68540071 100644 --- a/container-search/src/main/resources/configdefinitions/fs4.def +++ b/container-search/src/main/resources/configdefinitions/fs4.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 namespace=container.search ##Number of listener threads diff --git a/container-search/src/main/resources/configdefinitions/index-info.def b/container-search/src/main/resources/configdefinitions/index-info.def index c329b0de1cc..f3b905d4d0a 100644 --- a/container-search/src/main/resources/configdefinitions/index-info.def +++ b/container-search/src/main/resources/configdefinitions/index-info.def @@ -1,6 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. ## Commands per search definition to be applied to query terms per index before searching -version=2 namespace=search.config ## The name of the search definition this index info applies to diff --git a/container-search/src/main/resources/configdefinitions/lowercasing.def b/container-search/src/main/resources/configdefinitions/lowercasing.def index 521b7624660..b656c451e11 100644 --- a/container-search/src/main/resources/configdefinitions/lowercasing.def +++ b/container-search/src/main/resources/configdefinitions/lowercasing.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 namespace=search.querytransform transform_weighted_sets bool default=true diff --git a/container-search/src/main/resources/configdefinitions/measure-qps.def b/container-search/src/main/resources/configdefinitions/measure-qps.def index b146002cab5..c8b38b9db6e 100644 --- a/container-search/src/main/resources/configdefinitions/measure-qps.def +++ b/container-search/src/main/resources/configdefinitions/measure-qps.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 namespace=search.statistics ## Configure measurements of peak QPS rates. diff --git a/container-search/src/main/resources/configdefinitions/page-templates.def b/container-search/src/main/resources/configdefinitions/page-templates.def index e69bc9c223c..31ec7644d18 100644 --- a/container-search/src/main/resources/configdefinitions/page-templates.def +++ b/container-search/src/main/resources/configdefinitions/page-templates.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 namespace=search.pagetemplates # The xml content of a page template diff --git a/container-search/src/main/resources/configdefinitions/provider.def b/container-search/src/main/resources/configdefinitions/provider.def index 6b23d47427d..79b09913b49 100644 --- a/container-search/src/main/resources/configdefinitions/provider.def +++ b/container-search/src/main/resources/configdefinitions/provider.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=16 namespace=search.federation node[].host string diff --git a/container-search/src/main/resources/configdefinitions/qr-binary-cache-region.def b/container-search/src/main/resources/configdefinitions/qr-binary-cache-region.def index eb7183bff40..ba2b6ed7802 100644 --- a/container-search/src/main/resources/configdefinitions/qr-binary-cache-region.def +++ b/container-search/src/main/resources/configdefinitions/qr-binary-cache-region.def @@ -1,7 +1,6 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # TODO: Not in use - remove on Vespa 7 -version=4 namespace=search.cache # size of the region (in MB). Cache size (in qr-binary-cache.cfg) diff --git a/container-search/src/main/resources/configdefinitions/qr-binary-cache.def b/container-search/src/main/resources/configdefinitions/qr-binary-cache.def index 0df80d7e520..917832e86fe 100644 --- a/container-search/src/main/resources/configdefinitions/qr-binary-cache.def +++ b/container-search/src/main/resources/configdefinitions/qr-binary-cache.def @@ -1,7 +1,6 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # TODO: Not in use - remove on Vespa 7 -version=3 namespace=search.cache # Size of a block in cache. A block is the smallest unit that would diff --git a/container-search/src/main/resources/configdefinitions/qr-monitor.def b/container-search/src/main/resources/configdefinitions/qr-monitor.def index 931e62049d2..2c4ff3c6167 100644 --- a/container-search/src/main/resources/configdefinitions/qr-monitor.def +++ b/container-search/src/main/resources/configdefinitions/qr-monitor.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=4 namespace=prelude.cluster ## The number of milliseconds to attempt to complete a request before diff --git a/container-search/src/main/resources/configdefinitions/qr-quotetable.def b/container-search/src/main/resources/configdefinitions/qr-quotetable.def index e387d9dc732..40979ad2a35 100644 --- a/container-search/src/main/resources/configdefinitions/qr-quotetable.def +++ b/container-search/src/main/resources/configdefinitions/qr-quotetable.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 namespace=prelude.searcher ## The ordinal number of the character to quote in UNICODE. diff --git a/container-search/src/main/resources/configdefinitions/query-profiles.def b/container-search/src/main/resources/configdefinitions/query-profiles.def index 75b3f122b0a..20fcbda0d72 100644 --- a/container-search/src/main/resources/configdefinitions/query-profiles.def +++ b/container-search/src/main/resources/configdefinitions/query-profiles.def @@ -2,7 +2,6 @@ # Query profiles and their types - a query profile is a nested composite of query parameters with an id # A set of query parameters can be fetched from a query profile rather than being # submitted explicitly. -version=4 namespace=search.query.profile.config # The id of this query profile. The id has the form name(:version)? diff --git a/container-search/src/main/resources/configdefinitions/resolvers.def b/container-search/src/main/resources/configdefinitions/resolvers.def index 87b7a8b84df..6003fdf81f1 100644 --- a/container-search/src/main/resources/configdefinitions/resolvers.def +++ b/container-search/src/main/resources/configdefinitions/resolvers.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 namespace=search.pagetemplates ## A list of resolver components used by com.yahoo.search.PageTemplateSearcher diff --git a/container-search/src/main/resources/configdefinitions/rewrites.def b/container-search/src/main/resources/configdefinitions/rewrites.def index 0179057029f..ecca422342a 100644 --- a/container-search/src/main/resources/configdefinitions/rewrites.def +++ b/container-search/src/main/resources/configdefinitions/rewrites.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 namespace=search.query.rewrite fsaDict[].name string diff --git a/container-search/src/main/resources/configdefinitions/search-with-renderer-handler.def b/container-search/src/main/resources/configdefinitions/search-with-renderer-handler.def index 1c489f39ed9..a34e08a1c82 100644 --- a/container-search/src/main/resources/configdefinitions/search-with-renderer-handler.def +++ b/container-search/src/main/resources/configdefinitions/search-with-renderer-handler.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 namespace=search.handler rendererId string diff --git a/container-search/src/main/resources/configdefinitions/searchchain-forward.def b/container-search/src/main/resources/configdefinitions/searchchain-forward.def index dd66acb2e57..0e86490e120 100644 --- a/container-search/src/main/resources/configdefinitions/searchchain-forward.def +++ b/container-search/src/main/resources/configdefinitions/searchchain-forward.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 namespace=search.federation ## A searcher forwarding the incoming query to a single search chain and diff --git a/container-search/src/main/resources/configdefinitions/semantic-rules.def b/container-search/src/main/resources/configdefinitions/semantic-rules.def index 4212e20fcc1..5ac0cca7ff6 100644 --- a/container-search/src/main/resources/configdefinitions/semantic-rules.def +++ b/container-search/src/main/resources/configdefinitions/semantic-rules.def @@ -1,6 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Semantic production rules -version=2 namespace=prelude.semantics # Whether we should use these rule bases in pre-Vespa 2.2 compatibility mode diff --git a/container-search/src/main/resources/configdefinitions/strict-contracts.def b/container-search/src/main/resources/configdefinitions/strict-contracts.def index f7af59792ae..f9dd788c054 100644 --- a/container-search/src/main/resources/configdefinitions/strict-contracts.def +++ b/container-search/src/main/resources/configdefinitions/strict-contracts.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=2 namespace=search.federation ## A config to control whether to activate strict adherence to public contracts diff --git a/container-search/src/main/resources/configdefinitions/timing-searcher.def b/container-search/src/main/resources/configdefinitions/timing-searcher.def index 254d7c5b5bb..7c2b698bdb0 100644 --- a/container-search/src/main/resources/configdefinitions/timing-searcher.def +++ b/container-search/src/main/resources/configdefinitions/timing-searcher.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 namespace=search.statistics timer[].name string diff --git a/container-search/src/test/vespa-configdef/int.def b/container-search/src/test/vespa-configdef/int.def index 895a5e0de68..b526a956b5c 100644 --- a/container-search/src/test/vespa-configdef/int.def +++ b/container-search/src/test/vespa-configdef/int.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 namespace=config.search diff --git a/container-search/src/test/vespa-configdef/string.def b/container-search/src/test/vespa-configdef/string.def index c3ee208f633..4b39de61e0a 100644 --- a/container-search/src/test/vespa-configdef/string.def +++ b/container-search/src/test/vespa-configdef/string.def @@ -1,5 +1,4 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 namespace=config.search -- cgit v1.2.3