Merge pull request #7582 from vespa-engine/ollivir/avoid-query-clone

Avoid Query.clone which changes the sessionId (and the cache key)

1 files changed, 7 insertions, 5 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java b/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java
index d80f3a49213..9ff43df87cf 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java
@@ -33,13 +33,15 @@ public class InterleavedSearchInvoker extends SearchInvoker {
      */
     @Override
     protected void sendSearchRequest(Query query, QueryPacket queryPacket) throws IOException {
+        int originalHits = query.getHits();
+        int originalOffset = query.getOffset();
+        query.setHits(query.getHits() + query.getOffset());
+        query.setOffset(0);
         for (SearchInvoker invoker : invokers) {
-            Query subquery = query.clone();
-
-            subquery.setHits(subquery.getHits() + subquery.getOffset());
-            subquery.setOffset(0);
-            invoker.sendSearchRequest(subquery, null);
+            invoker.sendSearchRequest(query, null);
         }
+        query.setHits(originalHits);
+        query.setOffset(originalOffset);
     }
 
     @Override