Fixed text field mapper index mode and match only text missing synthetic source delegate

Author: Kubik42

modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapper.java

@@ -135,29 +135,39 @@ protected Parameter<?>[] getParameters() {
             return new Parameter<?>[] { meta };
         }
 
-        private MatchOnlyTextFieldType buildFieldType(MapperBuilderContext context) {
+        private MatchOnlyTextFieldType buildFieldType(MapperBuilderContext context, MultiFields multiFields) {
             NamedAnalyzer searchAnalyzer = analyzers.getSearchAnalyzer();
             NamedAnalyzer searchQuoteAnalyzer = analyzers.getSearchQuoteAnalyzer();
             NamedAnalyzer indexAnalyzer = analyzers.getIndexAnalyzer();
             TextSearchInfo tsi = new TextSearchInfo(Defaults.FIELD_TYPE, null, searchAnalyzer, searchQuoteAnalyzer);
-            MatchOnlyTextFieldType ft = new MatchOnlyTextFieldType(
-                context.buildFullName(leafName()),
-                tsi,
-                indexAnalyzer,
-                context.isSourceSynthetic(),
-                meta.getValue(),
-                isWithinMultiField,
-                storedFieldInBinaryFormat
-            );
-            return ft;
+            return new MatchOnlyTextFieldType(
+                    context.buildFullName(leafName()),
+                    tsi,
+                    indexAnalyzer,
+                    context.isSourceSynthetic(),
+                    meta.getValue(),
+                    isWithinMultiField,
+                    storedFieldInBinaryFormat,
+                    TextFieldMapper.SyntheticSourceHelper.syntheticSourceDelegate(getFieldType(), multiFields));
+        }
+
+        /**
+         * This is more of a helper function that's useful in TextFieldMapper.SyntheticSourceHelper.syntheticSourceDelegate()
+         */
+        private FieldType getFieldType() {
+            FieldType fieldType = new FieldType();
+            // by definition, match_only_text are not stored
+            fieldType.setStored(false);
+            return fieldType;
         }
 
         @Override
         public MatchOnlyTextFieldMapper build(MapperBuilderContext context) {
             this.isSyntheticSourceEnabled = context.isSourceSynthetic();
 
-            MatchOnlyTextFieldType tft = buildFieldType(context);
-            return new MatchOnlyTextFieldMapper(leafName(), Defaults.FIELD_TYPE, tft, builderParams(this, context), this);
+            BuilderParams builderParams = builderParams(this, context);
+            MatchOnlyTextFieldType tft = buildFieldType(context, builderParams.multiFields());
+            return new MatchOnlyTextFieldMapper(leafName(), Defaults.FIELD_TYPE, tft, builderParams, this);
         }
     }
 
@@ -194,11 +204,13 @@ public MatchOnlyTextFieldType(
             boolean isSyntheticSource,
             Map<String, String> meta,
             boolean withinMultiField,
-            boolean storedFieldInBinaryFormat
+            boolean storedFieldInBinaryFormat,
+            KeywordFieldMapper.KeywordFieldType syntheticSourceDelegate
         ) {
             super(name, true, false, false, tsi, meta);
             this.indexAnalyzer = Objects.requireNonNull(indexAnalyzer);
-            this.textFieldType = new TextFieldType(name, isSyntheticSource);
+            // TODO: need to set synthetic source delegate correctly
+            this.textFieldType = new TextFieldType(name, isSyntheticSource, syntheticSourceDelegate);
             this.withinMultiField = withinMultiField;
             this.storedFieldInBinaryFormat = storedFieldInBinaryFormat;
         }
@@ -211,7 +223,8 @@ public MatchOnlyTextFieldType(String name) {
                 false,
                 Collections.emptyMap(),
                 false,
-                false
+                false,
+                null
             );
         }
 

modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapperTests.java

@@ -327,6 +327,8 @@ public void testStoreParameterDefaultsSyntheticSourceWithKeywordMultiField() thr
         }
     }
 
+    // TODO: add tests when string length is exceeding, same for TextFieldMapper
+
     public void testStoreParameterDefaultsSyntheticSourceTextFieldIsMultiField() throws IOException {
         var indexSettingsBuilder = getIndexSettingsBuilder();
         indexSettingsBuilder.put(IndexSettings.INDEX_MAPPER_SOURCE_MODE_SETTING.getKey(), "synthetic");

server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java

@@ -732,6 +732,20 @@ public TextFieldType(String name, boolean isSyntheticSource) {
             );
         }
 
+        public TextFieldType(String name, boolean isSyntheticSource, KeywordFieldMapper.KeywordFieldType syntheticSourceDelegate) {
+            this(
+                    name,
+                    true,
+                    false,
+                    new TextSearchInfo(Defaults.FIELD_TYPE, null, Lucene.STANDARD_ANALYZER, Lucene.STANDARD_ANALYZER),
+                    isSyntheticSource,
+                    syntheticSourceDelegate,
+                    Collections.emptyMap(),
+                    false,
+                    false
+            );
+        }
+
         public boolean fielddata() {
             return fielddata;
         }
@@ -1361,7 +1375,8 @@ private TextFieldMapper(
         assert mappedFieldType.getTextSearchInfo().isTokenized();
         assert mappedFieldType.hasDocValues() == false;
 
-        if (fieldType.indexOptions() == IndexOptions.NONE && fieldType().fielddata()) {
+        final boolean isIndexed = fieldType.indexOptions() != IndexOptions.NONE;
+        if (isIndexed == false && fieldType().fielddata()) {
             throw new IllegalArgumentException("Cannot enable fielddata on a [text] field that is not indexed: [" + fullPath() + "]");
         }
 
@@ -1415,7 +1430,7 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio
             return;
         }
 
-        if (fieldType.indexOptions() != IndexOptions.NONE || fieldType.stored()) {
+        if (isIndexed() || fieldType.stored()) {
             Field field = new Field(fieldType().name(), value.string(), fieldType);
             context.doc().add(field);
             if (fieldType.omitNorms()) {
@@ -1602,6 +1617,10 @@ protected void doXContentBody(XContentBuilder builder, Params params) throws IOE
         b.indexPhrases.toXContent(builder, includeDefaults);
     }
 
+    private boolean isIndexed() {
+        return fieldType.indexOptions() != IndexOptions.NONE;
+    }
+
     @Override
     protected SyntheticSourceSupport syntheticSourceSupport() {
         if (store) {
@@ -1613,7 +1632,7 @@ protected void write(XContentBuilder b, Object value) throws IOException {
             });
         }
 
-        if (fieldType.indexOptions() != IndexOptions.NONE) {
+        if (isIndexed()) {
             return super.syntheticSourceSupport();
         }