diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-09-22 09:03:04 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-09-22 09:03:04 +0200 |
commit | 4ddf0c7f069fe9d125b39eba44332b9027a91c2a (patch) | |
tree | dfa6c39081dfa4186861a925214959f2a51bb073 /container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcInvokerFactory.java | |
parent | 14d010f23a069417eed6b492110460e237170732 (diff) |
Clean up the dispatch protobuf flag too.
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcInvokerFactory.java')
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcInvokerFactory.java | 6 |
1 files changed, 2 insertions, 4 deletions
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 d9a76965c3e..242ba5eb818 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 @@ -27,12 +27,10 @@ public class RpcInvokerFactory extends InvokerFactory implements PingFactory { private final static CompoundName dispatchSummaries = new CompoundName("dispatch.summaries"); private final RpcResourcePool rpcResourcePool; - private final boolean dispatchWithProtobuf; - public RpcInvokerFactory(RpcResourcePool rpcResourcePool, SearchCluster searchCluster, boolean dispatchWithProtobuf) { + public RpcInvokerFactory(RpcResourcePool rpcResourcePool, SearchCluster searchCluster) { super(searchCluster); this.rpcResourcePool = rpcResourcePool; - this.dispatchWithProtobuf = dispatchWithProtobuf; } @Override @@ -45,7 +43,7 @@ public class RpcInvokerFactory extends InvokerFactory implements PingFactory { Query query = result.getQuery(); boolean summaryNeedsQuery = searcher.summaryNeedsQuery(query); - boolean useProtoBuf = query.properties().getBoolean(Dispatcher.dispatchProtobuf, dispatchWithProtobuf); + boolean useProtoBuf = query.properties().getBoolean(Dispatcher.dispatchProtobuf, true); boolean useDispatchDotSummaries = query.properties().getBoolean(dispatchSummaries, false); return ((useDispatchDotSummaries || !useProtoBuf) && ! summaryNeedsQuery) |