allow duplicates in document-summary (with warning)

2 files changed, 10 insertions, 4 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedDocumentSummary.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedDocumentSummary.java
index 08f4946a218..25adc6f134f 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedDocumentSummary.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedDocumentSummary.java
@@ -28,10 +28,11 @@ class ParsedDocumentSummary extends ParsedBlock {
     List<ParsedSummaryField> getSummaryFields() { return List.copyOf(fields.values()); }
     List<String> getInherited() { return List.copyOf(inherited); }
 
-    void addField(ParsedSummaryField field) {
+    ParsedSummaryField addField(ParsedSummaryField field) {
         String fieldName = field.name();
-        verifyThat(! fields.containsKey(fieldName), "already has field", fieldName);
-        fields.put(fieldName, field);
+        // TODO disallow this on Vespa 8
+        // verifyThat(! fields.containsKey(fieldName), "already has field", fieldName);
+        return fields.put(fieldName, field);
     }
 
     void setFromDisk(boolean value) {
diff --git a/config-model/src/main/javacc/IntermediateParser.jj b/config-model/src/main/javacc/IntermediateParser.jj
index b57719ec72d..7447eee5cec 100644
--- a/config-model/src/main/javacc/IntermediateParser.jj
+++ b/config-model/src/main/javacc/IntermediateParser.jj
@@ -1161,7 +1161,12 @@ void summaryInDocument(ParsedDocumentSummary docsum) :
     }
     lbrace() (summaryItem(psf) (<NL>)*)* <RBRACE>
     {
-        docsum.addField(psf);
+        var old = docsum.addField(psf);
+        if (old != null) {
+            deployLogger.logApplicationPackage(Level.WARNING, "Summary field '" + psf.name()
+                                               + "' is defined twice in document-summary '"
+                                               + docsum.name() + "'");
+        }
     }
 }