Merge pull request #32655 from vespa-engine/arnej/match-cased-implies…

…-dictionary-cased "match: cased" should imply "dictionary: cased"
vespa-engine · Oct 31, 2024 · 136687c · 136687c
2 parents 562712d + ec2b590
commit 136687c
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 13 deletions.
diff --git a/config-model/src/main/java/com/yahoo/schema/document/Dictionary.java b/config-model/src/main/java/com/yahoo/schema/document/Dictionary.java
@@ -26,7 +26,7 @@ public void updateType(Type type) {
         }
     }
     public void updateMatch(Case casing) {
-        if (this.casing != null) {
+        if (this.casing != null && this.casing != casing) {
             throw new IllegalArgumentException("dictionary match mode has already been set to " + this.casing);
         }
         this.casing = casing;

diff --git a/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedFields.java b/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedFields.java
@@ -38,9 +38,17 @@ public class ConvertParsedFields {
         this.structProxies = structProxies;
     }
 
+    static void caseHandling(SDField field, Case casing) {
+        field.setMatchingCase(casing);
+        if (casing == Case.CASED) {
+            var dictionary = field.getOrSetDictionary();
+            dictionary.updateMatch(casing);
+        }
+    }
+
     static void convertMatchSettings(SDField field, ParsedMatchSettings parsed) {
         parsed.getMatchType().ifPresent(matchingType -> field.setMatchingType(matchingType));
-        parsed.getMatchCase().ifPresent(casing -> field.setMatchingCase(casing));
+        parsed.getMatchCase().ifPresent(casing -> caseHandling(field, casing));
         parsed.getGramSize().ifPresent(gramSize -> field.getMatching().setGramSize(gramSize));
         parsed.getMaxLength().ifPresent(maxLength -> field.getMatching().maxLength(maxLength));
         parsed.getMaxTermOccurrences().ifPresent(maxTermOccurrences -> field.getMatching().maxTermOccurrences(maxTermOccurrences));
@@ -290,21 +298,29 @@ private void convertIndexSettings(Index index, ParsedIndex parsed) {
 
     SDField convertDocumentField(Schema schema, SDDocumentType document, ParsedField parsed) {
         String name = parsed.name();
-        DataType dataType = context.resolveType(parsed.getType());
-        var field = new SDField(document, name, dataType);
-        convertCommonFieldSettings(schema, field, parsed);
-        convertExtraFieldSettings(schema, field, parsed);
-        document.addField(field);
-        return field;
+        try {
+            DataType dataType = context.resolveType(parsed.getType());
+            var field = new SDField(document, name, dataType);
+            convertCommonFieldSettings(schema, field, parsed);
+            convertExtraFieldSettings(schema, field, parsed);
+            document.addField(field);
+            return field;
+        } catch (IllegalArgumentException e) {
+            throw new IllegalArgumentException("For schema '" + schema.getName() + "', field '" + name + "': " + e.getMessage());
+        }
     }
 
     void convertExtraField(Schema schema, ParsedField parsed) {
         String name = parsed.name();
-        DataType dataType = context.resolveType(parsed.getType());
-        var field = new SDField(schema.getDocument(), name, dataType);
-        convertCommonFieldSettings(schema, field, parsed);
-        convertExtraFieldSettings(schema, field, parsed);
-        schema.addExtraField(field);
+        try {
+            DataType dataType = context.resolveType(parsed.getType());
+            var field = new SDField(schema.getDocument(), name, dataType);
+            convertCommonFieldSettings(schema, field, parsed);
+            convertExtraFieldSettings(schema, field, parsed);
+            schema.addExtraField(field);
+        } catch (IllegalArgumentException e) {
+            throw new IllegalArgumentException("For schema '" + schema.getName() + "', field '" + name + "': " + e.getMessage());
+        }
     }
 
     void convertExtraIndex(Schema schema, ParsedIndex parsed) {

diff --git a/config-model/src/test/java/com/yahoo/schema/processing/DictionaryTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/DictionaryTestCase.java
@@ -144,6 +144,12 @@ void testStringBtreeUnCasedSettings() throws ParseException {
     @Test
     void testStringBtreeCasedSettings() throws ParseException {
         verifyStringDictionaryControl(Dictionary.Type.BTREE, Case.CASED, Case.CASED, "dictionary { btree\ncased\n}", "match:cased");
+        verifyStringDictionaryControl(Dictionary.Type.BTREE, Case.CASED, Case.CASED, "dictionary: btree", "match: cased");
+        try {
+            verifyStringDictionaryControl(Dictionary.Type.BTREE, Case.UNCASED, Case.CASED, "dictionary { hash\nuncased\n}", "match: cased");
+        } catch (IllegalArgumentException e) {
+            assertEquals("For schema 'test', field 'n1': dictionary match mode has already been set to CASED", e.getMessage());
+        }
     }
 
     @Test