Publish

27 files changed, 548 insertions, 0 deletions

diff --git a/container-search/src/main/resources/configdefinitions/cluster.def b/container-search/src/main/resources/configdefinitions/cluster.def
new file mode 100644
index 00000000000..cadb9adce22
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/cluster.def
@@ -0,0 +1,28 @@
+# Copyright 2016 Yahoo Inc. 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/documentdb-info.def b/container-search/src/main/resources/configdefinitions/documentdb-info.def
new file mode 100644
index 00000000000..f392a014a61
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/documentdb-info.def
@@ -0,0 +1,22 @@
+# Copyright 2016 Yahoo Inc. 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
+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
new file mode 100644
index 00000000000..75b2bccdba2
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/emulation.def
@@ -0,0 +1,9 @@
+# Copyright 2016 Yahoo Inc. 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
+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
new file mode 100644
index 00000000000..08113176228
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/federation.def
@@ -0,0 +1,18 @@
+# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+version=7
+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
new file mode 100644
index 00000000000..b74a9653be8
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/fs4.def
@@ -0,0 +1,6 @@
+# Copyright 2016 Yahoo Inc. 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
+numlistenerthreads int default=4
diff --git a/container-search/src/main/resources/configdefinitions/index-info.def b/container-search/src/main/resources/configdefinitions/index-info.def
new file mode 100644
index 00000000000..1f729c64807
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/index-info.def
@@ -0,0 +1,17 @@
+# Copyright 2016 Yahoo Inc. 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
+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
new file mode 100644
index 00000000000..840433e074f
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/keyvalue.def
@@ -0,0 +1,20 @@
+# Copyright 2016 Yahoo Inc. 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/legacy-emulation.def b/container-search/src/main/resources/configdefinitions/legacy-emulation.def
new file mode 100644
index 00000000000..e938a93b505
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/legacy-emulation.def
@@ -0,0 +1,11 @@
+# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+namespace=container.search
+
+## Keep emulating old (4.2, 5.0, early 5.1) string type fields for structured data
+stringBackedStructuredData bool default=false
+
+## Keep emulating old (4.2, 5.0, early 5.1) string type fields for summaryfeatures / rankfeatures fields
+stringBackedFeatureData bool default=false
+
+## This will populate even if they are empty/undefined.
+forceFillEmptyFields bool default=false
diff --git a/container-search/src/main/resources/configdefinitions/lowercasing.def b/container-search/src/main/resources/configdefinitions/lowercasing.def
new file mode 100644
index 00000000000..0b8f670f202
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/lowercasing.def
@@ -0,0 +1,5 @@
+# Copyright 2016 Yahoo Inc. 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
new file mode 100644
index 00000000000..b5f5ea46bb2
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/measure-qps.def
@@ -0,0 +1,17 @@
+# Copyright 2016 Yahoo Inc. 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.
+
+## 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
new file mode 100644
index 00000000000..c9577cb66eb
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/page-templates.def
@@ -0,0 +1,6 @@
+# Copyright 2016 Yahoo Inc. 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
+page[] string
diff --git a/container-search/src/main/resources/configdefinitions/provider.def b/container-search/src/main/resources/configdefinitions/provider.def
new file mode 100644
index 00000000000..8b8990d68d4
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/provider.def
@@ -0,0 +1,44 @@
+# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+version=16
+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
+## YCA proxy host
+yca.host string default="yca-proxy.corp.yahoo.com"
+## YCA 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 } 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-binary-cache-region.def b/container-search/src/main/resources/configdefinitions/qr-binary-cache-region.def
new file mode 100644
index 00000000000..64bd3105c24
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/qr-binary-cache-region.def
@@ -0,0 +1,46 @@
+# Copyright 2016 Yahoo Inc. 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) 
+# and region size should be same 
+region_size int default=1024
+
+# Number of threads that would concurrently access cache
+concurrency_level int default=50
+
+# Initial bucket count that would be created in a region 
+# (rehashing would grow it if necessary but is expensive) 
+bucket_count int default=12000
+
+# Load factor of the region.
+load_factor double default=0.75
+
+#TTL in milli-seconds
+time_to_live int default=-1
+
+entry_size_range int default=500
+
+
+#Whether lazy invalidation is enabled or no
+lazy_invalidation_enabled bool default=false
+
+# Time interval (in seconds) over which lazy invalidation parameters would be observed
+tick_interval int default=1
+tick_count_to_average int default=10
+
+# Maximum QPS that can be supported by the back-end. 
+# Refresh due to lazy invalidation and TTL would be disabled in the 
+# tick_interval in which total requests to backend have exceeded MAX_QPS
+max_backend_qps int default=300
+
+# Log file in which lazy invalidation stats would be 
+# recorded (keep it empty if no stats are required)
+lazy_invalidation_stats_file string default="lstats.log"
+
+# Maximum stale time in seconds after a call to lazy invalidation is made.
+# Once this time interval is expired, any request for an expired 
+# entry (due to TTL or lazy invalidation) would result in a cache miss. 
+lazy_invalidation_max_stale_time_in_sec int default=1000
diff --git a/container-search/src/main/resources/configdefinitions/qr-binary-cache.def b/container-search/src/main/resources/configdefinitions/qr-binary-cache.def
new file mode 100644
index 00000000000..5664503087d
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/qr-binary-cache.def
@@ -0,0 +1,37 @@
+# Copyright 2016 Yahoo Inc. 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
+# be allocated to a cache entry (key+value). Multiple blocks can be 
+# allocated to an entry if required and blocks can not be shared 
+# between multiple entries. IN BYTES 
+block_size int default=256
+
+# Size of a buffer array that would hold the serialized content,
+# maximum size here can be 2 GB. IN MB 
+buffer_size int default=64
+
+# For debugging (for production it should be true)
+assertions_disabled bool default=false
+
+# Whether to create the byte buffers in the NIO memory or in 
+# JVM heap itself (having these in NIO buffers gives lower GC pause times) 
+use_direct_buffers bool default=true
+
+# Size of the byte array pool that the cache uses to hold up 
+# the serialized content temporarily 
+pooled_byte_arrays int default=1000
+
+# The size of the cahe in MB
+# If the size is 0, the cache is disabled
+cache_size int default=0
+
+# If true, cache would write average time taken in various 
+# operations per 1000 requests in log 
+profiling_enabled bool default=false
+
+# For debugging purposes
+lock_verification_enabled bool default=false
diff --git a/container-search/src/main/resources/configdefinitions/qr-monitor.def b/container-search/src/main/resources/configdefinitions/qr-monitor.def
new file mode 100644
index 00000000000..892c96bf976
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/qr-monitor.def
@@ -0,0 +1,7 @@
+# Copyright 2016 Yahoo Inc. 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
+## 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
new file mode 100644
index 00000000000..af222598dba
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/qr-quotetable.def
@@ -0,0 +1,8 @@
+# Copyright 2016 Yahoo Inc. 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.
+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
new file mode 100644
index 00000000000..3af7b82dbf3
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/qr-start.def
@@ -0,0 +1,40 @@
+# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Do update the qrs-start script with the new version if you update this.
+namespace=search.config
+
+## Server or client VM
+jvm.server bool default=true restart
+
+## Debug logging of Garbage Collection
+jvm.verbosegc bool default=false restart
+
+## Garbage Collection tuning parameters
+jvm.gcopts string default="" restart
+
+## Heap size (in megabytes) for the Java VM
+jvm.heapsize int default=1536 restart
+
+## Stack size (in kilobytes)
+jvm.stacksize int default=512 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
+
+## Extra environment variables
+qrs.env string default="YELL_MA_EURO=INXIGHT" 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 jdisc_start. Overrides the corresponding env setting.
+jdisc.classpath_extra string default="" restart
+
+## Extra export packages entries, forwarded to jdisc_start. 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
new file mode 100644
index 00000000000..098dea38604
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/query-profiles.def
@@ -0,0 +1,93 @@
+# Copyright 2016 Yahoo Inc. 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.
+version=4
+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=""
+
+
+
+
+
diff --git a/container-search/src/main/resources/configdefinitions/rate-limiting.def b/container-search/src/main/resources/configdefinitions/rate-limiting.def
new file mode 100644
index 00000000000..25a2fc8e2aa
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/rate-limiting.def
@@ -0,0 +1,19 @@
+# Copyright 2016 Yahoo Inc. 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
new file mode 100644
index 00000000000..06b440da26e
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/resolvers.def
@@ -0,0 +1,17 @@
+# Copyright 2016 Yahoo Inc. 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
+
+## 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
new file mode 100644
index 00000000000..1f6f2b18539
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/rewrites.def
@@ -0,0 +1,6 @@
+# Copyright 2016 Yahoo Inc. 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
+fsaDict[].path file
diff --git a/container-search/src/main/resources/configdefinitions/search-nodes.def b/container-search/src/main/resources/configdefinitions/search-nodes.def
new file mode 100644
index 00000000000..076dc6ae616
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/search-nodes.def
@@ -0,0 +1,5 @@
+# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+namespace=search.config.dispatchprototype
+
+search_node[].host string
+search_node[].port int
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
new file mode 100644
index 00000000000..ce94ebd7219
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/search-with-renderer-handler.def
@@ -0,0 +1,5 @@
+# Copyright 2016 Yahoo Inc. 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
new file mode 100644
index 00000000000..87cee277cf1
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/searchchain-forward.def
@@ -0,0 +1,9 @@
+# Copyright 2016 Yahoo Inc. 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
+## 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
new file mode 100644
index 00000000000..e84982abb3c
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/semantic-rules.def
@@ -0,0 +1,23 @@
+# Copyright 2016 Yahoo Inc. 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
+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
new file mode 100644
index 00000000000..cfef1633784
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/strict-contracts.def
@@ -0,0 +1,22 @@
+# Copyright 2016 Yahoo Inc. 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
+## 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
+
+# WARNING: Beta feature, might be removed soon.
+# Propagate source.(sourceName).{QueryProperties.PER_SOURCE_QUERY_PROPERTIES} and
+#           provider.(providerName).{QueryProperties.PER_SOURCE_QUERY_PROPERTIES}
+# to the outgoing query.
+# All means all in QueryProperties.PER_SOURCE_QUERY_PROPERTIES
+# OFFSET_HITS means  {Query.HITS, Query.OFFSET}
+# NONE means {}
+propagateSourceProperties enum {ALL, OFFSET_HITS, NONE} default=ALL
diff --git a/container-search/src/main/resources/configdefinitions/timing-searcher.def b/container-search/src/main/resources/configdefinitions/timing-searcher.def
new file mode 100644
index 00000000000..d2eb1b62767
--- /dev/null
+++ b/container-search/src/main/resources/configdefinitions/timing-searcher.def
@@ -0,0 +1,8 @@
+# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+version=1
+namespace=search.statistics
+
+timer[].name string
+timer[].eventname string
+timer[].measure enum { FILL, PING, SEARCH } default=SEARCH
+