diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-08-22 11:18:51 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-09-03 13:32:23 +0200 |
commit | c1b58ec6d0edb09edc94bb62d449c9ff2bc89499 (patch) | |
tree | 1506ff4642b2d8e9846dcc797b695ad709e03eaf /config-model | |
parent | ec9251a90e88429a339f68649f6937eb80ccf321 (diff) |
Remove feature flag for grouping session cache
Diffstat (limited to 'config-model')
11 files changed, 9 insertions, 19 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java index 54318c0b7ea..eafb73d078f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java @@ -57,7 +57,6 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat private Optional<TlsSecrets> tlsSecrets; private Optional<String> tlsClientAuthority; private boolean useTlsClientAuthority = false; - private final boolean enableGroupingSessionCache; private MbusParams mbusParams; private boolean messageBusEnabled = true; @@ -67,7 +66,6 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat this.tlsSecrets = deployState.tlsSecrets(); this.tlsClientAuthority = deployState.tlsClientAuthority(); - this.enableGroupingSessionCache = deployState.getProperties().enableGroupingSessionCache(); restApiGroup = new ConfigProducerGroup<>(this, "rest-api"); servletGroup = new ConfigProducerGroup<>(this, "servlet"); @@ -189,10 +187,6 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat return tlsClientAuthority; } - public boolean enableGroupingSessionCache() { - return enableGroupingSessionCache; - } - public void setMbusParams(MbusParams mbusParams) { this.mbusParams = mbusParams; } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java index 6e78ccf8daa..84e8cdf144f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java @@ -36,7 +36,6 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains> private final List<AbstractSearchCluster> systems = new LinkedList<>(); private final Options options; - private final boolean enableGroupingSessionCache; private QueryProfiles queryProfiles; private SemanticRules semanticRules; @@ -45,8 +44,6 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains> public ContainerSearch(ApplicationContainerCluster cluster, SearchChains chains, Options options) { super(chains); this.options = options; - - this.enableGroupingSessionCache = cluster.enableGroupingSessionCache(); } public void connectSearchClusters(Map<String, AbstractSearchCluster> searchClusters) { @@ -90,7 +87,6 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains> if (queryProfiles!=null) { queryProfiles.getConfig(builder); } - builder.enableGroupingSessionCache(enableGroupingSessionCache); } @Override diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/empty.cfg b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/empty.cfg index 13153de1644..08b0e6809ce 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/empty.cfg +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/empty.cfg @@ -1 +1 @@ -enableGroupingSessionCache false
\ No newline at end of file +enableGroupingSessionCache true
\ No newline at end of file diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/explicit-reference-override.cfg b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/explicit-reference-override.cfg index b62e00a2ad5..fc77c5d82fa 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/explicit-reference-override.cfg +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/explicit-reference-override.cfg @@ -11,4 +11,4 @@ queryprofile[1].property[0].overridable "" queryprofile[1].reference[0].name "a" queryprofile[1].reference[0].value "a1" queryprofile[1].reference[0].overridable "" -enableGroupingSessionCache false
\ No newline at end of file +enableGroupingSessionCache true
\ No newline at end of file diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/newsbe-query-profiles-simple.cfg b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/newsbe-query-profiles-simple.cfg index 65b4258f174..d8092960ce8 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/newsbe-query-profiles-simple.cfg +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/newsbe-query-profiles-simple.cfg @@ -17,4 +17,4 @@ queryprofile[0].queryprofilevariant[0].fordimensionvalues[1] "uk" queryprofile[0].queryprofilevariant[0].fordimensionvalues[2] "sc" queryprofile[0].queryprofilevariant[0].property[0].name "scthumbnail.sourcecountry" queryprofile[0].queryprofilevariant[0].property[0].value "uk" -enableGroupingSessionCache false
\ No newline at end of file +enableGroupingSessionCache true
\ No newline at end of file diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/newsfe-query-profiles-simple.cfg b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/newsfe-query-profiles-simple.cfg index b416abf7c67..699f763b79c 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/newsfe-query-profiles-simple.cfg +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/newsfe-query-profiles-simple.cfg @@ -24,4 +24,4 @@ queryprofile[1].type "" queryprofile[1].reference[0].name "source.news" queryprofile[1].reference[0].value "backend/news" queryprofile[1].reference[0].overridable "" -enableGroupingSessionCache false
\ No newline at end of file +enableGroupingSessionCache true
\ No newline at end of file diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/query-profile-variants-configuration.cfg b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/query-profile-variants-configuration.cfg index 352966d0d8b..b86f55103bd 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/query-profile-variants-configuration.cfg +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/query-profile-variants-configuration.cfg @@ -39,4 +39,4 @@ queryprofile[2].type "" queryprofile[2].property[0].name "a" queryprofile[2].property[0].value "a1" queryprofile[2].property[0].overridable "" -enableGroupingSessionCache false
\ No newline at end of file +enableGroupingSessionCache true
\ No newline at end of file diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/query-profile-variants2-configuration.cfg b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/query-profile-variants2-configuration.cfg index 0f644cbb9eb..aff71104f7a 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/query-profile-variants2-configuration.cfg +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/query-profile-variants2-configuration.cfg @@ -59,4 +59,4 @@ queryprofile[3].queryprofilevariant[0].fordimensionvalues[0] "love" queryprofile[3].queryprofilevariant[0].fordimensionvalues[1] "default" queryprofile[3].queryprofilevariant[0].property[0].name "defaultIndex" queryprofile[3].queryprofilevariant[0].property[0].value "default" -enableGroupingSessionCache false
\ No newline at end of file +enableGroupingSessionCache true
\ No newline at end of file diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/query-profiles.cfg b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/query-profiles.cfg index 4a9dabdc6ca..54997e152f3 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/query-profiles.cfg +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/query-profiles.cfg @@ -103,4 +103,4 @@ queryprofiletype[2].field[0].type "string" queryprofiletype[2].field[0].overridable false queryprofiletype[2].field[0].mandatory false queryprofiletype[2].field[0].alias "" -enableGroupingSessionCache false
\ No newline at end of file +enableGroupingSessionCache true
\ No newline at end of file diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/variants-of-explicit-compound-with-reference.cfg b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/variants-of-explicit-compound-with-reference.cfg index 92605f504a0..0af30a9ad5c 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/variants-of-explicit-compound-with-reference.cfg +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/variants-of-explicit-compound-with-reference.cfg @@ -24,4 +24,4 @@ queryprofile[2].queryprofilevariant[0].reference[0].value "a2" queryprofile[2].queryprofilevariant[1].fordimensionvalues[0] "x2" queryprofile[2].queryprofilevariant[1].property[0].name "a.b" queryprofile[2].queryprofilevariant[1].property[0].value "a.b.x2" -enableGroupingSessionCache false
\ No newline at end of file +enableGroupingSessionCache true
\ No newline at end of file diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/variants-of-explicit-compound.cfg b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/variants-of-explicit-compound.cfg index 1e7739d9962..e5e2ff92510 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/variants-of-explicit-compound.cfg +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/variants-of-explicit-compound.cfg @@ -15,4 +15,4 @@ queryprofile[1].queryprofilevariant[0].property[0].value "a.b.x1" queryprofile[1].queryprofilevariant[1].fordimensionvalues[0] "x2" queryprofile[1].queryprofilevariant[1].property[0].name "a.b" queryprofile[1].queryprofilevariant[1].property[0].value "a.b.x2" -enableGroupingSessionCache false
\ No newline at end of file +enableGroupingSessionCache true
\ No newline at end of file |