Change user query default from ALL to WEAKAND on Vespa 8

6 files changed, 32 insertions, 31 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/RewriterFeaturesTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/RewriterFeaturesTestCase.java
index 7e9ed674475..72b77377bf2 100644
--- a/container-search/src/test/java/com/yahoo/search/query/rewrite/RewriterFeaturesTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/RewriterFeaturesTestCase.java
@@ -3,6 +3,7 @@ package com.yahoo.search.query.rewrite;
 
 import static org.junit.Assert.*;
 
+import com.yahoo.prelude.query.WeakAndItem;
 import org.junit.Test;
 
 import com.yahoo.prelude.query.AndItem;
@@ -37,7 +38,7 @@ public class RewriterFeaturesTestCase {
         query.getModel().setExecution(placeholder);
         Item parsed = RewriterFeatures.convertStringToQTree(query, "a b c "
                 + ASCII_ELLIPSIS);
-        assertSame(AndItem.class, parsed.getClass());
+        assertSame(WeakAndItem.class, parsed.getClass());
         assertEquals(4, ((CompositeItem) parsed).getItemCount());
         assertEquals(ASCII_ELLIPSIS, ((CompositeItem) parsed).getItem(3).toString());
     }
diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/GenericExpansionRewriterTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/GenericExpansionRewriterTestCase.java
index 49d1497b2d3..d9a3603bdaf 100644
--- a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/GenericExpansionRewriterTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/GenericExpansionRewriterTestCase.java
@@ -97,7 +97,7 @@ public class GenericExpansionRewriterTestCase {
      */
     @Test
     public void testFullPhraseNoMaxRewriteSingleWordFilter() {
-        utils.assertRewrittenQuery("?query=ca&" +
+        utils.assertRewrittenQuery("?query=ca&type=all&" +
                                    "filter=citystate:santa clara ca&" +
                                    REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=false",
                                    "query 'RANK (OR california ca) |citystate:santa |clara |ca'");
@@ -108,7 +108,7 @@ public class GenericExpansionRewriterTestCase {
      */
     @Test
     public void testPartialPhraseNoMaxRewriteSingleWordFilter() {
-        utils.assertRewrittenQuery("?query=ca&" +
+        utils.assertRewrittenQuery("?query=ca&type=all&" +
                                    "filter=citystate:santa clara ca&" +
                                    REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=true",
                                    "query 'RANK (OR california ca) |citystate:santa |clara |ca'");
@@ -119,7 +119,7 @@ public class GenericExpansionRewriterTestCase {
      */
     @Test
     public void testFullPhraseNoMaxRewriteMultiWordFilter() {
-        utils.assertRewrittenQuery("?query=travel agency&" +
+        utils.assertRewrittenQuery("?query=travel agency&type=all&" +
                                    "filter=citystate:santa clara ca&" +
                                    REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=false",
                                    "query 'RANK (OR ta (AND travel agency)) |citystate:santa |clara |ca'");
@@ -131,7 +131,7 @@ public class GenericExpansionRewriterTestCase {
     @Test
     public void testPartialPhraseNoMaxRewriteMultiWordFilter() {
         utils.assertRewrittenQuery("?query=modern new york city travel phone number&" +
-                                   "filter=citystate:santa clara ca&" +
+                                   "filter=citystate:santa clara ca&type=all&" +
                                    REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=true",
                                    "query 'RANK (AND modern (OR (AND rewrite11 rewrite12) rewrite2 rewrite3 " +
                                    "rewrite4 rewrite5 (AND new york city travel)) (OR pn (AND phone number))) " +
@@ -143,7 +143,7 @@ public class GenericExpansionRewriterTestCase {
      */
     @Test
     public void testFullPhraseNoMaxRewriteSingleWord() {
-        utils.assertRewrittenQuery("?query=ca&" +
+        utils.assertRewrittenQuery("?query=ca&type=all&" +
                                    REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=false",
                                    "query 'OR california ca'");
     }
@@ -153,7 +153,7 @@ public class GenericExpansionRewriterTestCase {
      */
     @Test
     public void testPartialPhraseNoMaxRewriteSingleWord() {
-        utils.assertRewrittenQuery("?query=ca&" +
+        utils.assertRewrittenQuery("?query=ca&type=all&" +
                                    REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=true",
                                    "query 'OR california ca'");
     }
@@ -163,7 +163,7 @@ public class GenericExpansionRewriterTestCase {
      */
     @Test
     public void testFullPhraseNoMaxRewriteMultiWord() {
-        utils.assertRewrittenQuery("?query=travel agency&" +
+        utils.assertRewrittenQuery("?query=travel agency&type=all&" +
                                    REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=false",
                                    "query 'OR ta (AND travel agency)'");
     }
@@ -173,7 +173,7 @@ public class GenericExpansionRewriterTestCase {
      */
     @Test
     public void testFullPhraseNoMaxRewriteMultiWordNoMatch() {
-        utils.assertRewrittenQuery("?query=nyc travel agency&" +
+        utils.assertRewrittenQuery("?query=nyc travel agency&type=all&" +
                                    REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=false",
                                    "query 'AND nyc travel agency'");
     }
@@ -183,7 +183,7 @@ public class GenericExpansionRewriterTestCase {
      */
     @Test
     public void testPartialPhraseNoMaxRewriteMultiWord() {
-        utils.assertRewrittenQuery("?query=modern new york city travel phone number&" +
+        utils.assertRewrittenQuery("?query=modern new york city travel phone number&type=all&" +
                                    REWRITER_NAME + "." + RewriterConstants.PARTIAL_PHRASE_MATCH + "=true",
                                    "query 'AND modern (OR (AND rewrite11 rewrite12) rewrite2 rewrite3 rewrite4 rewrite5 "+
                                    "(AND new york city travel)) (OR pn (AND phone number))'");
diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/MisspellRewriterTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/MisspellRewriterTestCase.java
index b0d1f36fab1..6c9f9c248ea 100644
--- a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/MisspellRewriterTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/MisspellRewriterTestCase.java
@@ -47,7 +47,7 @@ public class MisspellRewriterTestCase {
         utils.assertRewrittenQuery("?query=willl+smith&" +
                                    REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
                                    REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true",
-                                   "query 'OR (AND willl smith) (AND will smith sugg)'",
+                                   "query 'OR (WEAKAND(100) willl smith) (WEAKAND(100) will smith sugg)'",
                                    intentModel);
     }
 
@@ -67,7 +67,7 @@ public class MisspellRewriterTestCase {
 
         utils.assertRewrittenQuery("?query=willl+smith&" +
                                    REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true",
-                                   "query 'OR (AND willl smith) (AND will smith rw1)'",
+                                   "query 'OR (WEAKAND(100) willl smith) (WEAKAND(100) will smith rw1)'",
                                    intentModel);
     }
 
@@ -87,7 +87,7 @@ public class MisspellRewriterTestCase {
 
         utils.assertRewrittenQuery("?query=willl+smith&" +
                                    REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true",
-                                   "query 'OR (AND willl smith) (AND will smith sugg1)'",
+                                   "query 'OR (WEAKAND(100) willl smith) (WEAKAND(100) will smith sugg1)'",
                                    intentModel);
     }
 
@@ -104,7 +104,7 @@ public class MisspellRewriterTestCase {
                                                              false, true));
 
         utils.assertRewrittenQuery("?query=willl+smith",
-                                   "query 'AND willl smith'",
+                                   "query 'WEAKAND(100) willl smith'",
                                    intentModel);
     }
 
@@ -123,7 +123,7 @@ public class MisspellRewriterTestCase {
         utils.assertRewrittenQuery("?query=will+smith&" +
                                    REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
                                    REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true",
-                                   "query 'AND will smith'",
+                                   "query 'WEAKAND(100) will smith'",
                                    intentModel);
     }
 
diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/NameRewriterTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/NameRewriterTestCase.java
index e645c560f9d..c99ddcd6c62 100644
--- a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/NameRewriterTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/NameRewriterTestCase.java
@@ -45,7 +45,7 @@ public class NameRewriterTestCase {
      */
     @Test
     public void testRewritesAsEquivAndOriginalAsUnit() {
-        utils.assertRewrittenQuery("?query=will smith&" +
+        utils.assertRewrittenQuery("?query=will smith&type=all&" +
                                    REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_EQUIV + "=true&" +
                                    REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT + "=true",
                                    "query 'OR \"will smith\" (AND will smith movies) " +
@@ -60,7 +60,7 @@ public class NameRewriterTestCase {
      */
     @Test
     public void testRewritesAsEquiv() {
-        utils.assertRewrittenQuery("?query=will smith&" +
+        utils.assertRewrittenQuery("?query=will smith&type=all&" +
                                    REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_EQUIV + "=true&",
                                    "query 'OR (AND will smith) (AND will smith movies) " +
                                    "(AND will smith news) (AND will smith imdb) " +
@@ -85,7 +85,7 @@ public class NameRewriterTestCase {
      */
     @Test
     public void testSingleWordForRewritesAsEquivAndOriginalAsUnit() {
-        utils.assertRewrittenQuery("?query=obama&" +
+        utils.assertRewrittenQuery("?query=obama&type=all&" +
                                    REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_EQUIV + "=true&" +
                                    REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT + "=true",
                                    "query 'OR obama (AND obama \"nobel peace prize\") " +
@@ -102,7 +102,7 @@ public class NameRewriterTestCase {
      */
     @Test
     public void testRewritesAsUnitEquivAndOriginalAsUnitEquiv() {
-        utils.assertRewrittenQuery("?query=will smith&" +
+        utils.assertRewrittenQuery("?query=will smith&type=all&" +
                                    REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
                                    "=true&" +
                                    REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT_EQUIV +
@@ -119,7 +119,7 @@ public class NameRewriterTestCase {
      */
     @Test
     public void testSingleWordForRewritesAsUnitEquivAndOriginalAsUnitEquiv() {
-        utils.assertRewrittenQuery("?query=obama&" +
+        utils.assertRewrittenQuery("?query=obama&type=all&" +
                                    REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
                                    "=true&" +
                                    REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT_EQUIV +
@@ -133,7 +133,7 @@ public class NameRewriterTestCase {
      */
     @Test
     public void testBoostingQueryForRewritesAsEquivAndOriginalAsUnit() {
-        utils.assertRewrittenQuery("?query=angelina jolie&" +
+        utils.assertRewrittenQuery("?query=angelina jolie&type=all&" +
                                    REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_EQUIV + "=true&" +
                                    REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT + "=true",
                                    "query '\"angelina jolie\"'");
@@ -145,7 +145,7 @@ public class NameRewriterTestCase {
      */
     @Test
     public void testFSANoMatchForRewritesAsEquivAndOriginalAsUnit() {
-        utils.assertRewrittenQuery("?query=tom cruise&" +
+        utils.assertRewrittenQuery("?query=tom cruise&type=all&" +
                                    REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_EQUIV + "=true&" +
                                    REWRITER_NAME + "." + RewriterConstants.ORIGINAL_AS_UNIT + "=true",
                                    "query 'AND tom cruise'");
@@ -156,7 +156,7 @@ public class NameRewriterTestCase {
      */
     @Test
     public void testRewritesAsUnitEquiv() {
-        utils.assertRewrittenQuery("?query=will smith&" +
+        utils.assertRewrittenQuery("?query=will smith&type=all&" +
                                    REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
                                    "=true",
                                    "query 'OR (AND will smith) \"will smith movies\" " +
@@ -171,7 +171,7 @@ public class NameRewriterTestCase {
      */
     @Test
     public void testRewritesAsUnitEquivAndMaxRewrites() {
-        utils.assertRewrittenQuery("?query=will smith&" +
+        utils.assertRewrittenQuery("?query=will smith&type=all&" +
                                    REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
                                    "=true&" +
                                    REWRITER_NAME + "." + RewriterConstants.MAX_REWRITES + "=2",
diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestCase.java
index a528c032e30..8906dbfa386 100644
--- a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestCase.java
@@ -79,7 +79,7 @@ public class QueryRewriteSearcherTestCase {
         Execution execution = QueryRewriteSearcherTestUtils.createExecutionObj(searchers);
         QueryRewriteSearcherTestUtils utilsWithFakePath = new QueryRewriteSearcherTestUtils(execution);
 
-        utilsWithFakePath.assertRewrittenQuery("?query=will smith&" +
+        utilsWithFakePath.assertRewrittenQuery("?query=will smith&type=all&" +
                                                NAME_REWRITER_NAME + "." +
                                                RewriterConstants.REWRITES_AS_UNIT_EQUIV + "=true",
                                                "query 'AND will smith'");
@@ -91,7 +91,7 @@ public class QueryRewriteSearcherTestCase {
      */
     @Test
     public void testExceptionInRewriter() {
-        utils.assertRewrittenQuery("?query=will smith&" +
+        utils.assertRewrittenQuery("?query=will smith&type=all&" +
                                    MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
                                    MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true&" +
                                    NAME_REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
@@ -117,7 +117,7 @@ public class QueryRewriteSearcherTestCase {
                                   utils.createInterpretation("will smith", 1.0,
                                                              false, true));
 
-        utils.assertRewrittenQuery("?query=willl+smith&" +
+        utils.assertRewrittenQuery("?query=willl+smith&type=all&" +
                                    MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
                                    MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true&" +
                                    NAME_REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/SearchChainDispatcherSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/SearchChainDispatcherSearcherTestCase.java
index bf204cf3d6b..96626738c35 100644
--- a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/SearchChainDispatcherSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/SearchChainDispatcherSearcherTestCase.java
@@ -77,7 +77,7 @@ public class SearchChainDispatcherSearcherTestCase {
                                   utils.createInterpretation("will smith", 1.0,
                                                              false, true));
 
-        utils.assertRewrittenQuery("?query=willl+smith&QRWChain=" + US_MARKET_SEARCH_CHAIN + "&" +
+        utils.assertRewrittenQuery("?query=willl+smith&type=all&QRWChain=" + US_MARKET_SEARCH_CHAIN + "&" +
                                    MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
                                    MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true&" +
                                    NAME_REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
@@ -98,7 +98,7 @@ public class SearchChainDispatcherSearcherTestCase {
      */
     @Test
     public void testInvalidMarketChain() {
-        utils.assertRewrittenQuery("?query=will smith&QRWChain=abc&" +
+        utils.assertRewrittenQuery("?query=will smith&type=all&QRWChain=abc&" +
                                    MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
                                    MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true&" +
                                    NAME_REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
@@ -112,7 +112,7 @@ public class SearchChainDispatcherSearcherTestCase {
      */
     @Test
     public void testEmptyMarketChain() {
-        utils.assertRewrittenQuery("?query=will smith&QRWChain=&" +
+        utils.assertRewrittenQuery("?query=will smith&type=all&QRWChain=&" +
                                    MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
                                    MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true&" +
                                    NAME_REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +
@@ -161,7 +161,7 @@ public class SearchChainDispatcherSearcherTestCase {
                                   utils.createInterpretation("will smith", 1.0,
                                                              false, true));
 
-        utils.assertRewrittenQuery("?query=willl+smith&QRWChain=" + US_MARKET_SEARCH_CHAIN + "&" +
+        utils.assertRewrittenQuery("?query=willl+smith&type=all&QRWChain=" + US_MARKET_SEARCH_CHAIN + "&" +
                                    MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_RW + "=true&" +
                                    MISSPELL_REWRITER_NAME + "." + RewriterConstants.QSS_SUGG + "=true&" +
                                    NAME_REWRITER_NAME + "." + RewriterConstants.REWRITES_AS_UNIT_EQUIV +