Remove unranked items not contributing to recall

1 files changed, 10 insertions, 0 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/querytransform/QueryRewrite.java b/container-search/src/main/java/com/yahoo/prelude/querytransform/QueryRewrite.java
index 61c41c7dc45..d4b3175aac9 100644
--- a/container-search/src/main/java/com/yahoo/prelude/querytransform/QueryRewrite.java
+++ b/container-search/src/main/java/com/yahoo/prelude/querytransform/QueryRewrite.java
@@ -166,6 +166,7 @@ public class QueryRewrite {
             switch (optimizeByRestrict(item.getItem(i), restrictParam)) {
                 case RECALLS_EVERYTHING:
                     if ((item instanceof OrItem) || (item instanceof EquivItem)) {
+                        removeOtherNonrankedChildren(item, i);
                         recall = Recall.RECALLS_EVERYTHING;
                     } else if ((item instanceof AndItem) || (item instanceof NearItem)) {
                         item.removeItem(i);
@@ -191,6 +192,15 @@ public class QueryRewrite {
         return recall;
     }
 
+    private static void removeOtherNonrankedChildren(CompositeItem parent, int indexOfChildToKeep) {
+        Item childToKeep = parent.getItem(indexOfChildToKeep);
+        for (int i = parent.getItemCount(); --i >= 0; ) {
+            Item child = parent.getItem(i);
+            if ( child != childToKeep && ! parent.getItem(i).isRanked())
+                parent.removeItem(i);
+        }
+    }
+    
     private static Item collapseSingleComposites(Item item) {
         if (!(item instanceof CompositeItem)) {
             return item;