diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-09-18 11:58:36 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-09-18 11:58:36 +0200 |
commit | 55128db0ac7bda5ebe0241a4577b0aea40eddc50 (patch) | |
tree | 45c308b81a9242244d8e6c34418f3ea808700aed | |
parent | e69abb89b2de0fbca8d33fadb482c23452094460 (diff) |
It is not an option to return empty optional.
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java | 6 | ||||
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcInvokerFactory.java | 8 |
2 files changed, 4 insertions, 10 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java index ee064123b1b..58f73ea52cc 100644 --- a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java +++ b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java @@ -116,11 +116,7 @@ public class Dispatcher extends AbstractComponent { } public Optional<FillInvoker> getFillInvoker(Result result, VespaBackEndSearcher searcher) { - Optional<FillInvoker> invoker = invokerFactory.createFillInvoker(searcher, result); - if (invoker.isPresent()) { - return invoker; - } - return Optional.empty(); + return invokerFactory.createFillInvoker(searcher, result); } public Optional<SearchInvoker> getSearchInvoker(Query query, VespaBackEndSearcher searcher) { diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcInvokerFactory.java b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcInvokerFactory.java index 6146751f35f..85f890e03ce 100644 --- a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcInvokerFactory.java +++ b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcInvokerFactory.java @@ -45,14 +45,12 @@ public class RpcInvokerFactory extends InvokerFactory implements PingFactory { Query query = result.getQuery(); boolean summaryNeedsQuery = searcher.summaryNeedsQuery(query); + boolean useProtoBuf = query.properties().getBoolean(Dispatcher.dispatchProtobuf, dispatchWithProtobuf); - if(query.properties().getBoolean(Dispatcher.dispatchProtobuf, dispatchWithProtobuf)) { - return Optional.of(new RpcProtobufFillInvoker(rpcResourcePool, searcher.getDocumentDatabase(query), searcher.getServerId(), summaryNeedsQuery)); - } - if (query.properties().getBoolean(dispatchSummaries, true) && ! summaryNeedsQuery) { + if ((query.properties().getBoolean(dispatchSummaries, true) || !useProtoBuf) && ! summaryNeedsQuery) { return Optional.of(new RpcFillInvoker(rpcResourcePool, searcher.getDocumentDatabase(query))); } else { - return Optional.empty(); + return Optional.of(new RpcProtobufFillInvoker(rpcResourcePool, searcher.getDocumentDatabase(query), searcher.getServerId(), summaryNeedsQuery)); } } |