Merge pull request #18523 from vespa-engine/geirst/omit-summary-features

Add support for omitting summary features for a document summary

2 files changed, 13 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java
index af2168545dc..c173b2c11d9 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java
@@ -28,6 +28,7 @@ public class SummaryClass extends Derived {
     /** True if this summary class needs to access summary information on disk */
     private boolean accessingDiskSummary = false;
     private final boolean rawAsBase64;
+    private final boolean omitSummaryFeatures;
 
     /** The summary fields of this indexed by name */
     private Map<String,SummaryClassField> fields = new java.util.LinkedHashMap<>();
@@ -44,6 +45,7 @@ public class SummaryClass extends Derived {
     public SummaryClass(Search search, DocumentSummary summary, DeployLogger deployLogger) {
         this.deployLogger = deployLogger;
         this.rawAsBase64 = search.isRawAsBase64();
+        this.omitSummaryFeatures = summary.omitSummaryFeatures();
         deriveName(summary);
         deriveFields(search,summary);
         deriveImplicitFields(summary);
@@ -128,7 +130,8 @@ public class SummaryClass extends Derived {
         }
         classBuilder.
             id(id).
-            name(getName());
+            name(getName()).
+            omitsummaryfeatures(omitSummaryFeatures);
         for (SummaryClassField field : fields.values() ) {
             classBuilder.fields(new SummaryConfig.Classes.Fields.Builder().
                     name(field.getName()).
diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentSummary.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentSummary.java
index 3c6aa881af4..454d0f08ff0 100644
--- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentSummary.java
+++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentSummary.java
@@ -14,6 +14,7 @@ import java.util.List;
 public class DocumentSummary extends FieldView {
 
     private boolean fromDisk = false;
+    private boolean omitSummaryFeatures = false;
     private DocumentSummary inherited;
 
     /**
@@ -30,6 +31,14 @@ public class DocumentSummary extends FieldView {
     /** Returns whether the user has noted explicitly that this summary accesses disk */
     public boolean isFromDisk() { return fromDisk; }
 
+    public void setOmitSummaryFeatures(boolean value) {
+        omitSummaryFeatures = value;
+    }
+
+    public boolean omitSummaryFeatures() {
+        return omitSummaryFeatures;
+    }
+
     /**
      * The model is constrained to ensure that summary fields of the same name
      * in different classes have the same summary transform, because this is