From f5101150845bd0064f3cb9cc69d9923f05da8fc7 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Thu, 8 Mar 2018 10:07:26 +0100 Subject: Remove unused parameter. Remove catching Exception that can never be thown. --- .../com/yahoo/prelude/fastsearch/FastSearcher.java | 2 +- .../prelude/fastsearch/VespaBackEndSearcher.java | 39 ++++++++-------------- .../streamingvisitors/VdsStreamingSearcher.java | 2 +- 3 files changed, 15 insertions(+), 28 deletions(-) (limited to 'container-search/src') diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java index e0572f174a5..7b5ded6a9d6 100644 --- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java @@ -317,7 +317,7 @@ public class FastSearcher extends VespaBackEndSearcher { int skippedHits; try { - FillHitsResult fillHitsResult = fillHits(result, 0, receivedPackets, summaryClass); + FillHitsResult fillHitsResult = fillHits(result, receivedPackets, summaryClass); skippedHits = fillHitsResult.skippedHits; if (fillHitsResult.error != null) { result.hits().addError(ErrorMessage.createTimeout(fillHitsResult.error)); 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 3320c167702..6945877883d 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 @@ -141,7 +141,7 @@ public abstract class VespaBackEndSearcher extends PingableSearcher { return false; } - private Result cacheLookupFirstPhase(CacheKey key, QueryPacketData queryPacketData, Query query, int offset, int hits, String summaryClass) throws IOException { + private Result cacheLookupFirstPhase(CacheKey key, QueryPacketData queryPacketData, Query query, int offset, int hits, String summaryClass) { PacketWrapper packetWrapper = cacheControl.lookup(key, query); if (packetWrapper == null) return null; @@ -234,7 +234,7 @@ public abstract class VespaBackEndSearcher extends PingableSearcher { resolveDocumentDatabase(query); transformQuery(query); - traceQuery(name, "search", query, query.getOffset(), query.getHits(), 1, Optional.empty()); + traceQuery(name, "search", query, query.getOffset(), query.getHits(), 1, Optional.empty()); root = query.getModel().getQueryTree().getRoot(); if (root == null || root instanceof NullItem) // root can become null after resolving and transformation? @@ -283,31 +283,17 @@ public abstract class VespaBackEndSearcher extends PingableSearcher { } } - try { - Result result = cacheLookupFirstPhase(cacheKey, queryPacketData, query, query.getOffset(), query.getHits(), query.getPresentation().getSummary()); - if (result == null) return null; + Result result = cacheLookupFirstPhase(cacheKey, queryPacketData, query, query.getOffset(), query.getHits(), query.getPresentation().getSummary()); + if (result == null) return null; - if (isLoggingFine()) { - getLogger().fine("Result retrieved from cache: " + result); - } - if (query.getTraceLevel() >= 1) { - query.trace(getName() + " cached response: " + result, false, 1); - } - result.trace(getName()); - return result; + if (isLoggingFine()) { + getLogger().fine("Result retrieved from cache: " + result); } - catch (IOException e) { - Result result = new Result(query); - - if (result.hits().getErrorHit() == null) { - result.hits().addError(ErrorMessage.createBackendCommunicationError( - "Fast Search (" + getName() + ") failed: " + e.getMessage())); - } - if (query.getTraceLevel() >= 1) { - query.trace(getName() + " error response: " + result, false, 1); - } - return result; + if (query.getTraceLevel() >= 1) { + query.trace(getName() + " cached response: " + result, false, 1); } + result.trace(getName()); + return result; } private List partitionHits(Result result, String summaryClass) { @@ -404,7 +390,7 @@ public abstract class VespaBackEndSearcher extends PingableSearcher { s.append(" ranking.queryCache=true"); } if (query.getGroupingSessionCache() || query.getRanking().getQueryCache()) { - s.append(" sessionId=" + query.getSessionId(true)); + s.append(" sessionId=").append(query.getSessionId(true)); } List grouping = GroupingExecutor.getGroupingList(query); @@ -507,9 +493,10 @@ 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. */ - protected FillHitsResult fillHits(Result result, int packetIndex, Packet[] packets, String summaryClass) throws IOException { + protected FillHitsResult fillHits(Result result, Packet[] packets, String summaryClass) throws IOException { int skippedHits=0; String lastError = null; + int packetIndex = 0; for (Iterator i = hitIterator(result); i.hasNext();) { Hit hit = i.next(); diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java index 4ebe29cdacd..53bbe43d142 100644 --- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java +++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java @@ -194,7 +194,7 @@ public class VdsStreamingSearcher extends VespaBackEndSearcher { int skippedHits; try { - FillHitsResult fillHitsResult = fillHits(result, 0, summaryPackets, query.getPresentation().getSummary()); + FillHitsResult fillHitsResult = fillHits(result, summaryPackets, query.getPresentation().getSummary()); skippedHits = fillHitsResult.skippedHits; if (fillHitsResult.error != null) { result.hits().addError(ErrorMessage.createTimeout(fillHitsResult.error)); -- cgit v1.2.3