From 9b948718144e5d556cc6ea49d2ff6bbf05f00b0e Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Thu, 10 Sep 2020 19:54:48 +0200 Subject: Use full name in config definition file names --- .../main/resources/configdefinitions/cluster.def | 28 ------- .../configdefinitions/container.search.fs4.def | 5 ++ .../configdefinitions/documentdb-info.def | 21 ----- .../main/resources/configdefinitions/emulation.def | 8 -- .../resources/configdefinitions/federation.def | 17 ---- .../src/main/resources/configdefinitions/fs4.def | 5 -- .../resources/configdefinitions/index-info.def | 16 ---- .../main/resources/configdefinitions/keyvalue.def | 20 ----- .../resources/configdefinitions/lowercasing.def | 4 - .../resources/configdefinitions/measure-qps.def | 16 ---- .../resources/configdefinitions/page-templates.def | 5 -- .../prelude.cluster.qr-monitor.def | 6 ++ .../configdefinitions/prelude.emulation.def | 8 ++ .../prelude.fastsearch.documentdb-info.def | 21 +++++ .../prelude.searcher.keyvalue.def | 20 +++++ .../prelude.searcher.qr-quotetable.def | 7 ++ .../prelude.semantics.semantic-rules.def | 22 +++++ .../main/resources/configdefinitions/provider.def | 43 ---------- .../resources/configdefinitions/qr-monitor.def | 6 -- .../resources/configdefinitions/qr-quotetable.def | 7 -- .../main/resources/configdefinitions/qr-start.def | 50 ------------ .../resources/configdefinitions/query-profiles.def | 93 ---------------------- .../resources/configdefinitions/rate-limiting.def | 19 ----- .../main/resources/configdefinitions/resolvers.def | 16 ---- .../main/resources/configdefinitions/rewrites.def | 5 -- .../search-with-renderer-handler.def | 4 - .../configdefinitions/search.config.cluster.def | 28 +++++++ .../configdefinitions/search.config.index-info.def | 16 ++++ .../configdefinitions/search.config.qr-start.def | 50 ++++++++++++ .../search.config.rate-limiting.def | 19 +++++ .../search.federation.federation.def | 17 ++++ .../search.federation.provider.def | 43 ++++++++++ .../search.federation.searchchain-forward.def | 8 ++ .../search.federation.strict-contracts.def | 20 +++++ ...search.handler.search-with-renderer-handler.def | 4 + .../search.pagetemplates.page-templates.def | 5 ++ .../search.pagetemplates.resolvers.def | 16 ++++ .../search.query.profile.config.query-profiles.def | 93 ++++++++++++++++++++++ .../search.query.rewrite.rewrites.def | 5 ++ .../search.querytransform.lowercasing.def | 4 + .../search.statistics.measure-qps.def | 16 ++++ .../search.statistics.timing-searcher.def | 7 ++ .../configdefinitions/searchchain-forward.def | 8 -- .../resources/configdefinitions/semantic-rules.def | 22 ----- .../configdefinitions/strict-contracts.def | 20 ----- .../configdefinitions/timing-searcher.def | 7 -- 46 files changed, 440 insertions(+), 440 deletions(-) delete mode 100644 container-search/src/main/resources/configdefinitions/cluster.def create mode 100644 container-search/src/main/resources/configdefinitions/container.search.fs4.def delete mode 100644 container-search/src/main/resources/configdefinitions/documentdb-info.def delete mode 100644 container-search/src/main/resources/configdefinitions/emulation.def delete mode 100644 container-search/src/main/resources/configdefinitions/federation.def delete mode 100644 container-search/src/main/resources/configdefinitions/fs4.def delete mode 100644 container-search/src/main/resources/configdefinitions/index-info.def delete mode 100644 container-search/src/main/resources/configdefinitions/keyvalue.def delete mode 100644 container-search/src/main/resources/configdefinitions/lowercasing.def delete mode 100644 container-search/src/main/resources/configdefinitions/measure-qps.def delete mode 100644 container-search/src/main/resources/configdefinitions/page-templates.def create mode 100644 container-search/src/main/resources/configdefinitions/prelude.cluster.qr-monitor.def create mode 100644 container-search/src/main/resources/configdefinitions/prelude.emulation.def create mode 100644 container-search/src/main/resources/configdefinitions/prelude.fastsearch.documentdb-info.def create mode 100644 container-search/src/main/resources/configdefinitions/prelude.searcher.keyvalue.def create mode 100644 container-search/src/main/resources/configdefinitions/prelude.searcher.qr-quotetable.def create mode 100644 container-search/src/main/resources/configdefinitions/prelude.semantics.semantic-rules.def delete mode 100644 container-search/src/main/resources/configdefinitions/provider.def delete mode 100644 container-search/src/main/resources/configdefinitions/qr-monitor.def delete mode 100644 container-search/src/main/resources/configdefinitions/qr-quotetable.def delete mode 100644 container-search/src/main/resources/configdefinitions/qr-start.def delete mode 100644 container-search/src/main/resources/configdefinitions/query-profiles.def delete mode 100644 container-search/src/main/resources/configdefinitions/rate-limiting.def delete mode 100644 container-search/src/main/resources/configdefinitions/resolvers.def delete mode 100644 container-search/src/main/resources/configdefinitions/rewrites.def delete mode 100644 container-search/src/main/resources/configdefinitions/search-with-renderer-handler.def create mode 100644 container-search/src/main/resources/configdefinitions/search.config.cluster.def create mode 100644 container-search/src/main/resources/configdefinitions/search.config.index-info.def create mode 100644 container-search/src/main/resources/configdefinitions/search.config.qr-start.def create mode 100644 container-search/src/main/resources/configdefinitions/search.config.rate-limiting.def create mode 100644 container-search/src/main/resources/configdefinitions/search.federation.federation.def create mode 100644 container-search/src/main/resources/configdefinitions/search.federation.provider.def create mode 100644 container-search/src/main/resources/configdefinitions/search.federation.searchchain-forward.def create mode 100644 container-search/src/main/resources/configdefinitions/search.federation.strict-contracts.def create mode 100644 container-search/src/main/resources/configdefinitions/search.handler.search-with-renderer-handler.def create mode 100644 container-search/src/main/resources/configdefinitions/search.pagetemplates.page-templates.def create mode 100644 container-search/src/main/resources/configdefinitions/search.pagetemplates.resolvers.def create mode 100644 container-search/src/main/resources/configdefinitions/search.query.profile.config.query-profiles.def create mode 100644 container-search/src/main/resources/configdefinitions/search.query.rewrite.rewrites.def create mode 100644 container-search/src/main/resources/configdefinitions/search.querytransform.lowercasing.def create mode 100644 container-search/src/main/resources/configdefinitions/search.statistics.measure-qps.def create mode 100644 container-search/src/main/resources/configdefinitions/search.statistics.timing-searcher.def delete mode 100644 container-search/src/main/resources/configdefinitions/searchchain-forward.def delete mode 100644 container-search/src/main/resources/configdefinitions/semantic-rules.def delete mode 100644 container-search/src/main/resources/configdefinitions/strict-contracts.def delete mode 100644 container-search/src/main/resources/configdefinitions/timing-searcher.def (limited to 'container-search/src/main/resources') diff --git a/container-search/src/main/resources/configdefinitions/cluster.def b/container-search/src/main/resources/configdefinitions/cluster.def deleted file mode 100644 index 52eca7ef753..00000000000 --- a/container-search/src/main/resources/configdefinitions/cluster.def +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=search.config - -#The id of the cluster (as specified in qr-searchers) -#Note: Use clusterName where possible instead -clusterId int default=0 - -#Internal searcher cache. Size is measured in megabytes of raw packet -#size. Hits larger than 1% of total cache size will not be cached. -cacheSize int default=1 - -#Timeout for internal searcher cache. Entries older than this number -#of seconds will be removed from cache. 0 or less means the cache is -#disabled. -cacheTimeout double default=0 - -#Whether or not to try another TLD if the current request fails. -failoverToRemote bool default=false - -#The name of the cluster (as specified in qr-searchers) -clusterName string - -#The maximum query timeout for this cluster in seconds (default 10 minutes) -maxQueryTimeout double default=600 - -#The maximum query timeout allowed before disabling the backend query cache for the given query (default 10 seconds). -#Note that the query timeout is used as the query cache timeout in the backend if enabled. -maxQueryCacheTimeout double default=10 diff --git a/container-search/src/main/resources/configdefinitions/container.search.fs4.def b/container-search/src/main/resources/configdefinitions/container.search.fs4.def new file mode 100644 index 00000000000..9562cfa75bd --- /dev/null +++ b/container-search/src/main/resources/configdefinitions/container.search.fs4.def @@ -0,0 +1,5 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=container.search + +##Number of listener threads +numlistenerthreads int default=8 diff --git a/container-search/src/main/resources/configdefinitions/documentdb-info.def b/container-search/src/main/resources/configdefinitions/documentdb-info.def deleted file mode 100644 index 76096b4a6f7..00000000000 --- a/container-search/src/main/resources/configdefinitions/documentdb-info.def +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=prelude.fastsearch - -## The name of the search definition that this document database info applies to -documentdb[].name string - -## The id of the summary class -documentdb[].summaryclass[].id int -## The name of the summary class -documentdb[].summaryclass[].name string -## The name of a field in the summary class -documentdb[].summaryclass[].fields[].name string -## The type of a field in the summary class -documentdb[].summaryclass[].fields[].type string -## Whether this field is a dynamic snippet -documentdb[].summaryclass[].fields[].dynamic bool default=false - -## Information about rank profiles -documentdb[].rankprofile[].name string -documentdb[].rankprofile[].hasSummaryFeatures bool default=true -documentdb[].rankprofile[].hasRankFeatures bool default=true diff --git a/container-search/src/main/resources/configdefinitions/emulation.def b/container-search/src/main/resources/configdefinitions/emulation.def deleted file mode 100644 index 70d2d4954a4..00000000000 --- a/container-search/src/main/resources/configdefinitions/emulation.def +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=prelude - -## Keep emulating old (4.2, 5.0, early 5.1) string type fields for structured data -stringbackedstructs bool default=true - -## Keep emulating old (4.2, 5.0, early 5.1) string type fields for summaryfeatures / rankfeatures fields -stringbackedfeatures bool default=true diff --git a/container-search/src/main/resources/configdefinitions/federation.def b/container-search/src/main/resources/configdefinitions/federation.def deleted file mode 100644 index 36eb5d4b4c8..00000000000 --- a/container-search/src/main/resources/configdefinitions/federation.def +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=search.federation - -target[].id string -target[].useByDefault bool default=false - -#the component id of the chain used for federation. -target[].searchChain[].searchChainId string -target[].searchChain[].timeoutMillis int default=-1 -target[].searchChain[].requestTimeoutMillis int default=-1 -target[].searchChain[].optional bool default=false -target[].searchChain[].useByDefault bool default=false -#if non-empty, this is a provider for the source target[].name -target[].searchChain[].providerId string default="" -target[].searchChain[].documentTypes[] string - -targetSelector string default="" diff --git a/container-search/src/main/resources/configdefinitions/fs4.def b/container-search/src/main/resources/configdefinitions/fs4.def deleted file mode 100644 index 9562cfa75bd..00000000000 --- a/container-search/src/main/resources/configdefinitions/fs4.def +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=container.search - -##Number of listener threads -numlistenerthreads int default=8 diff --git a/container-search/src/main/resources/configdefinitions/index-info.def b/container-search/src/main/resources/configdefinitions/index-info.def deleted file mode 100644 index f3b905d4d0a..00000000000 --- a/container-search/src/main/resources/configdefinitions/index-info.def +++ /dev/null @@ -1,16 +0,0 @@ -# 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 -namespace=search.config - -## The name of the search definition this index info applies to -indexinfo[].name string - -## The name of a index for which we have a command -indexinfo[].command[].indexname string -## The command, e.g. "lowercase", "word" or "rise" -indexinfo[].command[].command string - -## The name of an alias for an index or attribute -indexinfo[].alias[].alias string -## The index name that the alias should map to -indexinfo[].alias[].indexname string diff --git a/container-search/src/main/resources/configdefinitions/keyvalue.def b/container-search/src/main/resources/configdefinitions/keyvalue.def deleted file mode 100644 index 95153708aa2..00000000000 --- a/container-search/src/main/resources/configdefinitions/keyvalue.def +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=prelude.searcher - -# The doc id scheme to use. -docIdScheme enum { DOC_SCHEME, ID_SCHEME } default=ID_SCHEME - -# Number of partitions in search cluster -numparts int - -# Number of rows in search cluster -numrows int default=1 - -# Which summary to request for each key -summaryName string - -# Document ID namespace -docIdNameSpace string - -# Document id type (only necessary if -docIdType string default="" diff --git a/container-search/src/main/resources/configdefinitions/lowercasing.def b/container-search/src/main/resources/configdefinitions/lowercasing.def deleted file mode 100644 index b656c451e11..00000000000 --- a/container-search/src/main/resources/configdefinitions/lowercasing.def +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -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 deleted file mode 100644 index c8b38b9db6e..00000000000 --- a/container-search/src/main/resources/configdefinitions/measure-qps.def +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=search.statistics - -## Configure measurements of peak QPS rates. - -## Control whether com.yahoo.search.statistics.PeakQpsSearcher -## should emit data through statistics framework or as a meta hit. -outputmethod enum { STATISTICS, METAHIT } default=STATISTICS - -## If using meta hits, which query property should trigger sampling -queryproperty string default="fetchpeakqps" - -## The base name for the statistics event. Default is the component name -## of the searcher, as defined in vespa-services, with dots replaced by -## underscore. -eventname string default="" diff --git a/container-search/src/main/resources/configdefinitions/page-templates.def b/container-search/src/main/resources/configdefinitions/page-templates.def deleted file mode 100644 index 31ec7644d18..00000000000 --- a/container-search/src/main/resources/configdefinitions/page-templates.def +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=search.pagetemplates - -# The xml content of a page template -page[] string diff --git a/container-search/src/main/resources/configdefinitions/prelude.cluster.qr-monitor.def b/container-search/src/main/resources/configdefinitions/prelude.cluster.qr-monitor.def new file mode 100644 index 00000000000..2c4ff3c6167 --- /dev/null +++ b/container-search/src/main/resources/configdefinitions/prelude.cluster.qr-monitor.def @@ -0,0 +1,6 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=prelude.cluster + +## The number of milliseconds to attempt to complete a request before +## giving up, including nodetimeout. +requesttimeout int default=5000 diff --git a/container-search/src/main/resources/configdefinitions/prelude.emulation.def b/container-search/src/main/resources/configdefinitions/prelude.emulation.def new file mode 100644 index 00000000000..70d2d4954a4 --- /dev/null +++ b/container-search/src/main/resources/configdefinitions/prelude.emulation.def @@ -0,0 +1,8 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=prelude + +## Keep emulating old (4.2, 5.0, early 5.1) string type fields for structured data +stringbackedstructs bool default=true + +## Keep emulating old (4.2, 5.0, early 5.1) string type fields for summaryfeatures / rankfeatures fields +stringbackedfeatures bool default=true diff --git a/container-search/src/main/resources/configdefinitions/prelude.fastsearch.documentdb-info.def b/container-search/src/main/resources/configdefinitions/prelude.fastsearch.documentdb-info.def new file mode 100644 index 00000000000..76096b4a6f7 --- /dev/null +++ b/container-search/src/main/resources/configdefinitions/prelude.fastsearch.documentdb-info.def @@ -0,0 +1,21 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=prelude.fastsearch + +## The name of the search definition that this document database info applies to +documentdb[].name string + +## The id of the summary class +documentdb[].summaryclass[].id int +## The name of the summary class +documentdb[].summaryclass[].name string +## The name of a field in the summary class +documentdb[].summaryclass[].fields[].name string +## The type of a field in the summary class +documentdb[].summaryclass[].fields[].type string +## Whether this field is a dynamic snippet +documentdb[].summaryclass[].fields[].dynamic bool default=false + +## Information about rank profiles +documentdb[].rankprofile[].name string +documentdb[].rankprofile[].hasSummaryFeatures bool default=true +documentdb[].rankprofile[].hasRankFeatures bool default=true diff --git a/container-search/src/main/resources/configdefinitions/prelude.searcher.keyvalue.def b/container-search/src/main/resources/configdefinitions/prelude.searcher.keyvalue.def new file mode 100644 index 00000000000..95153708aa2 --- /dev/null +++ b/container-search/src/main/resources/configdefinitions/prelude.searcher.keyvalue.def @@ -0,0 +1,20 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=prelude.searcher + +# The doc id scheme to use. +docIdScheme enum { DOC_SCHEME, ID_SCHEME } default=ID_SCHEME + +# Number of partitions in search cluster +numparts int + +# Number of rows in search cluster +numrows int default=1 + +# Which summary to request for each key +summaryName string + +# Document ID namespace +docIdNameSpace string + +# Document id type (only necessary if +docIdType string default="" diff --git a/container-search/src/main/resources/configdefinitions/prelude.searcher.qr-quotetable.def b/container-search/src/main/resources/configdefinitions/prelude.searcher.qr-quotetable.def new file mode 100644 index 00000000000..40979ad2a35 --- /dev/null +++ b/container-search/src/main/resources/configdefinitions/prelude.searcher.qr-quotetable.def @@ -0,0 +1,7 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=prelude.searcher + +## The ordinal number of the character to quote in UNICODE. +character[].ordinal int +## The string to translate a character to. +character[].quoting string diff --git a/container-search/src/main/resources/configdefinitions/prelude.semantics.semantic-rules.def b/container-search/src/main/resources/configdefinitions/prelude.semantics.semantic-rules.def new file mode 100644 index 00000000000..5ac0cca7ff6 --- /dev/null +++ b/container-search/src/main/resources/configdefinitions/prelude.semantics.semantic-rules.def @@ -0,0 +1,22 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Semantic production rules +namespace=prelude.semantics + +# Whether we should use these rule bases in pre-Vespa 2.2 compatibility mode +compatibility bool default=false + +# The name of a rule base +rulebase[].name string + +# Whether this rule base is the default, to be used on all queries +# not specifying rules +rulebase[].isdefault bool default=false + +# The automata file to use to look up condition references +# not defined in the rule base. The automata file must be present +# on all nodes getting this configuration +rulebase[].automata string default="" + +# The rules +rulebase[].rules string + diff --git a/container-search/src/main/resources/configdefinitions/provider.def b/container-search/src/main/resources/configdefinitions/provider.def deleted file mode 100644 index f9ab305b114..00000000000 --- a/container-search/src/main/resources/configdefinitions/provider.def +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=search.federation - -node[].host string -node[].port int -path string default="" -maxConnections int default=10000 -maxConnectionPerRoute int default=10000 -socketBufferBytes int default=8192 -retries int default=1 -## Timeout for blocking IO calls in HTTP client. -## Unit is seconds, default value is -## in com.yahoo.search.federation.http.HTTPParameters. -readTimeout double default=-1.0 -## The timeout until a connection is etablished. -## Unit is seconds, default value is -## in com.yahoo.search.federation.http.HTTPParameters. -connectionTimeout double default=-1.0 -## Timeout when retrieving a connection from the connection manager. -## Unit is seconds, default value is -## in com.yahoo.search.federation.http.HTTPParameters. -connectionPoolTimeout double default=-1.0 -## Certificate store proxy host -yca.host string default="yca.host must be set explicitly" -## Certificate store proxy port -yca.port int default=3128 -## Whether a proxy is needed (i.e. should the proxy settings be used) -yca.useProxy bool default=false -yca.applicationId string default="" -## TTL to use in the certificate cache. 0 means use default cache behavior. -## Unit is seconds. -yca.ttl int default=0 -## How often to retry direct cert DB access if no certificate is found, -## i.e. the cache TTL for null entries. Unit is seconds. -yca.retry int default=0 - -# The form of the serialized query. -queryType enum { LEGACY, PROGRAMMATIC, YQL, SELECT } default=LEGACY - -# How to do pinging against a backend. -pingOption enum { DISABLE, NORMAL, YCA } default=NORMAL - -followRedirects bool default=true diff --git a/container-search/src/main/resources/configdefinitions/qr-monitor.def b/container-search/src/main/resources/configdefinitions/qr-monitor.def deleted file mode 100644 index 2c4ff3c6167..00000000000 --- a/container-search/src/main/resources/configdefinitions/qr-monitor.def +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=prelude.cluster - -## The number of milliseconds to attempt to complete a request before -## giving up, including nodetimeout. -requesttimeout int default=5000 diff --git a/container-search/src/main/resources/configdefinitions/qr-quotetable.def b/container-search/src/main/resources/configdefinitions/qr-quotetable.def deleted file mode 100644 index 40979ad2a35..00000000000 --- a/container-search/src/main/resources/configdefinitions/qr-quotetable.def +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=prelude.searcher - -## The ordinal number of the character to quote in UNICODE. -character[].ordinal int -## The string to translate a character to. -character[].quoting string diff --git a/container-search/src/main/resources/configdefinitions/qr-start.def b/container-search/src/main/resources/configdefinitions/qr-start.def deleted file mode 100644 index 95e9d4575dd..00000000000 --- a/container-search/src/main/resources/configdefinitions/qr-start.def +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -# Do update the start script with the new name if you change it: -namespace=search.config - -## Server or client VM -jvm.server bool default=true restart - -## Debug logging of Garbage Collection -jvm.verbosegc bool default=true restart - -## Garbage Collection tuning parameters -jvm.gcopts string default="-XX:+UseG1GC -XX:MaxTenuringThreshold=15 -XX:NewRatio=1" restart - -## Heap size (in megabytes) for the Java VM -jvm.heapsize int default=1536 restart - -## Min heapsize (in megabytes) for the Java VM -jvm.minHeapsize int default=1536 restart - -## Stack size (in kilobytes) -jvm.stacksize int default=512 restart - -## CompressedOOps size in megabytes -jvm.compressedClassSpaceSize int default=32 restart - -## Base value of maximum direct memory size (in megabytes) -jvm.baseMaxDirectMemorySize int default=75 restart - -## Amount of direct memory used for caching. (in megabytes) -jvm.directMemorySizeCache int default=0 restart - -## Set heap size as this percentage of available RAM, instead of absolute -## value above. Setting outside [1, 99] disables this setting. -jvm.heapSizeAsPercentageOfPhysicalMemory int default=0 restart - -## Number of processors available, can be used to set -XX:ActiveProcessorCount if set to non-zero. -## In that case will be the number returned by the JVM when calling Runtime.getRuntime().availableProcessors() -jvm.availableProcessors int default=0 restart - -## Extra environment variables -qrs.env string default="" restart - -## Set ulimit -v in start script? this is mainly a safeguard against JNI stuff leaking memory. -ulimitv string default="" restart - -## Extra class path entries, forwarded to vespa-start-container_daemon. Overrides the corresponding env setting. -jdisc.classpath_extra string default="" restart - -## Extra export packages entries, forwarded to vespa-start-container_daemon. Overrides the corresponding env setting. -jdisc.export_packages string default="" restart diff --git a/container-search/src/main/resources/configdefinitions/query-profiles.def b/container-search/src/main/resources/configdefinitions/query-profiles.def deleted file mode 100644 index 3c6d11e2944..00000000000 --- a/container-search/src/main/resources/configdefinitions/query-profiles.def +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -# 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. -namespace=search.query.profile.config - -# The id of this query profile. The id has the form name(:version)? -# where the version has the form 1(.2(.3(.identifier)?)?)?. -# The default query profile (if any) must be called "default". -queryprofile[].id string - -# The (optional) type of this query profile, an id string -# If no type is given, all values are legal -queryprofile[].type string default="" - -# The optional list of query profiles this inherits, by id. -# The id's has the form name(:version)? -# where the version has the form 1(.2(.3(.identifier)?)?)?. -# If the version is not specified the newest version found is used. -queryprofile[].inherit[] string - -# The dimensions over which this profile may vary, if any -queryprofile[].dimensions[] string - -# A property name. Note that names containing dots will create implicit query profile -# sub-instances. These instances will completely override instances in super-profiles -# even if they don't set all the values of the super-instance -queryprofile[].property[].name string -# The property value -queryprofile[].property[].value string -# Whether the value is overridable in the request or by a programmatic setting: "true", "false" or "" -# which means take the value from any inherited profile or the type -queryprofile[].property[].overridable string default="" - -# A reference name to another query profile -queryprofile[].reference[].name string -# The id of the referenced profile, the version part may be missing -# or underspecified as usual -queryprofile[].reference[].value string -# Whether the value is overridable in the request or by a programmatic setting: "true", "false" or "" -# which means take the value from any inherited profile or the type -queryprofile[].reference[].overridable string default="" - -# A variant of this (top level) profile for some value of its dimensions -queryprofile[].queryprofilevariant[].fordimensionvalues[] string -# The optional list of query profiles this variant inherits, by id. -# The id's has the form name(:version)? -# where the version has the form 1(.2(.3(.identifier)?)?)?. -# If the version is not specified the newest version found is used. -queryprofile[].queryprofilevariant[].inherit[] string -# Content of profile variant -queryprofile[].queryprofilevariant[].property[].name string -# Content of profile variant -queryprofile[].queryprofilevariant[].property[].value string -# Content of profile variant -queryprofile[].queryprofilevariant[].reference[].name string -# Content of profile variant -queryprofile[].queryprofilevariant[].reference[].value string - -# A query profile type defines the values of instance query profiles. -# The id follows the same rules as for query profiles -queryprofiletype[].id string - -# If this is strict, non-declared values can not be set in a query profile of this type nor -# in the request or by a programmatic call -queryprofiletype[].strict bool default=false - -# With this set to true, requests for query profile instances of this type will be matched as path names -queryprofiletype[].matchaspath bool default=false - -# The optional list of query profile types this inherits, by id. -# The id's has the form name(:version)? -# where the version has the form 1(.2(.3(.identifier)?)?)?. -# If the version is not specified the newest version found is used. -queryprofiletype[].inherit[] string - -# Declaration of a field -queryprofiletype[].field[].name string -# The type of the field, a primitive, query-profile or query-profile:id to declare a reference -# which is untyped or typed, respectively -queryprofiletype[].field[].type string -# Whether values of this is overridable in the request or by a programmatic setting -queryprofiletype[].field[].overridable bool default=true -# Whether this must be present in the query profile or the request for this to be valid -queryprofiletype[].field[].mandatory bool default=false -# A space-separated list of aliases of this field name. Aliases are case insensitive -queryprofiletype[].field[].alias string default="" - -# TODO Remove once no longer used by old config models -enableGroupingSessionCache bool default=true - - - diff --git a/container-search/src/main/resources/configdefinitions/rate-limiting.def b/container-search/src/main/resources/configdefinitions/rate-limiting.def deleted file mode 100644 index 23235617f8c..00000000000 --- a/container-search/src/main/resources/configdefinitions/rate-limiting.def +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -# Configuration of the rate limiting algorithm -namespace=search.config - -# How much additional capacity to assign to a thread each time it has run out. -# A higher number means less thread contention and less accuracy -capacityIncrement double default=1000 - -# The max capacity which will ever (and initially) be available to requesting threads on one node -# A higher number means we'll be less sensitive to intermittent overlap -# A good number may be capacityIncrement * 10 -maxAvailableCapacity double default=10000 - -# The probability per request that we check for more quota when we have run out. -# A higher number means less probability of rejecting a request unnecessarily -# but also more thread contention. -# A good number may be 1 / (maxAvailableCapacity * average-cost) -recheckForCapacityProbability double default=0.001 - diff --git a/container-search/src/main/resources/configdefinitions/resolvers.def b/container-search/src/main/resources/configdefinitions/resolvers.def deleted file mode 100644 index 6003fdf81f1..00000000000 --- a/container-search/src/main/resources/configdefinitions/resolvers.def +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=search.pagetemplates - -## A list of resolver components used by com.yahoo.search.PageTemplateSearcher - -## A component -component[].id string -## The component id used by this component to subscribe to its configs (if any) -component[].configId reference default=":parent:" - -## The id of the class to instantiate for this component. -component[].classId string default="" - -## The symbolic name of the Osgi bundle this component is located in. -## Assumed to be the same as the classid if not set. -component[].bundle string default="" diff --git a/container-search/src/main/resources/configdefinitions/rewrites.def b/container-search/src/main/resources/configdefinitions/rewrites.def deleted file mode 100644 index ecca422342a..00000000000 --- a/container-search/src/main/resources/configdefinitions/rewrites.def +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=search.query.rewrite - -fsaDict[].name string -fsaDict[].path file 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 deleted file mode 100644 index a34e08a1c82..00000000000 --- a/container-search/src/main/resources/configdefinitions/search-with-renderer-handler.def +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=search.handler - -rendererId string diff --git a/container-search/src/main/resources/configdefinitions/search.config.cluster.def b/container-search/src/main/resources/configdefinitions/search.config.cluster.def new file mode 100644 index 00000000000..52eca7ef753 --- /dev/null +++ b/container-search/src/main/resources/configdefinitions/search.config.cluster.def @@ -0,0 +1,28 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=search.config + +#The id of the cluster (as specified in qr-searchers) +#Note: Use clusterName where possible instead +clusterId int default=0 + +#Internal searcher cache. Size is measured in megabytes of raw packet +#size. Hits larger than 1% of total cache size will not be cached. +cacheSize int default=1 + +#Timeout for internal searcher cache. Entries older than this number +#of seconds will be removed from cache. 0 or less means the cache is +#disabled. +cacheTimeout double default=0 + +#Whether or not to try another TLD if the current request fails. +failoverToRemote bool default=false + +#The name of the cluster (as specified in qr-searchers) +clusterName string + +#The maximum query timeout for this cluster in seconds (default 10 minutes) +maxQueryTimeout double default=600 + +#The maximum query timeout allowed before disabling the backend query cache for the given query (default 10 seconds). +#Note that the query timeout is used as the query cache timeout in the backend if enabled. +maxQueryCacheTimeout double default=10 diff --git a/container-search/src/main/resources/configdefinitions/search.config.index-info.def b/container-search/src/main/resources/configdefinitions/search.config.index-info.def new file mode 100644 index 00000000000..f3b905d4d0a --- /dev/null +++ b/container-search/src/main/resources/configdefinitions/search.config.index-info.def @@ -0,0 +1,16 @@ +# 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 +namespace=search.config + +## The name of the search definition this index info applies to +indexinfo[].name string + +## The name of a index for which we have a command +indexinfo[].command[].indexname string +## The command, e.g. "lowercase", "word" or "rise" +indexinfo[].command[].command string + +## The name of an alias for an index or attribute +indexinfo[].alias[].alias string +## The index name that the alias should map to +indexinfo[].alias[].indexname string diff --git a/container-search/src/main/resources/configdefinitions/search.config.qr-start.def b/container-search/src/main/resources/configdefinitions/search.config.qr-start.def new file mode 100644 index 00000000000..95e9d4575dd --- /dev/null +++ b/container-search/src/main/resources/configdefinitions/search.config.qr-start.def @@ -0,0 +1,50 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Do update the start script with the new name if you change it: +namespace=search.config + +## Server or client VM +jvm.server bool default=true restart + +## Debug logging of Garbage Collection +jvm.verbosegc bool default=true restart + +## Garbage Collection tuning parameters +jvm.gcopts string default="-XX:+UseG1GC -XX:MaxTenuringThreshold=15 -XX:NewRatio=1" restart + +## Heap size (in megabytes) for the Java VM +jvm.heapsize int default=1536 restart + +## Min heapsize (in megabytes) for the Java VM +jvm.minHeapsize int default=1536 restart + +## Stack size (in kilobytes) +jvm.stacksize int default=512 restart + +## CompressedOOps size in megabytes +jvm.compressedClassSpaceSize int default=32 restart + +## Base value of maximum direct memory size (in megabytes) +jvm.baseMaxDirectMemorySize int default=75 restart + +## Amount of direct memory used for caching. (in megabytes) +jvm.directMemorySizeCache int default=0 restart + +## Set heap size as this percentage of available RAM, instead of absolute +## value above. Setting outside [1, 99] disables this setting. +jvm.heapSizeAsPercentageOfPhysicalMemory int default=0 restart + +## Number of processors available, can be used to set -XX:ActiveProcessorCount if set to non-zero. +## In that case will be the number returned by the JVM when calling Runtime.getRuntime().availableProcessors() +jvm.availableProcessors int default=0 restart + +## Extra environment variables +qrs.env string default="" restart + +## Set ulimit -v in start script? this is mainly a safeguard against JNI stuff leaking memory. +ulimitv string default="" restart + +## Extra class path entries, forwarded to vespa-start-container_daemon. Overrides the corresponding env setting. +jdisc.classpath_extra string default="" restart + +## Extra export packages entries, forwarded to vespa-start-container_daemon. Overrides the corresponding env setting. +jdisc.export_packages string default="" restart diff --git a/container-search/src/main/resources/configdefinitions/search.config.rate-limiting.def b/container-search/src/main/resources/configdefinitions/search.config.rate-limiting.def new file mode 100644 index 00000000000..23235617f8c --- /dev/null +++ b/container-search/src/main/resources/configdefinitions/search.config.rate-limiting.def @@ -0,0 +1,19 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Configuration of the rate limiting algorithm +namespace=search.config + +# How much additional capacity to assign to a thread each time it has run out. +# A higher number means less thread contention and less accuracy +capacityIncrement double default=1000 + +# The max capacity which will ever (and initially) be available to requesting threads on one node +# A higher number means we'll be less sensitive to intermittent overlap +# A good number may be capacityIncrement * 10 +maxAvailableCapacity double default=10000 + +# The probability per request that we check for more quota when we have run out. +# A higher number means less probability of rejecting a request unnecessarily +# but also more thread contention. +# A good number may be 1 / (maxAvailableCapacity * average-cost) +recheckForCapacityProbability double default=0.001 + diff --git a/container-search/src/main/resources/configdefinitions/search.federation.federation.def b/container-search/src/main/resources/configdefinitions/search.federation.federation.def new file mode 100644 index 00000000000..36eb5d4b4c8 --- /dev/null +++ b/container-search/src/main/resources/configdefinitions/search.federation.federation.def @@ -0,0 +1,17 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=search.federation + +target[].id string +target[].useByDefault bool default=false + +#the component id of the chain used for federation. +target[].searchChain[].searchChainId string +target[].searchChain[].timeoutMillis int default=-1 +target[].searchChain[].requestTimeoutMillis int default=-1 +target[].searchChain[].optional bool default=false +target[].searchChain[].useByDefault bool default=false +#if non-empty, this is a provider for the source target[].name +target[].searchChain[].providerId string default="" +target[].searchChain[].documentTypes[] string + +targetSelector string default="" diff --git a/container-search/src/main/resources/configdefinitions/search.federation.provider.def b/container-search/src/main/resources/configdefinitions/search.federation.provider.def new file mode 100644 index 00000000000..f9ab305b114 --- /dev/null +++ b/container-search/src/main/resources/configdefinitions/search.federation.provider.def @@ -0,0 +1,43 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=search.federation + +node[].host string +node[].port int +path string default="" +maxConnections int default=10000 +maxConnectionPerRoute int default=10000 +socketBufferBytes int default=8192 +retries int default=1 +## Timeout for blocking IO calls in HTTP client. +## Unit is seconds, default value is +## in com.yahoo.search.federation.http.HTTPParameters. +readTimeout double default=-1.0 +## The timeout until a connection is etablished. +## Unit is seconds, default value is +## in com.yahoo.search.federation.http.HTTPParameters. +connectionTimeout double default=-1.0 +## Timeout when retrieving a connection from the connection manager. +## Unit is seconds, default value is +## in com.yahoo.search.federation.http.HTTPParameters. +connectionPoolTimeout double default=-1.0 +## Certificate store proxy host +yca.host string default="yca.host must be set explicitly" +## Certificate store proxy port +yca.port int default=3128 +## Whether a proxy is needed (i.e. should the proxy settings be used) +yca.useProxy bool default=false +yca.applicationId string default="" +## TTL to use in the certificate cache. 0 means use default cache behavior. +## Unit is seconds. +yca.ttl int default=0 +## How often to retry direct cert DB access if no certificate is found, +## i.e. the cache TTL for null entries. Unit is seconds. +yca.retry int default=0 + +# The form of the serialized query. +queryType enum { LEGACY, PROGRAMMATIC, YQL, SELECT } default=LEGACY + +# How to do pinging against a backend. +pingOption enum { DISABLE, NORMAL, YCA } default=NORMAL + +followRedirects bool default=true diff --git a/container-search/src/main/resources/configdefinitions/search.federation.searchchain-forward.def b/container-search/src/main/resources/configdefinitions/search.federation.searchchain-forward.def new file mode 100644 index 00000000000..0e86490e120 --- /dev/null +++ b/container-search/src/main/resources/configdefinitions/search.federation.searchchain-forward.def @@ -0,0 +1,8 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=search.federation + +## A searcher forwarding the incoming query to a single search chain and +## returning the result. + +## The component specification of the search chain to forward requests to. +target string diff --git a/container-search/src/main/resources/configdefinitions/search.federation.strict-contracts.def b/container-search/src/main/resources/configdefinitions/search.federation.strict-contracts.def new file mode 100644 index 00000000000..5ceb37db8d1 --- /dev/null +++ b/container-search/src/main/resources/configdefinitions/search.federation.strict-contracts.def @@ -0,0 +1,20 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=search.federation + +## DEPRECATED: This config will be removed on Vespa 8 +## A config to control whether to activate strict adherence to public contracts +## in the container. Usually, the container tries to do a best effort of hiding +## some undesirable effects of the the public contracts. Modifying this config +## signals the basic contract is sufficient, and allows the container to +## activate optimizations based on this knowledge. + +## Strict contracts for search chains, do not clone the query if it at all +## can be construed to be unnecessary. +searchchains bool default=false + +# EVERY, // Propagate any property starting by source.[sourceName] and provider.[providerName] +# NATIVE, // Propagate native properties only +# ALL, // Deprecated synonym of NATIVE +# OFFSET_HITS, // Propagate offset ands hits only +# NONE // propagate no properties +propagateSourceProperties enum {EVERY, NATIVE, ALL, OFFSET_HITS, NONE} default=EVERY diff --git a/container-search/src/main/resources/configdefinitions/search.handler.search-with-renderer-handler.def b/container-search/src/main/resources/configdefinitions/search.handler.search-with-renderer-handler.def new file mode 100644 index 00000000000..a34e08a1c82 --- /dev/null +++ b/container-search/src/main/resources/configdefinitions/search.handler.search-with-renderer-handler.def @@ -0,0 +1,4 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=search.handler + +rendererId string diff --git a/container-search/src/main/resources/configdefinitions/search.pagetemplates.page-templates.def b/container-search/src/main/resources/configdefinitions/search.pagetemplates.page-templates.def new file mode 100644 index 00000000000..31ec7644d18 --- /dev/null +++ b/container-search/src/main/resources/configdefinitions/search.pagetemplates.page-templates.def @@ -0,0 +1,5 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=search.pagetemplates + +# The xml content of a page template +page[] string diff --git a/container-search/src/main/resources/configdefinitions/search.pagetemplates.resolvers.def b/container-search/src/main/resources/configdefinitions/search.pagetemplates.resolvers.def new file mode 100644 index 00000000000..6003fdf81f1 --- /dev/null +++ b/container-search/src/main/resources/configdefinitions/search.pagetemplates.resolvers.def @@ -0,0 +1,16 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=search.pagetemplates + +## A list of resolver components used by com.yahoo.search.PageTemplateSearcher + +## A component +component[].id string +## The component id used by this component to subscribe to its configs (if any) +component[].configId reference default=":parent:" + +## The id of the class to instantiate for this component. +component[].classId string default="" + +## The symbolic name of the Osgi bundle this component is located in. +## Assumed to be the same as the classid if not set. +component[].bundle string default="" diff --git a/container-search/src/main/resources/configdefinitions/search.query.profile.config.query-profiles.def b/container-search/src/main/resources/configdefinitions/search.query.profile.config.query-profiles.def new file mode 100644 index 00000000000..3c6d11e2944 --- /dev/null +++ b/container-search/src/main/resources/configdefinitions/search.query.profile.config.query-profiles.def @@ -0,0 +1,93 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# 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. +namespace=search.query.profile.config + +# The id of this query profile. The id has the form name(:version)? +# where the version has the form 1(.2(.3(.identifier)?)?)?. +# The default query profile (if any) must be called "default". +queryprofile[].id string + +# The (optional) type of this query profile, an id string +# If no type is given, all values are legal +queryprofile[].type string default="" + +# The optional list of query profiles this inherits, by id. +# The id's has the form name(:version)? +# where the version has the form 1(.2(.3(.identifier)?)?)?. +# If the version is not specified the newest version found is used. +queryprofile[].inherit[] string + +# The dimensions over which this profile may vary, if any +queryprofile[].dimensions[] string + +# A property name. Note that names containing dots will create implicit query profile +# sub-instances. These instances will completely override instances in super-profiles +# even if they don't set all the values of the super-instance +queryprofile[].property[].name string +# The property value +queryprofile[].property[].value string +# Whether the value is overridable in the request or by a programmatic setting: "true", "false" or "" +# which means take the value from any inherited profile or the type +queryprofile[].property[].overridable string default="" + +# A reference name to another query profile +queryprofile[].reference[].name string +# The id of the referenced profile, the version part may be missing +# or underspecified as usual +queryprofile[].reference[].value string +# Whether the value is overridable in the request or by a programmatic setting: "true", "false" or "" +# which means take the value from any inherited profile or the type +queryprofile[].reference[].overridable string default="" + +# A variant of this (top level) profile for some value of its dimensions +queryprofile[].queryprofilevariant[].fordimensionvalues[] string +# The optional list of query profiles this variant inherits, by id. +# The id's has the form name(:version)? +# where the version has the form 1(.2(.3(.identifier)?)?)?. +# If the version is not specified the newest version found is used. +queryprofile[].queryprofilevariant[].inherit[] string +# Content of profile variant +queryprofile[].queryprofilevariant[].property[].name string +# Content of profile variant +queryprofile[].queryprofilevariant[].property[].value string +# Content of profile variant +queryprofile[].queryprofilevariant[].reference[].name string +# Content of profile variant +queryprofile[].queryprofilevariant[].reference[].value string + +# A query profile type defines the values of instance query profiles. +# The id follows the same rules as for query profiles +queryprofiletype[].id string + +# If this is strict, non-declared values can not be set in a query profile of this type nor +# in the request or by a programmatic call +queryprofiletype[].strict bool default=false + +# With this set to true, requests for query profile instances of this type will be matched as path names +queryprofiletype[].matchaspath bool default=false + +# The optional list of query profile types this inherits, by id. +# The id's has the form name(:version)? +# where the version has the form 1(.2(.3(.identifier)?)?)?. +# If the version is not specified the newest version found is used. +queryprofiletype[].inherit[] string + +# Declaration of a field +queryprofiletype[].field[].name string +# The type of the field, a primitive, query-profile or query-profile:id to declare a reference +# which is untyped or typed, respectively +queryprofiletype[].field[].type string +# Whether values of this is overridable in the request or by a programmatic setting +queryprofiletype[].field[].overridable bool default=true +# Whether this must be present in the query profile or the request for this to be valid +queryprofiletype[].field[].mandatory bool default=false +# A space-separated list of aliases of this field name. Aliases are case insensitive +queryprofiletype[].field[].alias string default="" + +# TODO Remove once no longer used by old config models +enableGroupingSessionCache bool default=true + + + diff --git a/container-search/src/main/resources/configdefinitions/search.query.rewrite.rewrites.def b/container-search/src/main/resources/configdefinitions/search.query.rewrite.rewrites.def new file mode 100644 index 00000000000..ecca422342a --- /dev/null +++ b/container-search/src/main/resources/configdefinitions/search.query.rewrite.rewrites.def @@ -0,0 +1,5 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=search.query.rewrite + +fsaDict[].name string +fsaDict[].path file diff --git a/container-search/src/main/resources/configdefinitions/search.querytransform.lowercasing.def b/container-search/src/main/resources/configdefinitions/search.querytransform.lowercasing.def new file mode 100644 index 00000000000..b656c451e11 --- /dev/null +++ b/container-search/src/main/resources/configdefinitions/search.querytransform.lowercasing.def @@ -0,0 +1,4 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=search.querytransform + +transform_weighted_sets bool default=true diff --git a/container-search/src/main/resources/configdefinitions/search.statistics.measure-qps.def b/container-search/src/main/resources/configdefinitions/search.statistics.measure-qps.def new file mode 100644 index 00000000000..c8b38b9db6e --- /dev/null +++ b/container-search/src/main/resources/configdefinitions/search.statistics.measure-qps.def @@ -0,0 +1,16 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=search.statistics + +## Configure measurements of peak QPS rates. + +## Control whether com.yahoo.search.statistics.PeakQpsSearcher +## should emit data through statistics framework or as a meta hit. +outputmethod enum { STATISTICS, METAHIT } default=STATISTICS + +## If using meta hits, which query property should trigger sampling +queryproperty string default="fetchpeakqps" + +## The base name for the statistics event. Default is the component name +## of the searcher, as defined in vespa-services, with dots replaced by +## underscore. +eventname string default="" diff --git a/container-search/src/main/resources/configdefinitions/search.statistics.timing-searcher.def b/container-search/src/main/resources/configdefinitions/search.statistics.timing-searcher.def new file mode 100644 index 00000000000..7c2b698bdb0 --- /dev/null +++ b/container-search/src/main/resources/configdefinitions/search.statistics.timing-searcher.def @@ -0,0 +1,7 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=search.statistics + +timer[].name string +timer[].eventname string +timer[].measure enum { FILL, PING, SEARCH } default=SEARCH + diff --git a/container-search/src/main/resources/configdefinitions/searchchain-forward.def b/container-search/src/main/resources/configdefinitions/searchchain-forward.def deleted file mode 100644 index 0e86490e120..00000000000 --- a/container-search/src/main/resources/configdefinitions/searchchain-forward.def +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=search.federation - -## A searcher forwarding the incoming query to a single search chain and -## returning the result. - -## The component specification of the search chain to forward requests to. -target string diff --git a/container-search/src/main/resources/configdefinitions/semantic-rules.def b/container-search/src/main/resources/configdefinitions/semantic-rules.def deleted file mode 100644 index 5ac0cca7ff6..00000000000 --- a/container-search/src/main/resources/configdefinitions/semantic-rules.def +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -# Semantic production rules -namespace=prelude.semantics - -# Whether we should use these rule bases in pre-Vespa 2.2 compatibility mode -compatibility bool default=false - -# The name of a rule base -rulebase[].name string - -# Whether this rule base is the default, to be used on all queries -# not specifying rules -rulebase[].isdefault bool default=false - -# The automata file to use to look up condition references -# not defined in the rule base. The automata file must be present -# on all nodes getting this configuration -rulebase[].automata string default="" - -# The rules -rulebase[].rules string - diff --git a/container-search/src/main/resources/configdefinitions/strict-contracts.def b/container-search/src/main/resources/configdefinitions/strict-contracts.def deleted file mode 100644 index 5ceb37db8d1..00000000000 --- a/container-search/src/main/resources/configdefinitions/strict-contracts.def +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=search.federation - -## DEPRECATED: This config will be removed on Vespa 8 -## A config to control whether to activate strict adherence to public contracts -## in the container. Usually, the container tries to do a best effort of hiding -## some undesirable effects of the the public contracts. Modifying this config -## signals the basic contract is sufficient, and allows the container to -## activate optimizations based on this knowledge. - -## Strict contracts for search chains, do not clone the query if it at all -## can be construed to be unnecessary. -searchchains bool default=false - -# EVERY, // Propagate any property starting by source.[sourceName] and provider.[providerName] -# NATIVE, // Propagate native properties only -# ALL, // Deprecated synonym of NATIVE -# OFFSET_HITS, // Propagate offset ands hits only -# NONE // propagate no properties -propagateSourceProperties enum {EVERY, NATIVE, ALL, OFFSET_HITS, NONE} default=EVERY diff --git a/container-search/src/main/resources/configdefinitions/timing-searcher.def b/container-search/src/main/resources/configdefinitions/timing-searcher.def deleted file mode 100644 index 7c2b698bdb0..00000000000 --- a/container-search/src/main/resources/configdefinitions/timing-searcher.def +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=search.statistics - -timer[].name string -timer[].eventname string -timer[].measure enum { FILL, PING, SEARCH } default=SEARCH - -- cgit v1.2.3