1 - Ignores the session key when creating the cache key.

2 - Fix an earlier bug due to variable header size in cache key generation.

2 files changed, 13 insertions, 1 deletions

diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/CacheKeyTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/CacheKeyTestCase.java
index d87d32fa5cf..e7ab1cc137a 100644
--- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/CacheKeyTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/CacheKeyTestCase.java
@@ -26,4 +26,16 @@ public class CacheKeyTestCase extends junit.framework.TestCase {
         assertEquals(k1, k2);
         assertEquals(k1.hashCode(), k2.hashCode());
     }
+
+    public void testSessionKeyIgnored() {
+        Query a = new Query("/?query=abcd");
+        QueryPacket ap = QueryPacket.create(a);
+        Query b = new Query("/?query=abcd&ranking.queryCache=true");
+        QueryPacket bp = QueryPacket.create(b);
+        CacheKey ak = new CacheKey(ap);
+        CacheKey bk = new CacheKey(bp);
+        assertEquals(ak, bk);
+        assertEquals(ak.hashCode(), bk.hashCode());
+        assertFalse(ap.getQueryPacketData().equals(bp.getQueryPacketData()));
+    }
 }
diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketCacheTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketCacheTestCase.java
index 257dfcc456d..e81a1ae2864 100644
--- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketCacheTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketCacheTestCase.java
@@ -50,7 +50,7 @@ public class PacketCacheTestCase extends junit.framework.TestCase {
 
         cache.setMaxCacheItemPercentage(50);
 
-        final int keysz = 30;
+        final int keysz = 32;
 
         // first control assumptions
         assertEquals(keysz, key1.byteSize());