From 4ddf0c7f069fe9d125b39eba44332b9027a91c2a Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Sun, 22 Sep 2019 09:03:04 +0200 Subject: Clean up the dispatch protobuf flag too. --- .../src/main/java/com/yahoo/search/dispatch/Dispatcher.java | 2 +- .../main/java/com/yahoo/search/dispatch/rpc/RpcInvokerFactory.java | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'container-search/src') 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 af34fc3e106..7369b33e82d 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 @@ -84,7 +84,7 @@ public class Dispatcher extends AbstractComponent { VipStatus vipStatus, Metric metric) { var searchCluster = new SearchCluster(clusterId, dispatchConfig, containerClusterSize, vipStatus); - var rpcFactory = new RpcInvokerFactory(new RpcResourcePool(dispatchConfig), searchCluster, !dispatchConfig.useFdispatchByDefault()); + var rpcFactory = new RpcInvokerFactory(new RpcResourcePool(dispatchConfig), searchCluster); return new Dispatcher(searchCluster, dispatchConfig, rpcFactory, rpcFactory, metric); } 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) -- cgit v1.2.3