diff options
author | Arne Juul <arnej@verizonmedia.com> | 2020-06-19 09:36:51 +0000 |
---|---|---|
committer | Arne Juul <arnej@verizonmedia.com> | 2020-06-19 09:36:51 +0000 |
commit | ae1297268fa447f7fb7f2f548d4f32c5327ec187 (patch) | |
tree | db10da7ae3848d24d9be728175b36b9596d1e19b /container-search/src/test/java/com/yahoo/select | |
parent | b70147cbdc3139ae9ea43b8341b79b3e1cbbdd1b (diff) |
update SelectParser and add targetHits
* targetHits is now the preferred annotation replacing
targetNumHits (for wand,weakand,nearestneighbor), the
old name still works as an alias
* note: targetNumHits is still produced when serializing to YQL
* debugging/trace output will print the "targetHits" form
* add nearestNeighborItem support to SelectParser
* implement disclose() in nearestNeighborItem
Diffstat (limited to 'container-search/src/test/java/com/yahoo/select')
-rw-r--r-- | container-search/src/test/java/com/yahoo/select/SelectTestCase.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/container-search/src/test/java/com/yahoo/select/SelectTestCase.java b/container-search/src/test/java/com/yahoo/select/SelectTestCase.java index 1715ed38964..d2896aca870 100644 --- a/container-search/src/test/java/com/yahoo/select/SelectTestCase.java +++ b/container-search/src/test/java/com/yahoo/select/SelectTestCase.java @@ -473,7 +473,7 @@ public class SelectTestCase { public void testWand() { assertParse("{ \"wand\": [\"description\", { \"a\": 1, \"b\": 2 }] }", "WAND(10,0.0,1.0) description{[1]:\"a\",[2]:\"b\"}"); - assertParse("{ \"wand\": { \"children\": [\"description\", { \"a\": 1, \"b\": 2 }], \"attributes\": { \"scoreThreshold\": 13.3, \"targetNumHits\": 7, \"thresholdBoostFactor\": 2.3 } } }", + assertParse("{ \"wand\": { \"children\": [\"description\", { \"a\": 1, \"b\": 2 }], \"attributes\": { \"scoreThreshold\": 13.3, \"targetHits\": 7, \"thresholdBoostFactor\": 2.3 } } }", "WAND(7,13.3,2.3) description{[1]:\"a\",[2]:\"b\"}"); } @@ -525,7 +525,7 @@ public class SelectTestCase { public void testWeakAnd() { assertParse("{ \"weakAnd\": [{ \"contains\": [\"a\", \"A\"] }, { \"contains\": [\"b\", \"B\"] } ] }", "WAND(100) a:A b:B"); - assertParse("{ \"weakAnd\": { \"children\" : [{ \"contains\": [\"a\", \"A\"] }, { \"contains\": [\"b\", \"B\"] } ], \"attributes\" : {\"targetNumHits\": 37} }}", + assertParse("{ \"weakAnd\": { \"children\" : [{ \"contains\": [\"a\", \"A\"] }, { \"contains\": [\"b\", \"B\"] } ], \"attributes\" : {\"targetHits\": 37} }}", "WAND(37) a:A b:B"); QueryTree tree = parseWhere("{ \"weakAnd\": { \"children\" : [{ \"contains\": [\"a\", \"A\"] }, { \"contains\": [\"b\", \"B\"] } ], \"attributes\" : {\"scoreThreshold\": 41}}}"); |