summaryrefslogtreecommitdiffstats
path: root/container-search/src/main/resources/configdefinitions
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2020-01-24 15:27:20 +0100
committerJon Bratseth <bratseth@verizonmedia.com>2020-01-24 15:27:20 +0100
commit51d32311f8b462195e477cd922378a5be6961105 (patch)
tree9fef6eaf6f06339ee68c057d5ac3ebf8e439f257 /container-search/src/main/resources/configdefinitions
parent88438542822aee1b75747b8e252a91f9189147cc (diff)
Propagate all source and provider properties by default
This changes default behavor from only propagating native properties. I believe that will probably be safe, and it just seems more correct. If somebody have problems with it they can recover the old behavior by using the strict-contracts config. That config is not mentioned in the documentation and not touched by the model. We should remove it on Vespa 8.
Diffstat (limited to 'container-search/src/main/resources/configdefinitions')
-rw-r--r--container-search/src/main/resources/configdefinitions/strict-contracts.def15
1 files changed, 7 insertions, 8 deletions
diff --git a/container-search/src/main/resources/configdefinitions/strict-contracts.def b/container-search/src/main/resources/configdefinitions/strict-contracts.def
index f9dd788c054..5ceb37db8d1 100644
--- a/container-search/src/main/resources/configdefinitions/strict-contracts.def
+++ b/container-search/src/main/resources/configdefinitions/strict-contracts.def
@@ -1,6 +1,7 @@
# 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
@@ -11,11 +12,9 @@ namespace=search.federation
## 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
+# 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