Output gram for summary fields where the source is gram

2 files changed, 19 insertions, 18 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/derived/IndexInfo.java b/config-model/src/main/java/com/yahoo/schema/derived/IndexInfo.java
index 7d88985b2d5..a21aefc9f71 100644
--- a/config-model/src/main/java/com/yahoo/schema/derived/IndexInfo.java
+++ b/config-model/src/main/java/com/yahoo/schema/derived/IndexInfo.java
@@ -82,7 +82,7 @@ public class IndexInfo extends Derived implements IndexInfoConfig.Producer {
         }
 
         // Commands for summary fields
-        // TODO: Move to fieldinfo and implement differently. This is not right
+        // TODO: Move to schemainfo and implement differently
         for (SummaryField summaryField : schema.getUniqueNamedSummaryFields().values()) {
             if (summaryField.getTransform().isTeaser()) {
                 addIndexCommand(summaryField.getName(), CMD_DYNTEASER);
@@ -90,6 +90,13 @@ public class IndexInfo extends Derived implements IndexInfoConfig.Producer {
             if (summaryField.getTransform().isBolded()) {
                 addIndexCommand(summaryField.getName(), CMD_HIGHLIGHT);
             }
+
+            var sourceField = schema.getField(summaryField.getSourceField()); // Take the first as they should all be consistent
+            if (sourceField != null && sourceField.getMatching().getType().equals(MatchType.GRAM)) {
+                addIndexCommand(summaryField.getName(),
+                                "ngram " + (sourceField.getMatching().getGramSize() > 0 ? sourceField.getMatching().getGramSize() : NGramMatch.DEFAULT_GRAM_SIZE));
+
+            }
         }
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java
index 7439e65dee6..49cd36e4bc2 100644
--- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java
+++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java
@@ -17,9 +17,7 @@ import static com.yahoo.text.Lowercase.toLowerCase;
  */
 public class SummaryField extends Field implements Cloneable, TypedKey {
 
-    /**
-     * A source (field name).
-     */
+    /** A source (field name). */
     public static class Source implements Serializable {
 
         private final String name;
@@ -38,12 +36,8 @@ public class SummaryField extends Field implements Cloneable, TypedKey {
 
         @Override
         public boolean equals(Object obj) {
-            if (!(obj instanceof Source)) {
-                return false;
-            }
-            Source other = (Source)obj;
-            return name.equals(other.name) &&
-                    override == other.override;
+            if (!(obj instanceof Source other)) return false;
+            return name.equals(other.name) && override == other.override;
         }
 
         @Override
@@ -67,14 +61,14 @@ public class SummaryField extends Field implements Cloneable, TypedKey {
      */
     private Set<Source> sources = new java.util.LinkedHashSet<>();
 
-    private Set<String> destinations=new java.util.LinkedHashSet<>();
+    private Set<String> destinations  =new java.util.LinkedHashSet<>();
 
     /** True if this field was defined implicitly */
-    private boolean implicit=false;
+    private boolean implicit = false;
 
     /** Creates a summary field with NONE as transform */
     public SummaryField(String name, DataType type) {
-        this(name,type, SummaryTransform.NONE);
+        this(name, type, SummaryTransform.NONE);
     }
 
     /** Creates a summary field with NONE as transform */
@@ -97,7 +91,7 @@ public class SummaryField extends Field implements Cloneable, TypedKey {
     public boolean isImplicit() { return implicit; }
 
     public void setTransform(SummaryTransform transform) {
-        this.transform=transform;
+        this.transform = transform;
         if (SummaryTransform.DYNAMICTEASER.equals(transform) || SummaryTransform.BOLDED.equals(transform)) {
             // This is the kind of logic we want to have in processing,
             // but can't because of deriveDocuments mode, which doesn't run
@@ -110,9 +104,9 @@ public class SummaryField extends Field implements Cloneable, TypedKey {
 
     /** Returns the first source field of this, or null if the source field is not present */
     public String getSourceField() {
-        String sourceName=getName();
-        if (sources.size()>0)
-            sourceName=sources.iterator().next().getName();
+        String sourceName = getName();
+        if ( ! sources.isEmpty())
+            sourceName = sources.iterator().next().getName();
         return sourceName;
     }
 
@@ -137,7 +131,7 @@ public class SummaryField extends Field implements Cloneable, TypedKey {
 
     /** Returns the first source name of this, or the field name if no source has been set */
     public String getSingleSource() {
-        if (sources.size()==0) return getName();
+        if (sources.isEmpty()) return getName();
         return sources.iterator().next().getName();
     }