Add coverage info to access log

2 files changed, 24 insertions, 5 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchResponse.java b/container-search/src/main/java/com/yahoo/search/handler/SearchResponse.java
index df138364b5b..1e19c6e7345 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchResponse.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchResponse.java
@@ -2,6 +2,7 @@
 package com.yahoo.search.handler;
 
 import com.yahoo.container.handler.Timing;
+import com.yahoo.container.logging.Coverage;
 import com.yahoo.container.logging.HitCounts;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
@@ -57,11 +58,13 @@ public class SearchResponse {
     }
 
     public static HitCounts createHitCounts(Query query, Result result) {
-        return new HitCounts(result.getHitCount(),
-                             result.getConcreteHitCount(),
-                             result.getTotalHitCount(),
-                             query.getHits(),
-                             query.getOffset());
+        com.yahoo.container.handler.Coverage coverage = result.getCoverage(false);
+
+        return (coverage != null)
+                ? new HitCounts(result.getHitCount(), result.getConcreteHitCount(), result.getTotalHitCount(),
+                                query.getHits(), query.getOffset(), coverage.toLoggingCoverage())
+                : new HitCounts(result.getHitCount(), result.getConcreteHitCount(), result.getTotalHitCount(),
+                                 query.getHits(), query.getOffset(), null);
     }
 
 }
diff --git a/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java b/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java
index 7624185481e..b73da781cd6 100644
--- a/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java
@@ -67,4 +67,20 @@ public class CoverageTestCase {
         assertEquals(1, federationSearcherResult.getCoverage(create).getResultSets());
     }
 
+    @Test
+    public void testCoverageConversion() {
+        Coverage c = new Coverage(6, 10);
+        c.setDegradedReason(7);
+        com.yahoo.container.logging.Coverage lc = c.toLoggingCoverage();
+        assertEquals(lc.getDocs(), c.getDocs());
+        assertEquals(lc.getActive(), c.getActive());
+        assertEquals(lc.getSoonActive(), c.getSoonActive());
+        assertEquals(lc.getResultPercentage(), c.getResultPercentage());
+        assertEquals(lc.isDegraded(), c.isDegraded());
+        assertEquals(lc.isDegradedByNonIdealState(), c.isDegradedByNonIdealState());
+        assertEquals(lc.isDegradedByAdapativeTimeout(), c.isDegradedByAdapativeTimeout());
+        assertEquals(lc.isDegradedByMatchPhase(), c.isDegradedByMatchPhase());
+        assertEquals(lc.isDegradedByTimeout(), c.isDegradedByTimeout());
+    }
+
 }