Merge pull request #37231 from vespa-engine/boeker/enable-ann-timeout-by-default

Enable ANN timeout by default

Author: boeker

container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java

@@ -113,7 +113,7 @@ private static Map<CompoundName, GetterSetter> createPropertySetterMap() {
         addDualCasedRM(map, Matching.LAZY_FILTER, GetterSetter.of(query -> query.getRanking().getMatching().getLazyFilter(), (query, value) -> query.getRanking().getMatching().setLazyFilter(asBoolean(value, false))));
         addDualCasedRM(map, Matching.FILTER_THRESHOLD, GetterSetter.of(query -> query.getRanking().getMatching().getFilterThreshold(), (query, value) -> query.getRanking().getMatching().setFilterThreshold(asDouble(value, 1.0))));
         addDualCasedRM(map, Matching.ANNTIMEBUDGET, GetterSetter.of(query -> query.getRanking().getMatching().getAnnTimeBudget(), (query, value) -> query.getRanking().getMatching().setAnnTimeBudget(ParameterParser.asMilliSeconds(value, Long.MAX_VALUE))));
-        map.put(CompoundName.fromComponents(Ranking.RANKING, Matching.MATCHING, Matching.ANNTIMEOUT, AnnTimeout.ENABLE), GetterSetter.of(query -> query.getRanking().getMatching().getAnnTimeout().getEnable(), (query, value) -> query.getRanking().getMatching().getAnnTimeout().setEnable(asBoolean(value, false))));
+        map.put(CompoundName.fromComponents(Ranking.RANKING, Matching.MATCHING, Matching.ANNTIMEOUT, AnnTimeout.ENABLE), GetterSetter.of(query -> query.getRanking().getMatching().getAnnTimeout().getEnable(), (query, value) -> query.getRanking().getMatching().getAnnTimeout().setEnable(asBoolean(value, true))));
         map.put(CompoundName.fromComponents(Ranking.RANKING, Matching.MATCHING, Matching.ANNTIMEOUT, AnnTimeout.FACTOR), GetterSetter.of(query -> query.getRanking().getMatching().getAnnTimeout().getFactor(), (query, value) -> query.getRanking().getMatching().getAnnTimeout().setFactor(asDouble(value, 0.9))));
         map.put(CompoundName.fromComponents(Ranking.RANKING, Matching.MATCHING, Matching.WEAKAND, WeakAnd.STOPWORD_LIMIT), GetterSetter.of(query -> query.getRanking().getMatching().getWeakAnd().getStopwordLimit(), (query, value) -> query.getRanking().getMatching().getWeakAnd().setStopwordLimit(asDouble(value, 1.0))));
         map.put(CompoundName.fromComponents(Ranking.RANKING, Matching.MATCHING, Matching.WEAKAND, WeakAnd.ADJUST_TARGET), GetterSetter.of(query -> query.getRanking().getMatching().getWeakAnd().getAdjustTarget(), (query, value) -> query.getRanking().getMatching().getWeakAnd().setAdjustTarget(asDouble(value, 1.0))));

container-search/src/main/java/com/yahoo/search/query/ranking/AnnTimeout.java

@@ -38,11 +38,10 @@ public void setEnable(boolean enable) {
         this.enabled = enable;
     }
 
-    /** Returns whether anntimeout is enabled. Default is false.
-     * TODO: Make true the default once everything is in place.
+    /** Returns whether anntimeout is enabled. Default is true.
      * */
     public Boolean getEnable() {
-        if (enabled == null) return Boolean.FALSE;
+        if (enabled == null) return Boolean.TRUE;
         return enabled;
     }
 

container-search/src/test/java/com/yahoo/search/query/AnnTimeoutTestCase.java

@@ -18,14 +18,14 @@ public class AnnTimeoutTestCase {
     @Test
     void testDefaultsInQuery() {
         Query query = new Query("?query=test");
-        assertFalse(query.getRanking().getMatching().getAnnTimeout().getEnable());
+        assertTrue(query.getRanking().getMatching().getAnnTimeout().getEnable());
         assertNull(query.getRanking().getMatching().getAnnTimeout().getFactor());
     }
 
     @Test
     void testQueryOverride() {
         Query query = new Query("?query=test&ranking.matching.anntimeout.factor=0.1");
-        assertFalse(query.getRanking().getMatching().getAnnTimeout().getEnable());
+        assertTrue(query.getRanking().getMatching().getAnnTimeout().getEnable());
         assertEquals(Double.valueOf(0.1), query.getRanking().getMatching().getAnnTimeout().getFactor());
         query.prepare();
         assertNull(query.getRanking().getProperties().get("vespa.matching.nns.anntimeout.enable"));

searchlib/src/vespa/searchlib/fef/indexproperties.cpp

@@ -544,7 +544,7 @@ bool AnnTimeBudget::is_present(const Properties& props) {
 namespace anntimeout {
 
 const std::string Enabled::NAME("vespa.matching.nns.anntimeout.enable");
-const bool        Enabled::DEFAULT_VALUE(false);
+const bool        Enabled::DEFAULT_VALUE(true);
 
 bool Enabled::lookup(const Properties& props) {
     return lookupBool(props, NAME, DEFAULT_VALUE);