Enable grouping session cache default.

6 files changed, 19 insertions, 14 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/Query.java b/container-search/src/main/java/com/yahoo/search/Query.java
index 8354ed12fb3..66a75b7092c 100644
--- a/container-search/src/main/java/com/yahoo/search/Query.java
+++ b/container-search/src/main/java/com/yahoo/search/Query.java
@@ -153,7 +153,7 @@ public class Query extends com.yahoo.processing.Request implements Cloneable {
     private boolean noCache = false;
 
     /** Whether or not grouping should use a session cache */
-    private boolean groupingSessionCache = false;
+    private boolean groupingSessionCache = true;
 
     //--------------  Generic property containers --------------------------------
 
diff --git a/container-search/src/test/java/com/yahoo/fs4/test/GetDocSumsPacketTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/GetDocSumsPacketTestCase.java
index 54512e727c2..527a2736fee 100644
--- a/container-search/src/test/java/com/yahoo/fs4/test/GetDocSumsPacketTestCase.java
+++ b/container-search/src/test/java/com/yahoo/fs4/test/GetDocSumsPacketTestCase.java
@@ -49,7 +49,7 @@ public class GetDocSumsPacketTestCase {
 
     @Test
     public void requireThatSessionIdIsEncodedAsPropertyWhenUsingSearchSession() throws BufferTooSmallException {
-        Result result = new Result(new Query("?query=foo"));
+        Result result = new Result(new Query("?query=foo&groupingSessionCache=false"));
         SessionId sessionId = result.getQuery().getSessionId("node-0");
         result.getQuery().getRanking().setQueryCache(true);
         FastHit hit = new FastHit();
diff --git a/container-search/src/test/java/com/yahoo/fs4/test/PacketTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/PacketTestCase.java
index 5bd90ee623b..7ee445bc6ba 100644
--- a/container-search/src/test/java/com/yahoo/fs4/test/PacketTestCase.java
+++ b/container-search/src/test/java/com/yahoo/fs4/test/PacketTestCase.java
@@ -88,7 +88,7 @@ public class PacketTestCase {
 
     @Test
     public void requireThatPacketsCanTurnOnCompression() throws BufferTooSmallException {
-        QueryPacket queryPacket = QueryPacket.create("container.0", new Query("/?query=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"));
+        QueryPacket queryPacket = QueryPacket.create("container.0", new Query("/?query=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&groupingSessionCache=false"));
         ByteBuffer buffer = ByteBuffer.allocate(1024);
         int channel = 32;
 
@@ -116,7 +116,7 @@ public class PacketTestCase {
 
     @Test
     public void requireThatUncompressablePacketsArentCompressed() throws BufferTooSmallException {
-        QueryPacket queryPacket = QueryPacket.create("container.0", new Query("/?query=aaaaaaaaaaaaaaa"));
+        QueryPacket queryPacket = QueryPacket.create("container.0", new Query("/?query=aaaaaaaaaaaaaaa&groupingSessionCache=false"));
         ByteBuffer buffer = ByteBuffer.allocate(1024);
         int channel = 32;
 
diff --git a/container-search/src/test/java/com/yahoo/fs4/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/QueryTestCase.java
index 911831e3a65..10d55b91131 100644
--- a/container-search/src/test/java/com/yahoo/fs4/test/QueryTestCase.java
+++ b/container-search/src/test/java/com/yahoo/fs4/test/QueryTestCase.java
@@ -29,7 +29,7 @@ public class QueryTestCase {
 
     @Test
     public void testEncodePacket() {
-        Query query = new Query("/?query=chain&timeout=0");
+        Query query = new Query("/?query=chain&timeout=0&groupingSessionCache=false");
         query.setWindow(2, 8);
         QueryPacket packet = QueryPacket.create("container.0", query);
         assertEquals(2, packet.getOffset());
@@ -52,7 +52,7 @@ public class QueryTestCase {
 
     @Test
     public void testEncodeQueryPacketWithSomeAdditionalFeatures() {
-        Query query = new Query("/?query=chain&dataset=10&type=phrase&timeout=0");
+        Query query = new Query("/?query=chain&dataset=10&type=phrase&timeout=0&groupingSessionCache=false");
         query.properties().set(SoftTimeout.enableProperty, false);
 
         // Because the rank mapping now needs config and a searcher,
@@ -82,7 +82,8 @@ public class QueryTestCase {
                                 "&ranking.features.query(foo)=30.3&ranking.features.query(bar)=0" +
                                 "&ranking.properties.property.p1=v1&ranking.properties.property.p2=v2" +
                                 "&pos.ll=S22.4532;W123.9887&pos.radius=3&pos.attribute=place&ranking.freshness=37" +
-                                "&model.searchPath=7/3");
+                                "&model.searchPath=7/3" +
+                                "&groupingSessionCache=false");
         query.getRanking().setFreshness(new Freshness("123456"));
         query.getRanking().setSorting("+field1 -field2");
         query.getRanking().setProfile("two");
@@ -108,7 +109,8 @@ public class QueryTestCase {
                                 "&ranking.features.query(foo)=30.3&ranking.features.query(bar)=0" +
                                 "&ranking.properties.property.p1=v1&ranking.properties.property.p2=v2" +
                                 "&pos.ll=S22.4532;W123.9887&pos.radius=3&pos.attribute=place&ranking.freshness=37" +
-                                "&model.searchPath=7/3");
+                                "&model.searchPath=7/3" +
+                                "&groupingSessionCache=false");
         query.getRanking().setFreshness("123456");
         query.getRanking().setSorting("+field1 -field2");
         query.getRanking().setProfile("two");
@@ -130,6 +132,7 @@ public class QueryTestCase {
     @Test
     public void testEncodeQueryPacketWithLabelsConnectivityAndSignificance() {
         Query query = new Query();
+        query.setGroupingSessionCache(false);
         AndItem and = new AndItem();
         WeightedSetItem taggable1 = new WeightedSetItem("field1");
         taggable1.setLabel("foo");
@@ -159,7 +162,7 @@ public class QueryTestCase {
 
     @Test
     public void testEncodeSortSpec() throws BufferTooSmallException {
-        Query query = new Query("/?query=chain&sortspec=%2Ba+-b&timeout=0");
+        Query query = new Query("/?query=chain&sortspec=%2Ba+-b&timeout=0&groupingSessionCache=false");
         query.setWindow(2, 8);
         QueryPacket packet = QueryPacket.create("container.0", query);
         ByteBuffer buffer = ByteBuffer.allocate(500);
@@ -197,12 +200,13 @@ public class QueryTestCase {
         QueryPacket packet = QueryPacket.create("container.0", query);
 
         ByteBuffer buffer = packet.grantEncodingBuffer(0, ByteBuffer.allocate(2));
-        assertEquals(64, buffer.capacity());
+        assertEquals(128, buffer.capacity());
     }
 
     @Test
     public void testPhraseEqualsPhraseWithPhraseSegment() throws BufferTooSmallException {
         Query query = new Query();
+        query.setGroupingSessionCache(false);
         PhraseItem p = new PhraseItem();
         PhraseSegmentItem ps = new PhraseSegmentItem("a b", false, false);
         ps.addItem(new WordItem("a"));
@@ -218,6 +222,7 @@ public class QueryTestCase {
         queryPacket.encode(buffer1, 0);
 
         query = new Query();
+        query.setGroupingSessionCache(false);
         p = new PhraseItem();
         p.addItem(new WordItem("a"));
         p.addItem(new WordItem("b"));
@@ -242,7 +247,7 @@ public class QueryTestCase {
 
     @Test
     public void testPatchInChannelId() {
-        Query query = new Query("/?query=chain&timeout=0");
+        Query query = new Query("/?query=chain&timeout=0&groupingSessionCache=false");
         query.setWindow(2, 8);
         QueryPacket packet = QueryPacket.create("container.0", query);
         assertEquals(2,packet.getOffset());
diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java
index 4f54b60187b..c6e87170f07 100644
--- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java
@@ -172,7 +172,7 @@ public class FastSearcherTestCase {
                                                      new ClusterParams("testhittype"),
                                                      documentdbConfigWithOneDb);
 
-        Query query = new Query("?query=foo&model.restrict=testDb");
+        Query query = new Query("?query=foo&model.restrict=testDb&groupingSessionCache=false");
         query.prepare();
         doSearch(fastSearcher, query, 0, 10);
 
@@ -280,7 +280,7 @@ public class FastSearcherTestCase {
     public void testThatPropertiesAreReencoded() throws Exception {
         FastSearcher fastSearcher = createFastSearcher();
 
-        Query query = new Query("?query=ignored&dispatch.summaries=false");
+        Query query = new Query("?query=ignored&dispatch.summaries=false&groupingSessionCache=false");
         query.getRanking().setQueryCache(true);
         Result result = doSearch(fastSearcher, query, 0, 10);
 
diff --git a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
index b65359a711b..45f270b2e37 100644
--- a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
@@ -426,7 +426,7 @@ public class QueryTestCase {
         Query q = new Query("search?query=foobar&groupingSessionCache");
         assertTrue(q.getGroupingSessionCache());
         q = new Query("search?query=foobar");
-        assertFalse(q.getGroupingSessionCache());
+        assertTrue(q.getGroupingSessionCache());
     }
 
     public class TestClass {