summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java4
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java2
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/Flags.java2
3 files changed, 4 insertions, 4 deletions
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 45303a3c646..6f2f3d80426 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
@@ -235,8 +235,8 @@ public class SearchHandler extends LoggingRequestHandler {
CompiledQueryProfile queryProfile = queryProfileRegistry.findQueryProfile(queryProfileName);
Query query = new Query(request, requestMap, queryProfile);
- if (enableGroupingSessionCache) {
- query.setGroupingSessionCache(true);
+ if (!enableGroupingSessionCache) {
+ query.setGroupingSessionCache(false);
}
boolean benchmarking = VespaHeaders.benchmarkOutput(request);
diff --git a/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java b/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java
index a510c5f9564..71752f6ad87 100644
--- a/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java
+++ b/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java
@@ -274,7 +274,7 @@ public class QueryProperties extends Properties {
else if (key.equals(Query.NO_CACHE))
query.setNoCache(asBoolean(value,false));
else if (key.equals(Query.GROUPING_SESSION_CACHE))
- query.setGroupingSessionCache(asBoolean(value, false));
+ query.setGroupingSessionCache(asBoolean(value, true));
else
super.set(key,value,context);
} else
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 b280047c527..700728aa2b9 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -146,7 +146,7 @@ public class Flags {
APPLICATION_ID);
public static final UnboundBooleanFlag ENABLE_GROUPING_SESSION_CACHE = defineFeatureFlag(
- "enable-grouping-session-cache", false,
+ "enable-grouping-session-cache", true,
"Enable grouping session cache",
"Takes effect at redeployment",
APPLICATION_ID);