diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-15 11:07:16 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-15 11:07:16 +0200 |
commit | d24cd657b1793c689fb3c8bafdedb7bf908eaec0 (patch) | |
tree | 51e8d272d450f94e241d1a20ec6e9f879157a37f /container-search | |
parent | 5443927d0f399ab20796de2294ffba4a936ead26 (diff) |
GC unused code
Diffstat (limited to 'container-search')
3 files changed, 1 insertions, 81 deletions
diff --git a/container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java b/container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java index 7dabb52a233..941bce67d16 100644 --- a/container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java +++ b/container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java @@ -64,12 +64,6 @@ public class GetDocSumsPacket extends Packet { public static final int GDF_PROPERTIES = 0x00001000; public static final int GDF_FLAGS = 0x00002000; - /** - * flag bits, as given in fastserver4/src/network/transport.h - * definition of enum getdocsums_flags - */ - public static final int GDFLAG_IGNORE_ROW = 0x00000001; - public void encodeBody(ByteBuffer buffer) { setFieldsFromHits(); diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FS4FillInvoker.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FS4FillInvoker.java index 0d7aeb67451..97a04b9853c 100644 --- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FS4FillInvoker.java +++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FS4FillInvoker.java @@ -31,15 +31,8 @@ public class FS4FillInvoker extends FillInvoker { private int expectedFillResults = 0; - public FS4FillInvoker(VespaBackEndSearcher searcher, Query query, FS4ResourcePool fs4ResourcePool, String hostname, int port) { - this.searcher = searcher; - Backend backend = fs4ResourcePool.getBackend(hostname, port); - this.channel = backend.openChannel(); - channel.setQuery(query); - } - // fdispatch code path - public FS4FillInvoker(VespaBackEndSearcher searcher, Query query, Backend backend) { + FS4FillInvoker(VespaBackEndSearcher searcher, Query query, Backend backend) { this.searcher = searcher; this.channel = backend.openChannel(); channel.setQuery(query); diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedFillInvoker.java b/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedFillInvoker.java deleted file mode 100644 index 644e6f17bdb..00000000000 --- a/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedFillInvoker.java +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.search.dispatch; - -import com.yahoo.prelude.fastsearch.FastHit; -import com.yahoo.search.Result; -import com.yahoo.search.result.Hit; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -/** - * InterleavedFillInvoker uses multiple {@link FillInvoker} objects to interface with content - * nodes in parallel. Operationally it first sends requests with all contained invokers and then - * collects the results. - * - * @author ollivir - */ -public class InterleavedFillInvoker extends FillInvoker { - private final Map<Integer, FillInvoker> invokers; - private Map<Integer, Result> expectedFillResults = null; - - public InterleavedFillInvoker(Map<Integer, FillInvoker> invokers) { - this.invokers = invokers; - } - - @Override - protected void sendFillRequest(Result result, String summaryClass) { - expectedFillResults = new HashMap<>(); - - for (Iterator<Hit> it = result.hits().deepIterator(); it.hasNext();) { - Hit hit = it.next(); - if (hit instanceof FastHit) { - FastHit fhit = (FastHit) hit; - Result res = expectedFillResults.computeIfAbsent(fhit.getDistributionKey(), dk -> new Result(result.getQuery())); - res.hits().add(fhit); - } - } - expectedFillResults.forEach((distKey, partialResult) -> { - FillInvoker invoker = invokers.get(distKey); - if (invoker != null) { - invoker.sendFillRequest(partialResult, summaryClass); - } - }); - } - - @Override - protected void getFillResults(Result result, String summaryClass) { - if (expectedFillResults == null) { - return; - } - expectedFillResults.forEach((distKey, partialResult) -> { - FillInvoker invoker = invokers.get(distKey); - if (invoker != null) { - invoker.getFillResults(partialResult, summaryClass); - } - }); - } - - @Override - protected void release() { - if (!invokers.isEmpty()) { - invokers.values().forEach(FillInvoker::close); - invokers.clear(); - } - } -} |