Don't remove ranked terms when recalling all

2 files changed, 22 insertions, 4 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 84c793a6df1..e35994eb2ab 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
@@ -4,6 +4,8 @@ package com.yahoo.prelude.querytransform;
 import com.yahoo.prelude.query.AndItem;
 import com.yahoo.prelude.query.CompositeItem;
 import com.yahoo.prelude.query.EquivItem;
+import com.yahoo.prelude.query.HasIndexItem;
+import com.yahoo.prelude.query.IndexedItem;
 import com.yahoo.prelude.query.Item;
 import com.yahoo.prelude.query.NearItem;
 import com.yahoo.prelude.query.NotItem;
@@ -169,7 +171,9 @@ public class QueryRewrite {
                         removeOtherNonrankedChildren(item, i);
                         recall = Recall.RECALLS_EVERYTHING;
                     } else if ((item instanceof AndItem) || (item instanceof NearItem)) {
-                        item.removeItem(i);
+                        if ( ! isRanked(item.getItem(i))) {
+                            item.removeItem(i);
+                        }
                     } else if (item instanceof RankItem) {
                         // empty
                     } else {
@@ -200,6 +204,21 @@ public class QueryRewrite {
                 parent.removeItem(i);
         }
     }
+
+    private static boolean isRanked(Item item) {
+        if (item instanceof CompositeItem) {
+            boolean isRanked = false;
+            for (Item child : ((CompositeItem)item).items())
+                isRanked |= isRanked(child);
+            return isRanked;
+        }
+        else if (item instanceof HasIndexItem && Hit.SDDOCNAME_FIELD.equals(((HasIndexItem)item).getIndexName())) {
+            return false; // No point in ranking by sddocname
+        }
+        else {
+            return item.isRanked();
+        }
+    }
     
     private static Item collapseSingleComposites(Item item) {
         if (!(item instanceof CompositeItem)) {
diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java
index d5b480b3be6..36137abd9b8 100644
--- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java
@@ -50,13 +50,12 @@ public class QueryRewriteTestCase {
 
     @Test
     public void testRankContributingTermsAreNotRemovedOnFullRecall() {
-        Query query = new Query(QueryTestCase.httpEncode("?query=default:term1 OR default:term2 OR default:term3 OR sddocname:per&type=adv&recall=+id:1"));
+        Query query = new Query(QueryTestCase.httpEncode("?query=default:term1 OR default:term2 OR default:term3 OR sddocname:per&type=adv&recall=+id:1&restrict=per"));
         RecallSearcher searcher = new RecallSearcher();
         Result result = new Execution(searcher, Execution.Context.createContextStub(new IndexFacts())).search(query);
-        System.out.println(query.yqlRepresentation());
         assertNull(result.hits().getError());
         assertNull(QueryCanonicalizer.canonicalize(query));
-        assertRewritten(query, "");
+        assertRewritten(query, "AND (OR default:term1 default:term2 default:term3 sddocname:per) |id:1");
     }
 
     @Test