Enable setting max-token-length in field match.

2 files changed, 36 insertions, 0 deletions

diff --git a/config-model/src/test/java/com/yahoo/schema/parser/SchemaParserTestCase.java b/config-model/src/test/java/com/yahoo/schema/parser/SchemaParserTestCase.java
index 34ca6c30a61..4186e352388 100644
--- a/config-model/src/test/java/com/yahoo/schema/parser/SchemaParserTestCase.java
+++ b/config-model/src/test/java/com/yahoo/schema/parser/SchemaParserTestCase.java
@@ -170,6 +170,23 @@ public class SchemaParserTestCase {
         assertEquals(11, field.matchSettings().getMaxTermOccurrences().get());
     }
 
+    @Test
+    void maxTokenLengthCanBeParsed() throws Exception {
+        String input = joinLines
+                ("schema foo {",
+                        "  document foo {",
+                        "    field bar type string {",
+                        "      indexing: summary | index",
+                        "      match { max-token-length: 11 }",
+                        "    }",
+                        "  }",
+                        "}");
+        ParsedSchema schema = parseString(input);
+        var field = schema.getDocument().getFields().get(0);
+        assertEquals("bar", field.name());
+        assertEquals(11, field.matchSettings().getMaxTokenLength().get());
+    }
+
     void checkFileParses(String fileName) throws Exception {
         var schema = parseFile(fileName);
         assertNotNull(schema);
diff --git a/config-model/src/test/java/com/yahoo/schema/processing/IndexingScriptRewriterTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/IndexingScriptRewriterTestCase.java
index de99d46b9ca..355a810f5ff 100644
--- a/config-model/src/test/java/com/yahoo/schema/processing/IndexingScriptRewriterTestCase.java
+++ b/config-model/src/test/java/com/yahoo/schema/processing/IndexingScriptRewriterTestCase.java
@@ -10,6 +10,7 @@ import com.yahoo.schema.Schema;
 import com.yahoo.schema.ApplicationBuilder;
 import com.yahoo.schema.AbstractSchemaTestCase;
 import com.yahoo.schema.document.BooleanIndexDefinition;
+import com.yahoo.schema.document.MatchType;
 import com.yahoo.schema.document.SDDocumentType;
 import com.yahoo.schema.document.SDField;
 import com.yahoo.vespa.documentmodel.SummaryField;
@@ -155,6 +156,24 @@ public class IndexingScriptRewriterTestCase extends AbstractSchemaTestCase {
                 field);
     }
 
+    @Test
+    void requireThatMaxTokenLengthIsPropagated() {
+        var field = new SDField("test", DataType.STRING);
+        field.getMatching().maxTokenLength(10);
+        field.parseIndexingScript("test", "{ summary | index }");
+        assertIndexingScript("{ input test | tokenize normalize stem:\"BEST\" max-token-length:10 | summary test | index test; }",
+                field);
+    }
+
+    @Test
+    void requireThatMaxTokenLengthIsPropagatedForWordMatch() {
+        var field = new SDField("test", DataType.STRING);
+        field.getMatching().maxTokenLength(10).setType(MatchType.WORD);
+        field.parseIndexingScript("test", "{ summary | index }");
+        assertIndexingScript("{ input test | exact max-token-length:10 | summary test | index test; }",
+                field);
+    }
+
     private static void assertIndexingScript(String expectedScript, SDField unprocessedField) {
         assertEquals(expectedScript,
                 processField(unprocessedField).toString());