Set each hit as filled

5 files changed, 10 insertions, 9 deletions

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 004e01ff5fa..7c8ecd44cf9 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
@@ -280,7 +280,7 @@ public class FastSearcher extends VespaBackEndSearcher {
                 QueryPacket queryPacket = QueryPacket.create(query);
                 cacheKey = new CacheKey(queryPacket);
             }
-            packetWrapper = cacheLookupTwoPhase(cacheKey, result,summaryClass);
+            packetWrapper = cacheLookupTwoPhase(cacheKey, result, summaryClass);
         }
 
         FS4Channel channel = chooseBackend(query).openChannel();
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 97f60984f3d..740deaa7ca1 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
@@ -479,13 +479,13 @@ public abstract class VespaBackEndSearcher extends PingableSearcher {
      *         when things are working normally we return 0.
      */
     protected FillHitsResult fillHits(Result result, Packet[] packets, String summaryClass) throws IOException {
-        int skippedHits=0;
+        int skippedHits = 0;
         String lastError = null;
         int packetIndex = 0;
         for (Iterator<Hit> i = hitIterator(result); i.hasNext();) {
             Hit hit = i.next();
 
-            if (hit instanceof FastHit && !hit.isFilled(summaryClass)) {
+            if (hit instanceof FastHit && ! hit.isFilled(summaryClass)) {
                 FastHit fastHit = (FastHit) hit;
 
                 ensureInstanceOf(DocsumPacket.class, packets[packetIndex], getName());
diff --git a/container-search/src/main/java/com/yahoo/prelude/searcher/FillSearcher.java b/container-search/src/main/java/com/yahoo/prelude/searcher/FillSearcher.java
index f1d14972033..df19526a0a9 100644
--- a/container-search/src/main/java/com/yahoo/prelude/searcher/FillSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/searcher/FillSearcher.java
@@ -12,9 +12,10 @@ import com.yahoo.search.searchchain.Execution;
  * a search chain to ensure full results are present at an earlier
  * time than they would normally be.
  *
- * @author <a href="mailto:havardpe@yahoo-inc.com">havardpe</a>
- **/
+ * @author havardpe
+ */
 public class FillSearcher extends Searcher {
+
     private final Searcher next;
 
     public FillSearcher() {
@@ -49,4 +50,5 @@ public class FillSearcher extends Searcher {
             e.fill(result, summaryClass);
         }
     }
+
 }
diff --git a/container-search/src/main/java/com/yahoo/search/Searcher.java b/container-search/src/main/java/com/yahoo/search/Searcher.java
index 2de9f5e05ee..5fefe9d2468 100644
--- a/container-search/src/main/java/com/yahoo/search/Searcher.java
+++ b/container-search/src/main/java/com/yahoo/search/Searcher.java
@@ -73,7 +73,6 @@ public abstract class Searcher extends Processor {
 
     // Note to developers: If you think you should add something here you are probably wrong
     //                     Create a subclass containing the new method instead.
-
     private final Logger logger = Logger.getLogger(getClass().getName());
 
     public Searcher() {}
@@ -131,7 +130,7 @@ public abstract class Searcher extends Processor {
     /** Use the search method in Searcher processors. This forwards to it. */
     @Override
     public final Response process(com.yahoo.processing.Request request, com.yahoo.processing.execution.Execution execution) {
-        return search((Query)request,(Execution)execution);
+        return search((Query)request, (Execution)execution);
     }
 
     /**
@@ -147,7 +146,7 @@ public abstract class Searcher extends Processor {
      * @param summaryClass the name of the collection of fields to fetch the values of, or null to use the default
      */
     public void fill(Result result, String summaryClass, Execution execution) {
-        execution.fill(result,summaryClass);
+        execution.fill(result, summaryClass);
     }
 
     /**
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 47413272343..d658f565a10 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
@@ -94,7 +94,6 @@ public class Dispatcher extends AbstractComponent {
                 sendGetDocsumsRequest(nodeHits.getKey(), nodeHits.getValue(), summaryClass, compression, result, responseReceiver);
             }
             responseReceiver.processResponses(result.getQuery(), summaryClass, documentDb);
-            result.hits().setFilled(summaryClass);
             result.hits().setSorted(false);
             result.analyzeHits();
         }
@@ -266,6 +265,7 @@ public class Dispatcher extends AbstractComponent {
                 Inspector summary = summaries.entry(i).field("docsum");
                 if (summary.fieldCount() != 0) {
                     hits.get(i).addSummary(documentDb.getDocsumDefinitionSet().getDocsum(summaryClass), summary);
+                    hits.get(i).setFilled(summaryClass);
                 } else {
                     skippedHits++;
                 }