Remove feature flag for grouping session cache

17 files changed, 17 insertions, 44 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
index 56621550aa0..149943a89dc 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
@@ -59,7 +59,7 @@ public interface ModelContext {
         boolean useAdaptiveDispatch();
         // TODO: Remove temporary default implementation
         default Optional<TlsSecrets> tlsSecrets() { return Optional.empty(); }
-        default boolean enableGroupingSessionCache() { return false; }
+        default boolean enableGroupingSessionCache() { return true; } // TODO Remove once no longer in use by old config models
         double defaultTermwiseLimit();
     }
 
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
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
index b0fdc87c244..2b36f3496fe 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
@@ -136,7 +136,6 @@ public class ModelContextImpl implements ModelContext {
         private final boolean useAdaptiveDispatch;
         private final boolean dispatchWithProtobuf;
         private final Optional<TlsSecrets> tlsSecrets;
-        private final boolean enableGroupingSessionCache;
         private final double defaultTermwiseLimit;
 
         public Properties(ApplicationId applicationId,
@@ -174,8 +173,6 @@ public class ModelContextImpl implements ModelContext {
             this.useAdaptiveDispatch = Flags.USE_ADAPTIVE_DISPATCH.bindTo(flagSource)
                     .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
             this.tlsSecrets = tlsSecrets;
-            this.enableGroupingSessionCache = Flags.ENABLE_GROUPING_SESSION_CACHE.bindTo(flagSource)
-                    .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
             defaultTermwiseLimit = Flags.DEFAULT_TERM_WISE_LIMIT.bindTo(flagSource)
                     .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
         }
@@ -236,11 +233,6 @@ public class ModelContextImpl implements ModelContext {
         public Optional<TlsSecrets> tlsSecrets() { return tlsSecrets; }
 
         @Override
-        public boolean enableGroupingSessionCache() {
-            return enableGroupingSessionCache;
-        }
-
-        @Override
         public double defaultTermwiseLimit() { return defaultTermwiseLimit; }
     }
 
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 <init>(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 <init>(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 <init>(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 <init>(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<String> 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
 
 
 
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
index 7dcdda38765..20ce7fe2578 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -145,10 +145,10 @@ public class Flags {
             "Takes effect on deployment through controller",
             APPLICATION_ID);
 
-    public static final UnboundBooleanFlag ENABLE_GROUPING_SESSION_CACHE = defineFeatureFlag(
-            "enable-grouping-session-cache", true,
-            "Enable grouping session cache",
-            "Takes effect at redeployment",
+    public static final UnboundBooleanFlag MULTIPLE_GLOBAL_ENDPOINTS = defineFeatureFlag(
+            "multiple-global-endpoints", false,
+            "Allow applications to use new endpoints syntax in deployment.xml",
+            "Takes effect on deployment through controller",
             APPLICATION_ID);
 
     public static final UnboundDoubleFlag DEFAULT_TERM_WISE_LIMIT = defineDoubleFlag(