- Ensure that the sddocname field of the hit is set.

- Also test that query is as expected from the HitConverter.

2 files changed, 3 insertions, 0 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/grouping/vespa/HitConverter.java b/container-search/src/main/java/com/yahoo/search/grouping/vespa/HitConverter.java
index 94e0b5913d3..5f5f8266ab0 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/vespa/HitConverter.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/vespa/HitConverter.java
@@ -64,6 +64,7 @@ class HitConverter implements ResultBuilder.HitConverter {
             }
             DocsumDefinitionSet defs = hitContext.getDocsumDefinitionSet();
             defs.lazyDecode(summaryClass, grpHit.getSummary().getData(), hit);
+            hit.setField(Hit.SDDOCNAME_FIELD, hitContext.getSchema().name());
             hit.setFilled(summaryClass);
             hit.setFilled(hitContext.getQuery().getPresentation().getSummary());
             hit.setQuery(hitContext.getQuery());
diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/HitConverterTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/HitConverterTestCase.java
index 57f6ee7d65f..2df821b7f0b 100644
--- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/HitConverterTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/HitConverterTestCase.java
@@ -119,6 +119,8 @@ public class HitConverterTestCase {
         assertTrue(hit instanceof FastHit);
         assertEquals(new Relevance(1), hit.getRelevance());
         assertTrue(hit.isFilled("69"));
+        assertEquals("none", hit.getField(Hit.SDDOCNAME_FIELD));
+        assertSame(query, hit.getQuery());
     }
 
     private static String asHexString(GlobalId gid) {