From c1b58ec6d0edb09edc94bb62d449c9ff2bc89499 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Thu, 22 Aug 2019 11:18:51 +0200 Subject: Remove feature flag for grouping session cache --- container-search/abi-spec.json | 2 +- .../src/main/java/com/yahoo/search/handler/SearchHandler.java | 8 -------- .../src/main/resources/configdefinitions/query-profiles.def | 5 ++--- 3 files changed, 3 insertions(+), 12 deletions(-) (limited to 'container-search') diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json index 164794243ec..cfb8d9dc1fb 100644 --- a/container-search/abi-spec.json +++ b/container-search/abi-spec.json @@ -4154,7 +4154,7 @@ ], "methods": [ "public void (com.yahoo.statistics.Statistics, com.yahoo.jdisc.Metric, java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog, com.yahoo.search.query.profile.config.QueryProfilesConfig, com.yahoo.container.core.ContainerHttpConfig, com.yahoo.search.searchchain.ExecutionFactory)", - "public void (com.yahoo.statistics.Statistics, com.yahoo.jdisc.Metric, java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog, com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry, com.yahoo.search.searchchain.ExecutionFactory, boolean, java.util.Optional)", + "public void (com.yahoo.statistics.Statistics, com.yahoo.jdisc.Metric, java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog, com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry, com.yahoo.search.searchchain.ExecutionFactory, java.util.Optional)", "public void (com.yahoo.container.core.ChainsConfig, com.yahoo.search.config.IndexInfoConfig, com.yahoo.container.QrSearchersConfig, com.yahoo.vespa.configdefinition.SpecialtokensConfig, com.yahoo.statistics.Statistics, com.yahoo.language.Linguistics, com.yahoo.jdisc.Metric, com.yahoo.component.provider.ComponentRegistry, java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog, com.yahoo.search.query.profile.config.QueryProfilesConfig, com.yahoo.component.provider.ComponentRegistry, com.yahoo.container.core.ContainerHttpConfig)", "public final com.yahoo.container.jdisc.HttpResponse handle(com.yahoo.container.jdisc.HttpRequest)", "public com.yahoo.search.Result searchAndFill(com.yahoo.search.Query, com.yahoo.component.chain.Chain)", diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java index eef4cb72e9b..57ecc468b48 100644 --- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java +++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java @@ -98,8 +98,6 @@ public class SearchHandler extends LoggingRequestHandler { private final ExecutionFactory executionFactory; - private final boolean enableGroupingSessionCache; - private final class MeanConnections implements Callback { @Override @@ -127,7 +125,6 @@ public class SearchHandler extends LoggingRequestHandler { accessLog, QueryProfileConfigurer.createFromConfig(queryProfileConfig).compile(), executionFactory, - queryProfileConfig.enableGroupingSessionCache(), containerHttpConfig.hostResponseHeaderKey().equals("") ? Optional.empty() : Optional.of( containerHttpConfig.hostResponseHeaderKey())); } @@ -138,11 +135,9 @@ public class SearchHandler extends LoggingRequestHandler { AccessLog accessLog, CompiledQueryProfileRegistry queryProfileRegistry, ExecutionFactory executionFactory, - boolean enableGroupingSessionCache, Optional hostResponseHeaderKey) { super(executor, accessLog, metric, true); log.log(LogLevel.DEBUG, "SearchHandler.init " + System.identityHashCode(this)); - this.enableGroupingSessionCache = enableGroupingSessionCache; this.queryProfileRegistry = queryProfileRegistry; this.executionFactory = executionFactory; @@ -251,9 +246,6 @@ public class SearchHandler extends LoggingRequestHandler { CompiledQueryProfile queryProfile = queryProfileRegistry.findQueryProfile(queryProfileName); Query query = new Query(request, requestMap, queryProfile); - if (!enableGroupingSessionCache) { - query.setGroupingSessionCache(false); - } boolean benchmarking = VespaHeaders.benchmarkOutput(request); boolean benchmarkCoverage = VespaHeaders.benchmarkCoverage(benchmarking, request.getJDiscRequest().headers()); diff --git a/container-search/src/main/resources/configdefinitions/query-profiles.def b/container-search/src/main/resources/configdefinitions/query-profiles.def index 11966cae8ce..3c6d11e2944 100644 --- a/container-search/src/main/resources/configdefinitions/query-profiles.def +++ b/container-search/src/main/resources/configdefinitions/query-profiles.def @@ -86,9 +86,8 @@ 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="" -# Temporary feature flag for enabling grouping session cache by default -# TODO Remove me once grouping session cache rollout is complete and cache is enabled by default -enableGroupingSessionCache bool default=false +# TODO Remove once no longer used by old config models +enableGroupingSessionCache bool default=true -- cgit v1.2.3