Use schemsa-info

2 files changed, 30 insertions, 6 deletions

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 ba54c3808f2..6c66c8f4ca6 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
@@ -13,6 +13,8 @@ import com.yahoo.search.Result;
 import com.yahoo.search.Searcher;
 import com.yahoo.search.result.Hit;
 import com.yahoo.search.result.Relevance;
+import com.yahoo.search.schema.DocumentSummary;
+import com.yahoo.search.schema.Schema;
 import com.yahoo.search.searchchain.Execution;
 import com.yahoo.searchlib.aggregation.FS4Hit;
 import com.yahoo.searchlib.aggregation.VdsHit;
@@ -98,17 +100,17 @@ public class HitConverterTestCase {
         return new GroupingListHit(Collections.emptyList(), null);
     }
 
-    private static DocumentdbInfoConfig.Documentdb sixtynine() {
-        DocumentdbInfoConfig.Documentdb.Builder summaryConfig = new DocumentdbInfoConfig.Documentdb.Builder();
-        summaryConfig.name("none");
-        summaryConfig.summaryclass(new DocumentdbInfoConfig.Documentdb.Summaryclass.Builder().id(0).name("69"));
-        return new DocumentdbInfoConfig.Documentdb(summaryConfig);
+    private static DocsumDefinitionSet sixtynine() {
+        var schema = new Schema.Builder("none");
+        var summary = new DocumentSummary.Builder("69");
+        schema.add(summary.build());
+        return new DocsumDefinitionSet(schema.build());
     }
 
     @Test
     public void requireThatVdsHitCanBeConverted() {
         HitConverter converter = new HitConverter(new MySearcher(), new Query());
-        GroupingListHit context = new GroupingListHit(null, new DocsumDefinitionSet(sixtynine()));
+        GroupingListHit context = new GroupingListHit(null, sixtynine());
         VdsHit lowHit = new VdsHit("id:ns:type::", new byte[] { 0x55, 0x55, 0x55, 0x55 }, 1);
         lowHit.setContext(context);
         Hit hit = converter.toSearchHit("69", lowHit);
diff --git a/container-search/src/test/java/com/yahoo/search/schema/SchemaInfoTester.java b/container-search/src/test/java/com/yahoo/search/schema/SchemaInfoTester.java
index ff996464c4a..45bf5af5258 100644
--- a/container-search/src/test/java/com/yahoo/search/schema/SchemaInfoTester.java
+++ b/container-search/src/test/java/com/yahoo/search/schema/SchemaInfoTester.java
@@ -69,6 +69,11 @@ public class SchemaInfoTester {
                             .add(new RankProfile.Builder("inconsistent")
                                          .addInput("query(myTensor1)", TensorType.fromSpec("tensor(a{},b{})"))
                                          .build())
+                            .add(new DocumentSummary.Builder("testSummary")
+                                         .add(new DocumentSummary.Field("field1", "string"))
+                                         .add(new DocumentSummary.Field("field2", "integer"))
+                                         .setDynamic(true)
+                                         .build())
                             .build());
         schemas.add(new Schema.Builder("b")
                             .add(common)
@@ -98,17 +103,32 @@ public class SchemaInfoTester {
 
         var schemaInfoInfoConfig = new SchemaInfoConfig.Builder();
 
+        // ----- Schema A
         var schemaA = new SchemaInfoConfig.Schema.Builder();
         schemaA.name("a");
+
         schemaA.rankprofile(rankProfileCommon);
         var rankProfileInconsistentA = new SchemaInfoConfig.Schema.Rankprofile.Builder();
         rankProfileInconsistentA.name("inconsistent");
         rankProfileInconsistentA.input(new SchemaInfoConfig.Schema.Rankprofile.Input.Builder().name("query(myTensor1)").type("tensor(a{},b{})"));
         schemaA.rankprofile(rankProfileInconsistentA);
+
+        var summaryClass = new SchemaInfoConfig.Schema.Summaryclass.Builder();
+        summaryClass.name("testSummary");
+        var field1 = new SchemaInfoConfig.Schema.Summaryclass.Fields.Builder();
+        field1.name("field1").type("string").dynamic(true);
+        summaryClass.fields(field1);
+        var field2 = new SchemaInfoConfig.Schema.Summaryclass.Fields.Builder();
+        field2.name("field2").type("integer");
+        summaryClass.fields(field2);
+        schemaA.summaryclass(summaryClass);
+
         schemaInfoInfoConfig.schema(schemaA);
 
+        // ----- Schema B
         var schemaB = new SchemaInfoConfig.Schema.Builder();
         schemaB.name("b");
+
         schemaB.rankprofile(rankProfileCommon);
         var rankProfileInconsistentB = new SchemaInfoConfig.Schema.Rankprofile.Builder();
         rankProfileInconsistentB.name("inconsistent");
@@ -118,8 +138,10 @@ public class SchemaInfoTester {
         rankProfileBOnly.name("bOnly");
         rankProfileBOnly.input(new SchemaInfoConfig.Schema.Rankprofile.Input.Builder().name("query(myTensor1)").type("tensor(a{},b{})"));
         schemaB.rankprofile(rankProfileBOnly);
+
         schemaInfoInfoConfig.schema(schemaB);
 
+        // ----- Info about which schemas are in which clusters
         var qrSearchersConfig = new QrSearchersConfig.Builder();
         var clusterAB = new QrSearchersConfig.Searchcluster.Builder();
         clusterAB.name("ab");