If hits has been set higher than default weakand targethits, adjust all weakand with not explicit set heap size up to hits.

1 files changed, 15 insertions, 0 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/searchers/OpportunisticWeakAndSearcher.java b/container-search/src/main/java/com/yahoo/search/searchers/OpportunisticWeakAndSearcher.java
index c56b161edeb..1833df4631e 100644
--- a/container-search/src/main/java/com/yahoo/search/searchers/OpportunisticWeakAndSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/searchers/OpportunisticWeakAndSearcher.java
@@ -32,6 +32,9 @@ public class OpportunisticWeakAndSearcher extends Searcher {
 
     @Override
     public Result search(Query query, Execution execution) {
+        if (query.getHits() > WeakAndItem.defaultN) {
+            adjustWeakAndHeap(query.getModel().getQueryTree().getRoot(), query.getHits());
+        }
         if (!query.properties().getBoolean(OPPORTUNISTIC_AND)) {
             return execution.search(query);
         }
@@ -52,6 +55,18 @@ public class OpportunisticWeakAndSearcher extends Searcher {
         return execution.search(query);
     }
 
+    static Item adjustWeakAndHeap(Item item, int hits) {
+        if (item instanceof WeakAndItem weakAnd && hits > weakAnd.getN() && !weakAnd.isNExplicit()) {
+            weakAnd.setN(hits);
+        }
+        if (item instanceof CompositeItem compositeItem) {
+            for (int i = 0; i < compositeItem.getItemCount(); i++) {
+                adjustWeakAndHeap(compositeItem.getItem(i), hits);
+            }
+        }
+        return item;
+    }
+
     // returns targetHits for the first WeakAndItem found, -1 if none found.
     static int targetHits(Item item) {
         if (!(item instanceof CompositeItem compositeItem)) return -1;