Abstracted how Text fields use Keyword fields inside of Text fields

Author: Kubik42

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

@@ -182,7 +182,7 @@ static KeywordFieldMapper createExtractQueryFieldBuilder(
             MapperBuilderContext context,
             IndexVersion indexCreatedVersion
         ) {
-            KeywordFieldMapper.Builder queryMetadataFieldBuilder = new KeywordFieldMapper.Builder(name, indexCreatedVersion);
+            KeywordFieldMapper.Builder queryMetadataFieldBuilder = new KeywordFieldMapper.Builder(name, indexCreatedVersion, false);
             queryMetadataFieldBuilder.docValues(false);
             return queryMetadataFieldBuilder.build(context);
         }

modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java

@@ -132,6 +132,15 @@ public String fieldName() {
         return this.fullFieldName;
     }
 
+    /**
+     * Merge the other {@link CompositeSyntheticFieldLoader} into this one.
+     */
+    public void merge(final CompositeSyntheticFieldLoader other) {
+        if (other != null) {
+            this.parts.addAll(other.parts);
+        }
+    }
+
     /**
      * Represents one layer of loading synthetic source values for a field
      * as a part of {@link CompositeSyntheticFieldLoader}.

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

@@ -329,15 +329,19 @@ public boolean newDynamicStringField(DocumentParserContext context, String name)
             MapperBuilderContext mapperBuilderContext = context.createDynamicMapperBuilderContext();
             if (mapperBuilderContext.parentObjectContainsDimensions()) {
                 return createDynamicField(
-                    new KeywordFieldMapper.Builder(name, context.indexSettings().getIndexVersionCreated()),
+                    new KeywordFieldMapper.Builder(name, context.indexSettings().getIndexVersionCreated(), false),
                     context,
                     mapperBuilderContext
                 );
             } else {
                 return createDynamicField(
-                    new TextFieldMapper.Builder(name, context.indexAnalyzers(), SourceFieldMapper.isSynthetic(context.indexSettings()))
+                    new TextFieldMapper.Builder(name, context.indexAnalyzers())
                         .addMultiField(
-                            new KeywordFieldMapper.Builder("keyword", context.indexSettings().getIndexVersionCreated()).ignoreAbove(256)
+                            new KeywordFieldMapper.Builder(
+                                    "keyword",
+                                    context.indexSettings().getIndexVersionCreated(),
+                                    true)
+                                    .ignoreAbove(256)
                         ),
                     context
                 );

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

@@ -610,28 +610,13 @@ public static class Builder {
 
             private final Map<String, Function<MapperBuilderContext, FieldMapper>> mapperBuilders = new HashMap<>();
 
-            private boolean hasSyntheticSourceCompatibleKeywordField;
-
             public Builder add(FieldMapper.Builder builder) {
                 mapperBuilders.put(builder.leafName(), builder::build);
-
-                if (builder instanceof KeywordFieldMapper.Builder kwd) {
-                    if (kwd.hasNormalizer() == false && (kwd.hasDocValues() || kwd.isStored())) {
-                        hasSyntheticSourceCompatibleKeywordField = true;
-                    }
-                }
-
                 return this;
             }
 
             private void add(FieldMapper mapper) {
                 mapperBuilders.put(mapper.leafName(), context -> mapper);
-
-                if (mapper instanceof KeywordFieldMapper kwd) {
-                    if (kwd.hasNormalizer() == false && (kwd.fieldType().hasDocValues() || kwd.fieldType().isStored())) {
-                        hasSyntheticSourceCompatibleKeywordField = true;
-                    }
-                }
             }
 
             private void update(FieldMapper toMerge, MapperMergeContext context) {
@@ -649,10 +634,6 @@ public boolean hasMultiFields() {
                 return mapperBuilders.isEmpty() == false;
             }
 
-            public boolean hasSyntheticSourceCompatibleKeywordField() {
-                return hasSyntheticSourceCompatibleKeywordField;
-            }
-
             public MultiFields build(Mapper.Builder mainFieldBuilder, MapperBuilderContext context) {
                 if (mapperBuilders.isEmpty()) {
                     return empty();