diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-09-18 07:03:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-18 07:03:13 +0200 |
commit | 89a1b3ae32347c00e1177576668385ebfe3a6a68 (patch) | |
tree | 2856305bc733d52b7e6a26e0a36afacef8209ccb /container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java | |
parent | f6b49bf9f9e98b5778d9c8856e128a1fcdb5e017 (diff) |
Revert "Revert "Balder/no more fs4 dispatching from fastsearcher""
Diffstat (limited to 'container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java')
-rw-r--r-- | container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java index 430ad015493..c98cf23ec61 100644 --- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java @@ -3,7 +3,6 @@ package com.yahoo.prelude.fastsearch; import com.yahoo.collections.TinyIdentitySet; import com.yahoo.fs4.DocsumPacket; -import com.yahoo.fs4.Packet; import com.yahoo.prelude.query.Item; import com.yahoo.prelude.query.NullItem; import com.yahoo.prelude.query.textualrepresentation.TextualQueryRepresentation; @@ -20,7 +19,6 @@ import com.yahoo.search.result.Hit; import com.yahoo.search.searchchain.Execution; import com.yahoo.searchlib.aggregation.Grouping; -import java.io.IOException; import java.lang.reflect.Constructor; import java.util.ArrayList; import java.util.Iterator; @@ -51,7 +49,7 @@ public abstract class VespaBackEndSearcher extends PingableSearcher { private String defaultDocsumClass = null; /** Returns an iterator which returns all hits below this result **/ - static Iterator<Hit> hitIterator(Result result) { + private static Iterator<Hit> hitIterator(Result result) { return result.hits().unorderedDeepIterator(); } @@ -230,7 +228,7 @@ public abstract class VespaBackEndSearcher extends PingableSearcher { if ((query.getTraceLevel()<level) || query.properties().getBoolean(TRACE_DISABLE)) return; StringBuilder s = new StringBuilder(); - s.append(sourceName).append(" " + type + " to dispatch: ") + s.append(sourceName).append(" ").append(type).append(" to dispatch: ") .append("query=[") .append(query.getModel().getQueryTree().getRoot().toString()) .append("]"); @@ -320,7 +318,7 @@ public abstract class VespaBackEndSearcher extends PingableSearcher { } } - FillHitResult fillHit(FastHit hit, DocsumPacket packet, String summaryClass) { + private FillHitResult fillHit(FastHit hit, DocsumPacket packet, String summaryClass) { if (packet != null) { byte[] docsumdata = packet.getData(); if (docsumdata.length > 0) { @@ -344,7 +342,7 @@ public abstract class VespaBackEndSearcher extends PingableSearcher { * @return the number of hits that we did not return data for, and an optional error message. * when things are working normally we return 0. */ - public FillHitsResult fillHits(Result result, Packet[] packets, String summaryClass) throws IOException { + protected FillHitsResult fillHits(Result result, DocsumPacket[] packets, String summaryClass) { int skippedHits = 0; String lastError = null; int packetIndex = 0; @@ -354,8 +352,7 @@ public abstract class VespaBackEndSearcher extends PingableSearcher { if (hit instanceof FastHit && ! hit.isFilled(summaryClass)) { FastHit fastHit = (FastHit) hit; - packets[packetIndex].ensureInstanceOf(DocsumPacket.class, getName()); - DocsumPacket docsum = (DocsumPacket) packets[packetIndex]; + DocsumPacket docsum = packets[packetIndex]; packetIndex++; FillHitResult fr = fillHit(fastHit, docsum, summaryClass); @@ -384,7 +381,7 @@ public abstract class VespaBackEndSearcher extends PingableSearcher { return decodeSummary(summaryClass, hit, docsumdata, db.getDocsumDefinitionSet()); } - private String decodeSummary(String summaryClass, FastHit hit, byte[] docsumdata, DocsumDefinitionSet docsumSet) { + private static String decodeSummary(String summaryClass, FastHit hit, byte[] docsumdata, DocsumDefinitionSet docsumSet) { String error = docsumSet.lazyDecode(summaryClass, docsumdata, hit); if (error == null) { hit.setFilled(summaryClass); |