diff options
| author | Arne Juul <arnej@verizonmedia.com> | 2020-08-12 14:09:43 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@verizonmedia.com> | 2020-08-13 06:24:26 +0000 |
| commit | 26ef4176219ec2e2f4ba213736982518a0221b31 (patch) | |
| tree | 8ba1f4b48dbd5284cb83e11b9efd4308cc2b9ab6 /container-search | |
| parent | 0900fac9130db30909643aedec7ae9fdf92c8e4c (diff) | |
backend handles -1 as "infinite" radius, stop using silly big number
Diffstat (limited to 'container-search')
4 files changed, 6 insertions, 6 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/Location.java b/container-search/src/main/java/com/yahoo/prelude/Location.java index 3d3eed3b3df..f6228509bbb 100644 --- a/container-search/src/main/java/com/yahoo/prelude/Location.java +++ b/container-search/src/main/java/com/yahoo/prelude/Location.java @@ -374,7 +374,7 @@ public class Location { } private int backendRadius() { - return (r < 0) ? (512 * 1024 * 1024) : r; + return (r < 0) ? -1 : r; } /** diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java index bc3ac6cdef1..e5e46f21a2a 100644 --- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java @@ -257,7 +257,7 @@ public abstract class VespaBackEndSearcher extends PingableSearcher { if (query.getRanking().getLocation() != null) { s.append(" location=") - .append(query.getRanking().getLocation().toString()); + .append(query.getRanking().getLocation().backendString()); } if (query.getGroupingSessionCache()) { diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java index 51290c245ac..6dc01f34571 100644 --- a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java +++ b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java @@ -101,7 +101,7 @@ public class ProtobufSerialization { mergeToSearchRequestFromSorting(ranking.getSorting(), builder); } if (ranking.getLocation() != null) { - builder.setGeoLocation(ranking.getLocation().toString()); + builder.setGeoLocation(ranking.getLocation().backendString()); } var featureMap = ranking.getFeatures().asMap(); @@ -144,7 +144,7 @@ public class ProtobufSerialization { builder.setRankProfile(ranking.getProfile()); if (ranking.getLocation() != null) { - builder.setGeoLocation(ranking.getLocation().toString()); + builder.setGeoLocation(ranking.getLocation().backendString()); } if (includeQueryData) { mergeQueryDataToDocsumRequest(query, builder); diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/PosSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/PosSearcherTestCase.java index aa48e8494f2..b0c593ea405 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/PosSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/PosSearcherTestCase.java @@ -121,10 +121,10 @@ public class PosSearcherTestCase { q = new Query(); q.properties().set("pos.ll", "N0;E0"); - q.properties().set("pos.radius", "-1"); + q.properties().set("pos.radius", "-42"); doSearch(searcher, q, 0, 10); assertEquals("(2,0,0,-1,0,1,0,4294967295)", q.getRanking().getLocation().toString()); - assertEquals("(2,0,0,536870912,0,1,0,4294967295)", q.getRanking().getLocation().backendString()); + assertEquals("(2,0,0,-1,0,1,0,4294967295)", q.getRanking().getLocation().backendString()); } /** |