Minor cleanup.

12 files changed, 12 insertions, 48 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/Pong.java b/container-search/src/main/java/com/yahoo/prelude/Pong.java
index 3e0f9ea5dfa..a60fba9a4f7 100644
--- a/container-search/src/main/java/com/yahoo/prelude/Pong.java
+++ b/container-search/src/main/java/com/yahoo/prelude/Pong.java
@@ -42,10 +42,6 @@ public class Pong {
         return errors.get(i);
     }
 
-    public int getErrorSize() {
-        return errors.size();
-    }
-
     /** Returns the number of active documents in the backend responding in this Pong, if available */
     public Optional<Long> activeDocuments() {
         return activeDocuments;
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/DataField.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/DataField.java
index 524e842eacd..de07839e3e3 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/DataField.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/DataField.java
@@ -10,8 +10,6 @@
 
 package com.yahoo.prelude.fastsearch;
 
-import java.nio.ByteBuffer;
-
 import com.yahoo.prelude.hitfield.RawData;
 import com.yahoo.data.access.simple.Value;
 import com.yahoo.data.access.Inspector;
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumField.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumField.java
index 4f52ef91725..329a9caaf91 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumField.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumField.java
@@ -6,7 +6,6 @@ import com.yahoo.log.LogLevel;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/DoubleField.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/DoubleField.java
index 6b1445229ec..f6f8006d2d2 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/DoubleField.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/DoubleField.java
@@ -1,9 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.prelude.fastsearch;
 
-
-import java.nio.ByteBuffer;
-
 import com.yahoo.search.result.NanNumber;
 import com.yahoo.data.access.Inspector;
 
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/Int64Field.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/Int64Field.java
index f690d9d4da4..396a84a28bd 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/Int64Field.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/Int64Field.java
@@ -5,9 +5,6 @@
  */
 package com.yahoo.prelude.fastsearch;
 
-
-import java.nio.ByteBuffer;
-
 import com.yahoo.search.result.NanNumber;
 import com.yahoo.data.access.Inspector;
 
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/IntegerField.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/IntegerField.java
index a02d9813793..bec39393359 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/IntegerField.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/IntegerField.java
@@ -5,9 +5,6 @@
  */
 package com.yahoo.prelude.fastsearch;
 
-
-import java.nio.ByteBuffer;
-
 import com.yahoo.search.result.NanNumber;
 import com.yahoo.data.access.Inspector;
 
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/LongdataField.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/LongdataField.java
index bf77c517d50..388c96b453d 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/LongdataField.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/LongdataField.java
@@ -5,9 +5,6 @@
  */
 package com.yahoo.prelude.fastsearch;
 
-import java.nio.ByteBuffer;
-
-import com.yahoo.io.SlowInflate;
 import com.yahoo.prelude.hitfield.RawData;
 import com.yahoo.data.access.simple.Value;
 import com.yahoo.data.access.Inspector;
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/ShortField.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/ShortField.java
index 5e3d0babe98..b94c902693a 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/ShortField.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/ShortField.java
@@ -5,9 +5,6 @@
  */
 package com.yahoo.prelude.fastsearch;
 
-
-import java.nio.ByteBuffer;
-
 import com.yahoo.search.result.NanNumber;
 import com.yahoo.data.access.Inspector;
 
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/StringField.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/StringField.java
index 408cbbbb62d..4df12bd82bd 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/StringField.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/StringField.java
@@ -5,10 +5,6 @@
  */
 package com.yahoo.prelude.fastsearch;
 
-
-import java.nio.ByteBuffer;
-
-import com.yahoo.text.Utf8;
 import com.yahoo.data.access.Inspector;
 
 
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 477073eaad2..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
@@ -19,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;
@@ -50,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();
     }
 
@@ -229,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("]");
@@ -319,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) {
@@ -343,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, DocsumPacket[] packets, String summaryClass) throws IOException {
+     protected FillHitsResult fillHits(Result result, DocsumPacket[] packets, String summaryClass) {
         int skippedHits = 0;
         String lastError = null;
         int packetIndex = 0;
@@ -382,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);
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/XMLField.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/XMLField.java
index d768dda2657..00bdc474119 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/XMLField.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/XMLField.java
@@ -1,8 +1,5 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
- * Class converting data (historically XML-encoded) from a document summary field.
- * This has only been used to represent geographical positions.
- */
+
 package com.yahoo.prelude.fastsearch;
 
 import com.yahoo.data.access.Inspector;
@@ -11,6 +8,8 @@ import com.yahoo.prelude.hitfield.XMLString;
 import com.yahoo.search.result.PositionsData;
 
 /**
+ * Class converting data (historically XML-encoded) from a document summary field.
+ * This has only been used to represent geographical positions.
  * @author Steinar Knutsen
  */
 public class XMLField extends DocsumField {
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 521d189e8ab..16426d83915 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
@@ -243,19 +243,11 @@ public class VdsStreamingSearcher extends VespaBackEndSearcher {
             result.hits().add(groupHit);
         }
 
-        int skippedHits;
-        try {
-            FillHitsResult fillHitsResult = fillHits(result, summaryPackets, query.getPresentation().getSummary());
-            skippedHits = fillHitsResult.skippedHits;
-            if (fillHitsResult.error != null) {
-                result.hits().addError(ErrorMessage.createTimeout(fillHitsResult.error));
-                return result;
-            }
-        } catch (TimeoutException e) {
-            result.hits().addError(ErrorMessage.createTimeout(e.getMessage()));
+        FillHitsResult fillHitsResult = fillHits(result, summaryPackets, query.getPresentation().getSummary());
+        int skippedHits = fillHitsResult.skippedHits;
+        if (fillHitsResult.error != null) {
+            result.hits().addError(ErrorMessage.createTimeout(fillHitsResult.error));
             return result;
-        } catch (IOException e) {
-            return new Result(query, ErrorMessage.createBackendCommunicationError("Error filling hits with summary fields"));
         }
 
         if (skippedHits == 0) {