diff options
Diffstat (limited to 'container-search/src')
3 files changed, 19 insertions, 23 deletions
diff --git a/container-search/src/main/java/com/yahoo/fs4/MapEncoder.java b/container-search/src/main/java/com/yahoo/fs4/MapEncoder.java index 84b2b482403..4f31db0fc86 100644 --- a/container-search/src/main/java/com/yahoo/fs4/MapEncoder.java +++ b/container-search/src/main/java/com/yahoo/fs4/MapEncoder.java @@ -20,7 +20,7 @@ public class MapEncoder { // TODO: Time to refactor - private static byte [] getUtf8(Object value) { + private static byte[] getUtf8(Object value) { if (value == null) { return Utf8.toBytes(""); } else if (value instanceof Tensor) { @@ -62,7 +62,7 @@ public class MapEncoder { public static int encodeMap(String mapName, Map<String,?> map, ByteBuffer buffer) { if (map.isEmpty()) return 0; - byte [] utf8 = Utf8.toBytes(mapName); + byte[] utf8 = Utf8.toBytes(mapName); buffer.putInt(utf8.length); buffer.put(utf8); buffer.putInt(map.size()); diff --git a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java index 441c4326355..88cc7ad7b2d 100644 --- a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java @@ -172,6 +172,21 @@ public class ClusterSearcher extends Searcher { } @Override + public Result search(Query query, Execution execution) { + validateQueryTimeout(query); + validateQueryCache(query); + Searcher searcher = server; + if (searcher == null) { + return new Result(query, ErrorMessage.createNoBackendsInService("Could not search")); + } + if (query.getTimeLeft() <= 0) { + return new Result(query, ErrorMessage.createTimeout("No time left for searching")); + } + + return doSearch(searcher, query, execution); + } + + @Override public void fill(com.yahoo.search.Result result, String summaryClass, Execution execution) { Query query = result.getQuery(); @@ -192,21 +207,6 @@ public class ClusterSearcher extends Searcher { } } - @Override - public Result search(Query query, Execution execution) { - validateQueryTimeout(query); - validateQueryCache(query); - Searcher searcher = server; - if (searcher == null) { - return new Result(query, ErrorMessage.createNoBackendsInService("Could not search")); - } - if (query.getTimeLeft() <= 0) { - return new Result(query, ErrorMessage.createTimeout("No time left for searching")); - } - - return doSearch(searcher, query, execution); - } - private void validateQueryTimeout(Query query) { if (query.getTimeout() <= maxQueryTimeout) return; diff --git a/container-search/src/main/java/com/yahoo/search/query/ranking/RankProperties.java b/container-search/src/main/java/com/yahoo/search/query/ranking/RankProperties.java index 4ac5375807b..fd0b6543f28 100644 --- a/container-search/src/main/java/com/yahoo/search/query/ranking/RankProperties.java +++ b/container-search/src/main/java/com/yahoo/search/query/ranking/RankProperties.java @@ -38,16 +38,12 @@ public class RankProperties implements Cloneable { /** Adds a property by full name to a value */ public void put(String name, Object value) { - List<Object> list = properties.get(name); - if (list == null) { - list = new ArrayList<>(); - properties.put(name, list); - } + List<Object> list = properties.computeIfAbsent(name, k -> new ArrayList<>()); list.add(value); } /** - * Returns a read-only list of properties properties by full name. + * Returns a read-only list of properties by full name. * If this is not set, null is returned. If this is explicitly set to * have no values, and empty list is returned. */ |