diff --git a/docs/changelog/103865.yaml b/docs/changelog/103865.yaml new file mode 100644 index 0000000000000..5c9570f32c44e --- /dev/null +++ b/docs/changelog/103865.yaml @@ -0,0 +1,5 @@ +pr: 103865 +summary: Revert change +area: Mapping +type: bug +issues: [] diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java b/server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java index f5f61264523f5..99b5dda215354 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java @@ -250,8 +250,8 @@ static Mapping createDynamicUpdate(DocumentParserContext context) { return null; } RootObjectMapper.Builder rootBuilder = context.updateRoot(); - context.getDynamicMappers() - .forEach((name, builders) -> builders.forEach(builder -> rootBuilder.addDynamic(name, null, builder, context))); + context.getDynamicMappers().forEach(mapper -> rootBuilder.addDynamic(mapper.name(), null, mapper, context)); + for (RuntimeField runtimeField : context.getDynamicRuntimeFields()) { rootBuilder.addRuntimeField(runtimeField); } @@ -484,20 +484,13 @@ private static void parseObjectDynamic(DocumentParserContext context, String cur // not dynamic, read everything up to end object context.parser().skipChildren(); } else { - Mapper.Builder dynamicObjectBuilder = null; Mapper dynamicObjectMapper; if (context.dynamic() == ObjectMapper.Dynamic.RUNTIME) { // with dynamic:runtime all leaf fields will be runtime fields unless explicitly mapped, // hence we don't dynamically create empty objects under properties, but rather carry around an artificial object mapper dynamicObjectMapper = new NoOpObjectMapper(currentFieldName, context.path().pathAsText(currentFieldName)); } else { - dynamicObjectBuilder = DynamicFieldsBuilder.findTemplateBuilderForObject(context, currentFieldName); - if (dynamicObjectBuilder == null) { - dynamicObjectBuilder = new ObjectMapper.Builder(currentFieldName, ObjectMapper.Defaults.SUBOBJECTS).enabled( - ObjectMapper.Defaults.ENABLED - ); - } - dynamicObjectMapper = dynamicObjectBuilder.build(context.createDynamicMapperBuilderContext()); + dynamicObjectMapper = DynamicFieldsBuilder.createDynamicObjectMapper(context, currentFieldName); } if (context.parent().subobjects() == false) { if (dynamicObjectMapper instanceof NestedObjectMapper) { @@ -519,8 +512,8 @@ private static void parseObjectDynamic(DocumentParserContext context, String cur } } - if (context.dynamic() != ObjectMapper.Dynamic.RUNTIME && dynamicObjectBuilder != null) { - context.addDynamicMapper(dynamicObjectMapper.name(), dynamicObjectBuilder); + if (context.dynamic() != ObjectMapper.Dynamic.RUNTIME) { + context.addDynamicMapper(dynamicObjectMapper); } if (dynamicObjectMapper instanceof NestedObjectMapper && context.isWithinCopyTo()) { throwOnCreateDynamicNestedViaCopyTo(dynamicObjectMapper, context); @@ -557,13 +550,12 @@ private static void parseArrayDynamic(DocumentParserContext context, String curr if (context.dynamic() == ObjectMapper.Dynamic.FALSE) { context.parser().skipChildren(); } else { - Mapper.Builder objectBuilderFromTemplate = DynamicFieldsBuilder.findTemplateBuilderForObject(context, currentFieldName); - if (objectBuilderFromTemplate == null) { + Mapper objectMapperFromTemplate = DynamicFieldsBuilder.createObjectMapperFromTemplate(context, currentFieldName); + if (objectMapperFromTemplate == null) { parseNonDynamicArray(context, currentFieldName, currentFieldName); } else { - Mapper objectMapperFromTemplate = objectBuilderFromTemplate.build(context.createDynamicMapperBuilderContext()); if (parsesArrayValue(objectMapperFromTemplate)) { - context.addDynamicMapper(objectMapperFromTemplate.name(), objectBuilderFromTemplate); + context.addDynamicMapper(objectMapperFromTemplate); context.path().add(currentFieldName); parseObjectOrField(context, objectMapperFromTemplate); context.path().remove(); @@ -606,7 +598,7 @@ private static void postProcessDynamicArrayMapping(DocumentParserContext context if (context.indexSettings().getIndexVersionCreated().onOrAfter(DYNAMICALLY_MAP_DENSE_VECTORS_INDEX_VERSION)) { final MapperBuilderContext builderContext = context.createDynamicMapperBuilderContext(); final String fullFieldName = builderContext.buildFullName(fieldName); - final List mappers = context.getDynamicMappers(fullFieldName); + final List mappers = context.getDynamicMappers(fullFieldName); if (mappers == null || context.isFieldAppliedFromTemplate(fullFieldName) || context.isCopyToField(fullFieldName) @@ -615,8 +607,7 @@ private static void postProcessDynamicArrayMapping(DocumentParserContext context // Anything that is NOT a number or anything that IS a number but not mapped to `float` should NOT be mapped to dense_vector || mappers.stream() .anyMatch( - m -> m instanceof NumberFieldMapper.Builder == false - || ((NumberFieldMapper.Builder) m).type != NumberFieldMapper.NumberType.FLOAT + m -> m instanceof NumberFieldMapper == false || ((NumberFieldMapper) m).type() != NumberFieldMapper.NumberType.FLOAT )) { return; } @@ -625,7 +616,8 @@ private static void postProcessDynamicArrayMapping(DocumentParserContext context fieldName, context.indexSettings().getIndexVersionCreated() ); - context.updateDynamicMappers(fullFieldName, builder); + DenseVectorFieldMapper denseVectorFieldMapper = builder.build(builderContext); + context.updateDynamicMappers(fullFieldName, List.of(denseVectorFieldMapper)); } } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DocumentParserContext.java b/server/src/main/java/org/elasticsearch/index/mapper/DocumentParserContext.java index 9d5cb374a9a89..700f0e492af73 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/DocumentParserContext.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/DocumentParserContext.java @@ -22,8 +22,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -84,9 +84,9 @@ protected void addDoc(LuceneDocument doc) { private final MappingParserContext mappingParserContext; private final SourceToParse sourceToParse; private final Set ignoredFields; - private final Map> dynamicMappers; + private final Map> dynamicMappers; private final Set newFieldsSeen; - private final Map dynamicObjectMappers; + private final Map dynamicObjectMappers; private final List dynamicRuntimeFields; private final DocumentDimensions dimensions; private final ObjectMapper parent; @@ -102,9 +102,9 @@ private DocumentParserContext( MappingParserContext mappingParserContext, SourceToParse sourceToParse, Set ignoreFields, - Map> dynamicMappers, + Map> dynamicMappers, Set newFieldsSeen, - Map dynamicObjectMappers, + Map dynamicObjectMappers, List dynamicRuntimeFields, String id, Field version, @@ -166,9 +166,9 @@ protected DocumentParserContext( mappingParserContext, source, new HashSet<>(), - new LinkedHashMap<>(), + new HashMap<>(), new HashSet<>(), - new LinkedHashMap<>(), + new HashMap<>(), new ArrayList<>(), null, null, @@ -304,29 +304,29 @@ public boolean isCopyToField(String name) { /** * Add a new mapper dynamically created while parsing. */ - public final void addDynamicMapper(String fullName, Mapper.Builder builder) { + public final void addDynamicMapper(Mapper mapper) { // eagerly check object depth limit here to avoid stack overflow errors - if (builder instanceof ObjectMapper.Builder) { - MappingLookup.checkObjectDepthLimit(indexSettings().getMappingDepthLimit(), fullName); + if (mapper instanceof ObjectMapper) { + MappingLookup.checkObjectDepthLimit(indexSettings().getMappingDepthLimit(), mapper.name()); } // eagerly check field name limit here to avoid OOM errors // only check fields that are not already mapped or tracked in order to avoid hitting field limit too early via double-counting // note that existing fields can also receive dynamic mapping updates (e.g. constant_keyword to fix the value) - if (mappingLookup.getMapper(fullName) == null - && mappingLookup.objectMappers().containsKey(fullName) == false - && newFieldsSeen.add(fullName)) { + if (mappingLookup.getMapper(mapper.name()) == null + && mappingLookup.objectMappers().containsKey(mapper.name()) == false + && newFieldsSeen.add(mapper.name())) { mappingLookup.checkFieldLimit(indexSettings().getMappingTotalFieldsLimit(), newFieldsSeen.size()); } - if (builder instanceof ObjectMapper.Builder objectMapper) { - dynamicObjectMappers.put(fullName, objectMapper); + if (mapper instanceof ObjectMapper objectMapper) { + dynamicObjectMappers.put(objectMapper.name(), objectMapper); // dynamic object mappers may have been obtained from applying a dynamic template, in which case their definition may contain // sub-fields as well as sub-objects that need to be added to the mappings - for (Mapper.Builder submapper : objectMapper.subBuilders()) { + for (Mapper submapper : objectMapper.mappers.values()) { // we could potentially skip the step of adding these to the dynamic mappers, because their parent is already added to // that list, and what is important is that all of the intermediate objects are added to the dynamic object mappers so that // they can be looked up once sub-fields need to be added to them. For simplicity, we treat these like any other object - addDynamicMapper(fullName + "." + submapper.name, submapper); + addDynamicMapper(submapper); } } @@ -336,7 +336,7 @@ public final void addDynamicMapper(String fullName, Mapper.Builder builder) { // dynamically mapped objects when the incoming document defines no sub-fields in them: // 1) by default, they would be empty containers in the mappings, is it then important to map them? // 2) they can be the result of applying a dynamic template which may define sub-fields or set dynamic, enabled or subobjects. - dynamicMappers.computeIfAbsent(fullName, k -> new ArrayList<>()).add(builder); + dynamicMappers.computeIfAbsent(mapper.name(), k -> new ArrayList<>()).add(mapper); } /** @@ -345,8 +345,8 @@ public final void addDynamicMapper(String fullName, Mapper.Builder builder) { * Consists of a all {@link Mapper}s that will need to be added to their respective parent {@link ObjectMapper}s in order * to become part of the resulting dynamic mapping update. */ - public final Map> getDynamicMappers() { - return dynamicMappers; + public final List getDynamicMappers() { + return dynamicMappers.values().stream().flatMap(List::stream).toList(); } /** @@ -355,13 +355,13 @@ public final Map> getDynamicMappers() { * @param fieldName Full field name with dot-notation. * @return List of Mappers or null */ - public final List getDynamicMappers(String fieldName) { + public final List getDynamicMappers(String fieldName) { return dynamicMappers.get(fieldName); } - public void updateDynamicMappers(String name, Mapper.Builder mapper) { + public void updateDynamicMappers(String name, List mappers) { dynamicMappers.remove(name); - dynamicMappers.put(name, List.of(mapper)); + mappers.forEach(this::addDynamicMapper); } /** @@ -371,7 +371,7 @@ public void updateDynamicMappers(String name, Mapper.Builder mapper) { * Holds a flat set of object mappers, meaning that an object field named foo.bar can be looked up directly with its * dotted name. */ - final ObjectMapper.Builder getDynamicObjectMapper(String name) { + final ObjectMapper getDynamicObjectMapper(String name) { return dynamicObjectMappers.get(name); } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DynamicFieldsBuilder.java b/server/src/main/java/org/elasticsearch/index/mapper/DynamicFieldsBuilder.java index 620b972ee04bf..f2d1b8058f115 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/DynamicFieldsBuilder.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/DynamicFieldsBuilder.java @@ -155,6 +155,25 @@ void createDynamicFieldFromValue(final DocumentParserContext context, String nam } } + /** + * Returns a dynamically created object mapper, eventually based on a matching dynamic template. + */ + static Mapper createDynamicObjectMapper(DocumentParserContext context, String name) { + Mapper mapper = createObjectMapperFromTemplate(context, name); + return mapper != null + ? mapper + : new ObjectMapper.Builder(name, ObjectMapper.Defaults.SUBOBJECTS).enabled(ObjectMapper.Defaults.ENABLED) + .build(context.createDynamicMapperBuilderContext()); + } + + /** + * Returns a dynamically created object mapper, based exclusively on a matching dynamic template, null otherwise. + */ + static Mapper createObjectMapperFromTemplate(DocumentParserContext context, String name) { + Mapper.Builder templateBuilder = findTemplateBuilderForObject(context, name); + return templateBuilder == null ? null : templateBuilder.build(context.createDynamicMapperBuilderContext()); + } + /** * Creates a dynamic string field based on a matching dynamic template. * No field is created in case there is no matching dynamic template. @@ -234,10 +253,7 @@ private static boolean applyMatchingTemplate( return true; } - /** - * Returns a dynamically created object builder, based exclusively on a matching dynamic template, null otherwise. - */ - static Mapper.Builder findTemplateBuilderForObject(DocumentParserContext context, String name) { + private static Mapper.Builder findTemplateBuilderForObject(DocumentParserContext context, String name) { DynamicTemplate.XContentFieldType matchType = DynamicTemplate.XContentFieldType.OBJECT; DynamicTemplate dynamicTemplate = context.findDynamicTemplate(name, matchType); if (dynamicTemplate == null) { @@ -293,7 +309,7 @@ private static final class Concrete implements Strategy { void createDynamicField(Mapper.Builder builder, DocumentParserContext context) throws IOException { Mapper mapper = builder.build(context.createDynamicMapperBuilderContext()); - context.addDynamicMapper(mapper.name(), builder); + context.addDynamicMapper(mapper); parseField.accept(context, mapper); } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java index 4df3b9cf02985..4e0c2ba632712 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java @@ -118,7 +118,7 @@ public static class Builder extends FieldMapper.Builder { private final Parameter> meta = Parameter.metaParam(); private final ScriptCompiler scriptCompiler; - public final NumberType type; + private final NumberType type; private boolean allowMultipleValues = true; private final IndexVersion indexCreatedVersion; @@ -1732,6 +1732,10 @@ public NumberFieldType fieldType() { return (NumberFieldType) super.fieldType(); } + public NumberType type() { + return type; + } + @Override protected String contentType() { return fieldType().type.typeName(); diff --git a/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java index 6bc82cff20e58..e4d3d519a561f 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java @@ -25,12 +25,10 @@ import java.util.Collection; import java.util.Comparator; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Set; import java.util.stream.Stream; public class ObjectMapper extends Mapper implements Cloneable { @@ -79,7 +77,6 @@ public static class Builder extends Mapper.Builder { protected Explicit enabled = Explicit.IMPLICIT_TRUE; protected Dynamic dynamic; protected final List mappersBuilders = new ArrayList<>(); - private final Set subMapperNames = new HashSet<>(); // keeps track of dynamically added subfields public Builder(String name, Explicit subobjects) { super(name); @@ -98,27 +95,31 @@ public Builder dynamic(Dynamic dynamic) { public Builder add(Mapper.Builder builder) { mappersBuilders.add(builder); - subMapperNames.add(builder.name); return this; } - public Collection subBuilders() { - return mappersBuilders; + private void add(String name, Mapper mapper) { + add(new Mapper.Builder(name) { + @Override + public Mapper build(MapperBuilderContext context) { + return mapper; + } + }); } /** - * Adds a dynamically created {@link Mapper.Builder} to this builder. + * Adds a dynamically created {@link Mapper} to this builder. * * @param name the name of the Mapper, including object prefixes * @param prefix the object prefix of this mapper * @param mapper the mapper to add * @param context the DocumentParserContext in which the mapper has been built */ - public final void addDynamic(String name, String prefix, Mapper.Builder mapper, DocumentParserContext context) { + public final void addDynamic(String name, String prefix, Mapper mapper, DocumentParserContext context) { // If the mapper to add has no dots, or the current object mapper has subobjects set to false, // we just add it as it is for sure a leaf mapper if (name.contains(".") == false || subobjects.value() == false) { - add(mapper); + add(name, mapper); } // otherwise we strip off the first object path of the mapper name, load or create // the relevant object mapper, and then recurse down into it, passing the remainder @@ -128,28 +129,22 @@ public final void addDynamic(String name, String prefix, Mapper.Builder mapper, int firstDotIndex = name.indexOf("."); String immediateChild = name.substring(0, firstDotIndex); String immediateChildFullName = prefix == null ? immediateChild : prefix + "." + immediateChild; - ObjectMapper.Builder parentBuilder = findObjectBuilder(immediateChild, immediateChildFullName, context); + ObjectMapper.Builder parentBuilder = findObjectBuilder(immediateChildFullName, context); parentBuilder.addDynamic(name.substring(firstDotIndex + 1), immediateChildFullName, mapper, context); + add(parentBuilder); } } - private ObjectMapper.Builder findObjectBuilder(String leafName, String fullName, DocumentParserContext context) { + private static ObjectMapper.Builder findObjectBuilder(String fullName, DocumentParserContext context) { // does the object mapper already exist? if so, use that ObjectMapper objectMapper = context.mappingLookup().objectMappers().get(fullName); if (objectMapper != null) { - ObjectMapper.Builder builder = objectMapper.newBuilder(context.indexSettings().getIndexVersionCreated()); - add(builder); - return builder; + return objectMapper.newBuilder(context.indexSettings().getIndexVersionCreated()); } // has the object mapper been added as a dynamic update already? - ObjectMapper.Builder builder = context.getDynamicObjectMapper(fullName); - if (builder != null) { - // we re-use builder instances so if the builder has already been - // added we don't need to do so again - if (subMapperNames.contains(leafName) == false) { - add(builder); - } - return builder; + objectMapper = context.getDynamicObjectMapper(fullName); + if (objectMapper != null) { + return objectMapper.newBuilder(context.indexSettings().getIndexVersionCreated()); } throw new IllegalStateException("Missing intermediate object " + fullName); } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java index f4f218371c7d5..b8ac40f185468 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java @@ -42,6 +42,7 @@ import org.elasticsearch.index.mapper.DocumentParserContext; import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; +import org.elasticsearch.index.mapper.Mapper; import org.elasticsearch.index.mapper.MapperBuilderContext; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.MappingParser; @@ -966,9 +967,24 @@ public void parse(DocumentParserContext context) throws IOException { } if (fieldType().dims == null) { int dims = fieldType().elementType.parseDimensionCount(context); - DenseVectorFieldMapper.Builder update = (DenseVectorFieldMapper.Builder) getMergeBuilder(); - update.dims.setValue(dims); - context.addDynamicMapper(name(), update); + DenseVectorFieldType updatedDenseVectorFieldType = new DenseVectorFieldType( + fieldType().name(), + indexCreatedVersion, + fieldType().elementType, + dims, + fieldType().indexed, + fieldType().similarity, + fieldType().meta() + ); + Mapper update = new DenseVectorFieldMapper( + simpleName(), + updatedDenseVectorFieldType, + indexOptions, + indexCreatedVersion, + multiFields(), + copyTo + ); + context.addDynamicMapper(update); return; } Field field = fieldType().indexed ? parseKnnVector(context) : parseBinaryDocValuesVector(context); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DynamicFieldsBuilderTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DynamicFieldsBuilderTests.java index f9c332d21a876..0e4945f7faea8 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/DynamicFieldsBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/DynamicFieldsBuilderTests.java @@ -16,7 +16,6 @@ import java.io.IOException; import java.util.List; -import java.util.Map; import static org.elasticsearch.common.xcontent.XContentParserUtils.ensureExpectedToken; @@ -55,10 +54,9 @@ public XContentParser parser() { parser.nextToken(); assertTrue(parser.currentToken().isValue()); DynamicFieldsBuilder.DYNAMIC_TRUE.createDynamicFieldFromValue(ctx, fieldname); - Map> dynamicMappers = ctx.getDynamicMappers(); + List dynamicMappers = ctx.getDynamicMappers(); assertEquals(1, dynamicMappers.size()); - Mapper mapper = dynamicMappers.get(fieldname).get(0).build(MapperBuilderContext.root(false, false)); - assertEquals(fieldname, mapper.name()); - assertEquals(expectedType, mapper.typeName()); + assertEquals(fieldname, dynamicMappers.get(0).name()); + assertEquals(expectedType, dynamicMappers.get(0).typeName()); } } diff --git a/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java index ec6a9ddd53e2c..3c77bf20b37d2 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java @@ -30,20 +30,23 @@ public class ObjectMapperTests extends MapperServiceTestCase { public void testDifferentInnerObjectTokenFailure() throws Exception { DocumentMapper defaultMapper = createDocumentMapper(mapping(b -> {})); - Exception e = expectThrows(IllegalArgumentException.class, () -> defaultMapper.parse(new SourceToParse("1", new BytesArray(""" - { - "object": { - "array":[ - { - "object": { "value": "value" } - }, - { - "object":"value" - } - ] - }, - "value":"value" - }""".indent(1)), XContentType.JSON))); + IllegalArgumentException e = expectThrows( + IllegalArgumentException.class, + () -> defaultMapper.parse(new SourceToParse("1", new BytesArray(""" + { + "object": { + "array":[ + { + "object": { "value": "value" } + }, + { + "object":"value" + } + ] + }, + "value":"value" + }""".indent(1)), XContentType.JSON)) + ); assertThat(e.getMessage(), containsString("can't merge a non object mapping [object.array.object] with an object mapping")); } diff --git a/x-pack/plugin/mapper-constant-keyword/src/main/java/org/elasticsearch/xpack/constantkeyword/mapper/ConstantKeywordFieldMapper.java b/x-pack/plugin/mapper-constant-keyword/src/main/java/org/elasticsearch/xpack/constantkeyword/mapper/ConstantKeywordFieldMapper.java index 9723276c827fc..ddda0bf7471e0 100644 --- a/x-pack/plugin/mapper-constant-keyword/src/main/java/org/elasticsearch/xpack/constantkeyword/mapper/ConstantKeywordFieldMapper.java +++ b/x-pack/plugin/mapper-constant-keyword/src/main/java/org/elasticsearch/xpack/constantkeyword/mapper/ConstantKeywordFieldMapper.java @@ -35,6 +35,7 @@ import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.KeywordFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; +import org.elasticsearch.index.mapper.Mapper; import org.elasticsearch.index.mapper.MapperBuilderContext; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.SourceLoader; @@ -299,9 +300,9 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio } if (fieldType().value == null) { - Builder update = new Builder(simpleName()); - update.value.setValue(value); - context.addDynamicMapper(fieldType().name(), update); + ConstantKeywordFieldType newFieldType = new ConstantKeywordFieldType(fieldType().name(), value, fieldType().meta()); + Mapper update = new ConstantKeywordFieldMapper(simpleName(), newFieldType); + context.addDynamicMapper(update); } else if (Objects.equals(fieldType().value, value) == false) { throw new IllegalArgumentException( "[constant_keyword] field ["