allow exact-duplicate struct only

1 files changed, 11 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedSchemas.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedSchemas.java
index a9532c080ee..81db4e76d11 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedSchemas.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ConvertParsedSchemas.java
@@ -114,7 +114,17 @@ public class ConvertParsedSchemas {
         }
         for (var struct : parsed.getStructs()) {
             var structProxy = fieldConverter.convertStructDeclaration(schema, document, struct);
-            document.addType(structProxy);
+            var old = document.getType(struct.name());
+            if (old == null) {
+                document.addType(structProxy);
+            } else {
+                var oldFields = old.fieldSet();
+                var newFields = structProxy.fieldSet();
+                if (! newFields.equals(oldFields)) {
+                    throw new IllegalArgumentException("Cannot modify already-existing struct: "+struct.name());
+                }
+                // else: log warning
+            }
         }
         for (var annotation : parsed.getAnnotations()) {
             fieldConverter.convertAnnotation(schema, document, annotation);