Decode docsums the old fashioned way

1 files changed, 20 insertions, 6 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumDefinition.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumDefinition.java
index 4fd0f884903..d50006fb82c 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumDefinition.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumDefinition.java
@@ -21,20 +21,33 @@ import java.util.Map;
  */
 public class DocsumDefinition {
 
-    private String name;
-    private final List<DocsumField> fields;
+    private final String name;
+    private final ImmutableList<DocsumField> fields;
 
     /** True if this contains dynamic fields */
-    private boolean dynamic = false;
+    private final boolean dynamic;
 
     // Mapping between field names and their index in this.fields
-    private final Map<String,Integer> fieldNameToIndex;
+    private final ImmutableMap<String, Integer> fieldNameToIndex;
+
+    public DocsumDefinition(String name, List<DocsumField> fields) {
+        this.name = name;
+        this.dynamic = false;
+        this.fields = ImmutableList.copyOf(fields);
+        ImmutableMap.Builder<String, Integer> fieldNameToIndexBuilder = new ImmutableMap.Builder<>();
+        int i = 0;
+        for (DocsumField field : fields)
+            fieldNameToIndexBuilder.put(field.name, i++);
+        this.fieldNameToIndex = fieldNameToIndexBuilder.build();
+    }
 
+    // TODO: Remove LegacyEmulationConfig (the config, not just the usage) on Vespa 7
     DocsumDefinition(DocumentdbInfoConfig.Documentdb.Summaryclass config, LegacyEmulationConfig emulConfig) {
         this.name = config.name();
-        List<DocsumField> fieldsBuilder = new ArrayList<>();
-        Map<String,Integer> fieldNameToIndexBuilder = new HashMap<>();
 
+        List<DocsumField> fieldsBuilder = new ArrayList<>();
+        Map<String, Integer> fieldNameToIndexBuilder = new HashMap<>();
+        boolean dynamic = false;
         for (DocumentdbInfoConfig.Documentdb.Summaryclass.Fields field : config.fields()) {
             // no, don't switch the order of the two next lines :)
             fieldNameToIndexBuilder.put(field.name(), fieldsBuilder.size());
@@ -42,6 +55,7 @@ public class DocsumDefinition {
             if (field.dynamic())
                 dynamic = true;
         }
+        this.dynamic = dynamic;
         fields = ImmutableList.copyOf(fieldsBuilder);
         fieldNameToIndex = ImmutableMap.copyOf(fieldNameToIndexBuilder);
     }