From 5443927d0f399ab20796de2294ffba4a936ead26 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Thu, 15 Aug 2019 11:07:01 +0200 Subject: query and location are 2 distinct dimensions --- .../java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java | 1 - .../java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'container-search/src') 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 33a287fac9b..430ad015493 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 @@ -95,7 +95,6 @@ public abstract class VespaBackEndSearcher extends PingableSearcher { if (rankProfile == null) return true; // stay safe if (rankProfile.hasSummaryFeatures()) return true; if (query.getRanking().getListFeatures()) return true; - if (query.getRanking().getLocation() != null) return true; // (Don't just add other checks here as there is a return false above) 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 0e1565a108b..68beb16c254 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 @@ -142,6 +142,9 @@ public class ProtobufSerialization { } builder.setRankProfile(query.getRanking().getProfile()); + if (ranking.getLocation() != null) { + builder.setGeoLocation(ranking.getLocation().toString()); + } if (includeQueryData) { mergeQueryDataToDocsumRequest(query, builder); } @@ -165,9 +168,7 @@ public class ProtobufSerialization { var featureMap = ranking.getFeatures().asMap(); builder.setQueryTreeBlob(serializeQueryTree(query.getModel().getQueryTree())); - if (ranking.getLocation() != null) { - builder.setGeoLocation(ranking.getLocation().toString()); - } + MapConverter.convertMapPrimitives(featureMap, builder::addFeatureOverrides); MapConverter.convertMapTensors(featureMap, builder::addTensorFeatureOverrides); if (query.getPresentation().getHighlight() != null) { -- cgit v1.2.3