Add support for approximate nearest neighbor threshold settings in Query API.

1 files changed, 14 insertions, 3 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/query/MatchingTestCase.java b/container-search/src/test/java/com/yahoo/search/query/MatchingTestCase.java
index d4de8dba9dd..d117f88aa6a 100644
--- a/container-search/src/test/java/com/yahoo/search/query/MatchingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/MatchingTestCase.java
@@ -19,22 +19,33 @@ public class MatchingTestCase {
         assertNull(query.getRanking().getMatching().getNumThreadsPerSearch());
         assertNull(query.getRanking().getMatching().getNumSearchPartitions());
         assertNull(query.getRanking().getMatching().getMinHitsPerThread());
-
+        assertNull(query.getRanking().getMatching().getPostFilterThreshold());
+        assertNull(query.getRanking().getMatching().getApproximateThreshold());
     }
 
     @Test
-    public void testQueryOverride() {
-        Query query = new Query("?query=test&ranking.matching.termwiselimit=0.7&ranking.matching.numthreadspersearch=17&ranking.matching.numsearchpartitions=13&ranking.matching.minhitsperthread=3");
+    public void testQueryOverrides() {
+        Query query = new Query("?query=test" +
+                "&ranking.matching.termwiselimit=0.7" +
+                "&ranking.matching.numthreadspersearch=17" +
+                "&ranking.matching.numsearchpartitions=13" +
+                "&ranking.matching.minhitsperthread=3" +
+                "&ranking.matching.postFilterThreshold=0.8" +
+                "&ranking.matching.approximateThreshold=0.3");
         assertEquals(Double.valueOf(0.7), query.getRanking().getMatching().getTermwiseLimit());
         assertEquals(Integer.valueOf(17), query.getRanking().getMatching().getNumThreadsPerSearch());
         assertEquals(Integer.valueOf(13), query.getRanking().getMatching().getNumSearchPartitions());
         assertEquals(Integer.valueOf(3), query.getRanking().getMatching().getMinHitsPerThread());
+        assertEquals(Double.valueOf(0.8), query.getRanking().getMatching().getPostFilterThreshold());
+        assertEquals(Double.valueOf(0.3), query.getRanking().getMatching().getApproximateThreshold());
 
         query.prepare();
         assertEquals("0.7", query.getRanking().getProperties().get("vespa.matching.termwise_limit").get(0));
         assertEquals("17", query.getRanking().getProperties().get("vespa.matching.numthreadspersearch").get(0));
         assertEquals("13", query.getRanking().getProperties().get("vespa.matching.numsearchpartitions").get(0));
         assertEquals("3", query.getRanking().getProperties().get("vespa.matching.minhitsperthread").get(0));
+        assertEquals("0.8", query.getRanking().getProperties().get("vespa.matching.global_filter.upper_limit").get(0));
+        assertEquals("0.3", query.getRanking().getProperties().get("vespa.matching.global_filter.lower_limit").get(0));
     }
 
     private void verifyException(String key, String value) {