From 54e7b4d93b6dfc806f676efaab6060af73d4cafc Mon Sep 17 00:00:00 2001 From: Luca Cavanna Date: Fri, 21 Jun 2024 14:28:36 +0200 Subject: [PATCH] Rename Mapper#simpleName to Mapper#leafName (#110030) This addresses a long standing TODO that caused quite a few bugs over time, in that the mapper name does not include its full path, while the MappedFieldType name does. We have method called simpleName to signal that, but leafName signals that more clearly and aligns with the name we have recently introduced in Mapper.Builder (renamed from name to leafName). Relates to #109971 --- .../mapper/LegacyGeoShapeFieldMapper.java | 2 +- .../extras/MatchOnlyTextFieldMapper.java | 4 +-- .../mapper/extras/RankFeatureFieldMapper.java | 2 +- .../extras/RankFeaturesFieldMapper.java | 2 +- .../mapper/extras/ScaledFloatFieldMapper.java | 4 +-- .../extras/SearchAsYouTypeFieldMapper.java | 2 +- .../mapper/extras/TokenCountFieldMapper.java | 2 +- .../join/mapper/ParentJoinFieldMapper.java | 4 +-- .../percolator/PercolatorFieldMapper.java | 5 +-- .../icu/ICUCollationKeywordFieldMapper.java | 2 +- .../AnnotatedTextFieldMapper.java | 6 ++-- .../mapper/murmur3/Murmur3FieldMapper.java | 2 +- .../search/fieldcaps/FieldCapabilitiesIT.java | 2 +- .../index/mapper/BinaryFieldMapper.java | 6 ++-- .../index/mapper/BooleanFieldMapper.java | 4 +-- .../index/mapper/CompletionFieldMapper.java | 2 +- .../index/mapper/DateFieldMapper.java | 4 +-- .../index/mapper/DocumentParser.java | 6 ++-- .../index/mapper/FieldAliasMapper.java | 2 +- .../index/mapper/FieldMapper.java | 14 ++++---- .../index/mapper/FieldTypeLookup.java | 2 +- .../index/mapper/GeoPointFieldMapper.java | 4 +-- .../index/mapper/GeoShapeFieldMapper.java | 2 +- .../index/mapper/IpFieldMapper.java | 4 +-- .../index/mapper/KeywordFieldMapper.java | 5 ++- .../elasticsearch/index/mapper/Mapper.java | 15 ++++----- .../index/mapper/MappingLookup.java | 4 +-- .../index/mapper/MetadataFieldMapper.java | 2 +- .../index/mapper/NestedObjectMapper.java | 12 +++---- .../index/mapper/NumberFieldMapper.java | 4 +-- .../index/mapper/ObjectMapper.java | 32 +++++++++---------- .../index/mapper/PassThroughObjectMapper.java | 8 ++--- .../index/mapper/PlaceHolderFieldMapper.java | 2 +- .../index/mapper/RangeFieldMapper.java | 6 ++-- .../index/mapper/RootObjectMapper.java | 4 +-- .../index/mapper/TextFieldMapper.java | 6 ++-- .../flattened/FlattenedFieldMapper.java | 4 +-- .../vectors/DenseVectorFieldMapper.java | 8 ++--- .../vectors/SparseVectorFieldMapper.java | 2 +- .../index/mapper/DocumentParserTests.java | 4 +-- .../index/mapper/MapperServiceTests.java | 2 +- ...appingLookupInferenceFieldMapperTests.java | 2 +- .../index/mapper/MappingParserTests.java | 8 ++--- .../mapper/NonDynamicFieldMapperTests.java | 2 +- .../index/mapper/ObjectMapperMergeTests.java | 24 +++++++------- .../index/mapper/ParametrizedMapperTests.java | 2 +- .../index/mapper/MockFieldMapper.java | 2 +- .../mapper/HistogramFieldMapper.java | 6 ++-- .../mapper/SemanticTextFieldMapper.java | 8 ++--- .../AggregateDoubleMetricFieldMapper.java | 8 ++--- .../mapper/ConstantKeywordFieldMapper.java | 6 ++-- .../CountedKeywordFieldMapper.java | 2 +- .../unsignedlong/UnsignedLongFieldMapper.java | 4 +-- .../VersionStringFieldMapper.java | 4 +-- .../GeoShapeWithDocValuesFieldMapper.java | 2 +- .../index/mapper/PointFieldMapper.java | 2 +- .../index/mapper/ShapeFieldMapper.java | 2 +- .../wildcard/mapper/WildcardFieldMapper.java | 6 ++-- 58 files changed, 148 insertions(+), 151 deletions(-) diff --git a/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldMapper.java b/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldMapper.java index 5cc0b6caf38b1..5c1cace6119aa 100644 --- a/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldMapper.java +++ b/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldMapper.java @@ -610,7 +610,7 @@ protected String contentType() { @Override public FieldMapper.Builder getMergeBuilder() { return new Builder( - simpleName(), + leafName(), indexCreatedVersion, builder.ignoreMalformed.getDefaultValue().value(), builder.coerce.getDefaultValue().value() diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapper.java index a9976859fee83..fec8656dcde4b 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapper.java @@ -405,7 +405,7 @@ public Map indexAnalyzers() { @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName(), indexCreatedVersion, indexAnalyzers).init(this); + return new Builder(leafName(), indexCreatedVersion, indexAnalyzers).init(this); } @Override @@ -447,7 +447,7 @@ public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() { "field [" + name() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to" ); } - return new StringStoredFieldFieldLoader(fieldType().storedFieldNameForSyntheticSource(), simpleName(), null) { + return new StringStoredFieldFieldLoader(fieldType().storedFieldNameForSyntheticSource(), leafName(), null) { @Override protected void write(XContentBuilder b, Object value) throws IOException { b.value((String) value); diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeatureFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeatureFieldMapper.java index a42bd3d78bae5..428729f1a20bb 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeatureFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeatureFieldMapper.java @@ -233,6 +233,6 @@ protected String contentType() { @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName()).init(this); + return new Builder(leafName()).init(this); } } diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeaturesFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeaturesFieldMapper.java index ff39e4c09602a..f859bb68401b4 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeaturesFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeaturesFieldMapper.java @@ -137,7 +137,7 @@ public Map indexAnalyzers() { @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName()).init(this); + return new Builder(leafName()).init(this); } @Override diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldMapper.java index 9ea4a9853561e..688bd267eed51 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldMapper.java @@ -511,7 +511,7 @@ protected String contentType() { @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName(), ignoreMalformedByDefault, coerceByDefault, indexMode).metric(metricType).init(this); + return new Builder(leafName(), ignoreMalformedByDefault, coerceByDefault, indexMode).metric(metricType).init(this); } @Override @@ -729,7 +729,7 @@ public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() { "field [" + name() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to" ); } - return new SortedNumericDocValuesSyntheticFieldLoader(name(), simpleName(), ignoreMalformed.value()) { + return new SortedNumericDocValuesSyntheticFieldLoader(name(), leafName(), ignoreMalformed.value()) { @Override protected void writeValue(XContentBuilder b, long value) throws IOException { b.value(decodeForSyntheticSource(value, scalingFactor)); diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/SearchAsYouTypeFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/SearchAsYouTypeFieldMapper.java index 3e9aa885d1e11..d521f9b2d2a31 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/SearchAsYouTypeFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/SearchAsYouTypeFieldMapper.java @@ -721,7 +721,7 @@ protected String contentType() { } public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName(), builder.indexCreatedVersion, builder.analyzers.indexAnalyzers).init(this); + return new Builder(leafName(), builder.indexCreatedVersion, builder.analyzers.indexAnalyzers).init(this); } public static String getShingleFieldName(String parentField, int shingleSize) { diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/TokenCountFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/TokenCountFieldMapper.java index 3a86d29b50b22..a7090cd405684 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/TokenCountFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/TokenCountFieldMapper.java @@ -213,6 +213,6 @@ protected String contentType() { @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName()).init(this); + return new Builder(leafName()).init(this); } } diff --git a/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentJoinFieldMapper.java b/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentJoinFieldMapper.java index dea249ca0c044..3314912a5a3ba 100644 --- a/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentJoinFieldMapper.java +++ b/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentJoinFieldMapper.java @@ -249,7 +249,7 @@ protected boolean supportsParsingObject() { @Override public void parse(DocumentParserContext context) throws IOException { - context.path().add(simpleName()); + context.path().add(leafName()); XContentParser.Token token = context.parser().currentToken(); String name = null; String parent = null; @@ -329,7 +329,7 @@ protected void doXContentBody(XContentBuilder builder, Params params) throws IOE @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName()).init(this); + return new Builder(leafName()).init(this); } @Override diff --git a/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java b/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java index 73c627f57f3ba..f4738bf41b414 100644 --- a/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java +++ b/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java @@ -100,8 +100,9 @@ public class PercolatorFieldMapper extends FieldMapper { @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName(), searchExecutionContext, mapUnmappedFieldsAsText, indexCreatedVersion, clusterTransportVersion) - .init(this); + return new Builder(leafName(), searchExecutionContext, mapUnmappedFieldsAsText, indexCreatedVersion, clusterTransportVersion).init( + this + ); } static class Builder extends FieldMapper.Builder { diff --git a/plugins/analysis-icu/src/main/java/org/elasticsearch/plugin/analysis/icu/ICUCollationKeywordFieldMapper.java b/plugins/analysis-icu/src/main/java/org/elasticsearch/plugin/analysis/icu/ICUCollationKeywordFieldMapper.java index 1b9b879e10c74..224b247f446f0 100644 --- a/plugins/analysis-icu/src/main/java/org/elasticsearch/plugin/analysis/icu/ICUCollationKeywordFieldMapper.java +++ b/plugins/analysis-icu/src/main/java/org/elasticsearch/plugin/analysis/icu/ICUCollationKeywordFieldMapper.java @@ -508,7 +508,7 @@ protected String contentType() { @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName()).init(this); + return new Builder(leafName()).init(this); } @Override diff --git a/plugins/mapper-annotated-text/src/main/java/org/elasticsearch/index/mapper/annotatedtext/AnnotatedTextFieldMapper.java b/plugins/mapper-annotated-text/src/main/java/org/elasticsearch/index/mapper/annotatedtext/AnnotatedTextFieldMapper.java index 9e09ffdc797c6..11a899500fbbf 100644 --- a/plugins/mapper-annotated-text/src/main/java/org/elasticsearch/index/mapper/annotatedtext/AnnotatedTextFieldMapper.java +++ b/plugins/mapper-annotated-text/src/main/java/org/elasticsearch/index/mapper/annotatedtext/AnnotatedTextFieldMapper.java @@ -564,7 +564,7 @@ protected String contentType() { @Override public FieldMapper.Builder getMergeBuilder() { return new Builder( - simpleName(), + leafName(), builder.indexCreatedVersion, builder.analyzers.indexAnalyzers, builder.isSyntheticSourceEnabledViaIndexMode @@ -584,7 +584,7 @@ public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() { ); } if (fieldType.stored()) { - return new StringStoredFieldFieldLoader(name(), simpleName(), null) { + return new StringStoredFieldFieldLoader(name(), leafName(), null) { @Override protected void write(XContentBuilder b, Object value) throws IOException { b.value((String) value); @@ -594,7 +594,7 @@ protected void write(XContentBuilder b, Object value) throws IOException { var kwd = TextFieldMapper.SyntheticSourceHelper.getKeywordFieldMapperForSyntheticSource(this); if (kwd != null) { - return kwd.syntheticFieldLoader(simpleName()); + return kwd.syntheticFieldLoader(leafName()); } throw new IllegalArgumentException( diff --git a/plugins/mapper-murmur3/src/main/java/org/elasticsearch/index/mapper/murmur3/Murmur3FieldMapper.java b/plugins/mapper-murmur3/src/main/java/org/elasticsearch/index/mapper/murmur3/Murmur3FieldMapper.java index b84e4f8b7e32c..27ca049297c79 100644 --- a/plugins/mapper-murmur3/src/main/java/org/elasticsearch/index/mapper/murmur3/Murmur3FieldMapper.java +++ b/plugins/mapper-murmur3/src/main/java/org/elasticsearch/index/mapper/murmur3/Murmur3FieldMapper.java @@ -100,7 +100,7 @@ protected Murmur3FieldMapper(String simpleName, MappedFieldType mappedFieldType, @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName()).init(this); + return new Builder(leafName()).init(this); } @Override diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/fieldcaps/FieldCapabilitiesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/fieldcaps/FieldCapabilitiesIT.java index 9d3ce1c99b553..fcd91bbb193d1 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/fieldcaps/FieldCapabilitiesIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/fieldcaps/FieldCapabilitiesIT.java @@ -859,7 +859,7 @@ protected String contentType() { @Override public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() { - return new StringStoredFieldFieldLoader(name(), simpleName(), null) { + return new StringStoredFieldFieldLoader(name(), leafName(), null) { @Override protected void write(XContentBuilder b, Object value) throws IOException { BytesRef ref = (BytesRef) value; diff --git a/server/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java index ace232beadc02..3ba83ffe7086f 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java @@ -192,7 +192,7 @@ public void indexValue(DocumentParserContext context, byte[] value) { @Override public FieldMapper.Builder getMergeBuilder() { - return new BinaryFieldMapper.Builder(simpleName(), isSyntheticSourceEnabledViaIndexMode).init(this); + return new BinaryFieldMapper.Builder(leafName(), isSyntheticSourceEnabledViaIndexMode).init(this); } @Override @@ -229,10 +229,10 @@ protected void writeValue(XContentBuilder b, BytesRef value) throws IOException case 0: return; case 1: - b.field(simpleName()); + b.field(leafName()); break; default: - b.startArray(simpleName()); + b.startArray(leafName()); } for (int i = 0; i < count; i++) { diff --git a/server/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java index 34aee373cb26b..aa60e78ee382e 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java @@ -480,7 +480,7 @@ protected void indexScriptValues( @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName(), scriptCompiler, ignoreMalformedByDefault, indexCreatedVersion).init(this); + return new Builder(leafName(), scriptCompiler, ignoreMalformedByDefault, indexCreatedVersion).init(this); } @Override @@ -513,7 +513,7 @@ public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() { "field [" + name() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to" ); } - return new SortedNumericDocValuesSyntheticFieldLoader(name(), simpleName(), ignoreMalformed.value()) { + return new SortedNumericDocValuesSyntheticFieldLoader(name(), leafName(), ignoreMalformed.value()) { @Override protected void writeValue(XContentBuilder b, long value) throws IOException { b.value(value == 1); diff --git a/server/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java index c0c9b14ab18f8..23272fbd354f3 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java @@ -82,7 +82,7 @@ public class CompletionFieldMapper extends FieldMapper { @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName(), builder.defaultAnalyzer, builder.indexVersionCreated).init(this); + return new Builder(leafName(), builder.defaultAnalyzer, builder.indexVersionCreated).init(this); } public static class Defaults { diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java index 220f9440c6bf0..b367d203d55b1 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java @@ -898,7 +898,7 @@ private DateFieldMapper( @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName(), resolution, null, scriptCompiler, ignoreMalformedByDefault, indexCreatedVersion).init(this); + return new Builder(leafName(), resolution, null, scriptCompiler, ignoreMalformedByDefault, indexCreatedVersion).init(this); } @Override @@ -997,7 +997,7 @@ public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() { "field [" + name() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to" ); } - return new SortedNumericDocValuesSyntheticFieldLoader(name(), simpleName(), ignoreMalformed) { + return new SortedNumericDocValuesSyntheticFieldLoader(name(), leafName(), ignoreMalformed) { @Override protected void writeValue(XContentBuilder b, long value) throws IOException { b.value(fieldType().format(value, fieldType().dateTimeFormatter())); 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 0966698277723..edbcfd51836fa 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java @@ -295,7 +295,7 @@ static void parseObjectOrNested(DocumentParserContext context) throws IOExceptio context.addIgnoredField( new IgnoredSourceFieldMapper.NameValue( context.parent().name(), - context.parent().fullPath().indexOf(context.parent().simpleName()), + context.parent().fullPath().indexOf(context.parent().leafName()), XContentDataHelper.encodeXContentBuilder(tuple.v2()), context.doc() ) @@ -429,7 +429,7 @@ static void parseObjectOrField(DocumentParserContext context, Mapper mapper) thr } else if (mapper instanceof FieldMapper fieldMapper) { if (shouldFlattenObject(context, fieldMapper)) { // we pass the mapper's simpleName as parentName to the new DocumentParserContext - String currentFieldName = fieldMapper.simpleName(); + String currentFieldName = fieldMapper.leafName(); context.path().remove(); parseObjectOrNested(context.createFlattenContext(currentFieldName)); context.path().add(currentFieldName); @@ -562,7 +562,7 @@ private static void parseObjectDynamic(DocumentParserContext context, String cur throw new DocumentParsingException( context.parser().getTokenLocation(), "Tried to add nested object [" - + dynamicObjectMapper.simpleName() + + dynamicObjectMapper.leafName() + "] to object [" + context.parent().name() + "] which does not support subobjects" diff --git a/server/src/main/java/org/elasticsearch/index/mapper/FieldAliasMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/FieldAliasMapper.java index 7f4fb3b1035eb..5f7220dde449e 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/FieldAliasMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/FieldAliasMapper.java @@ -71,7 +71,7 @@ public Iterator iterator() { @Override public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { - return builder.startObject(simpleName()).field("type", CONTENT_TYPE).field(Names.PATH, path).endObject(); + return builder.startObject(leafName()).field("type", CONTENT_TYPE).field(Names.PATH, path).endObject(); } @Override diff --git a/server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java index 335e3590ee59d..04bc8a2b7b73f 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java @@ -194,7 +194,7 @@ public void parse(DocumentParserContext context) throws IOException { } private void doParseMultiFields(DocumentParserContext context) throws IOException { - context.path().add(simpleName()); + context.path().add(leafName()); for (FieldMapper mapper : multiFields.mappers) { mapper.parse(context); } @@ -416,7 +416,7 @@ protected void checkIncomingMergeType(FieldMapper mergeWith) { @Override public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { - builder.startObject(simpleName()); + builder.startObject(leafName()); doXContentBody(builder, params); return builder.endObject(); } @@ -526,7 +526,7 @@ public Builder add(FieldMapper.Builder builder) { } private void add(FieldMapper mapper) { - mapperBuilders.put(mapper.simpleName(), context -> mapper); + mapperBuilders.put(mapper.leafName(), context -> mapper); if (mapper instanceof KeywordFieldMapper kwd) { if (kwd.hasNormalizer() == false && (kwd.fieldType().hasDocValues() || kwd.fieldType().isStored())) { @@ -536,12 +536,12 @@ private void add(FieldMapper mapper) { } private void update(FieldMapper toMerge, MapperMergeContext context) { - if (mapperBuilders.containsKey(toMerge.simpleName()) == false) { + if (mapperBuilders.containsKey(toMerge.leafName()) == false) { if (context.decrementFieldBudgetIfPossible(toMerge.getTotalFieldsCount())) { add(toMerge); } } else { - FieldMapper existing = mapperBuilders.get(toMerge.simpleName()).apply(context.getMapperBuilderContext()); + FieldMapper existing = mapperBuilders.get(toMerge.leafName()).apply(context.getMapperBuilderContext()); add(existing.merge(toMerge, context)); } } @@ -584,7 +584,7 @@ public void parse(FieldMapper mainField, DocumentParserContext context, Supplier if (mappers.length == 0) { return; } - context.path().add(mainField.simpleName()); + context.path().add(mainField.leafName()); for (FieldMapper mapper : mappers) { mapper.parse(multiFieldContextSupplier.get()); } @@ -1314,7 +1314,7 @@ protected void merge(FieldMapper in, Conflicts conflicts, MapperMergeContext map for (Parameter param : getParameters()) { param.merge(in, conflicts); } - MapperMergeContext childContext = mapperMergeContext.createChildContext(in.simpleName(), null); + MapperMergeContext childContext = mapperMergeContext.createChildContext(in.leafName(), null); for (FieldMapper newSubField : in.multiFields.mappers) { multiFieldsBuilder.update(newSubField, childContext); } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java b/server/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java index 7070c387fbb97..98f8867f386a0 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java @@ -99,7 +99,7 @@ final class FieldTypeLookup { for (PassThroughObjectMapper passThroughMapper : passThroughMappers) { for (Mapper subfield : passThroughMapper.mappers.values()) { if (subfield instanceof FieldMapper fieldMapper) { - String name = fieldMapper.simpleName(); + String name = fieldMapper.leafName(); // Check for conflict between PassThroughObjectMapper subfields. PassThroughObjectMapper conflict = passThroughFieldAliases.put(name, passThroughMapper); if (conflict != null) { diff --git a/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java index 854da1d90715d..36c18c7d3bbf2 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java @@ -284,7 +284,7 @@ public GeoPointFieldMapper(String simpleName, MappedFieldType mappedFieldType, P @Override public FieldMapper.Builder getMergeBuilder() { return new Builder( - simpleName(), + leafName(), builder.scriptCompiler, builder.ignoreMalformed.getDefaultValue().value(), indexCreatedVersion, @@ -636,7 +636,7 @@ public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() { "field [" + name() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to" ); } - return new SortedNumericDocValuesSyntheticFieldLoader(name(), simpleName(), ignoreMalformed()) { + return new SortedNumericDocValuesSyntheticFieldLoader(name(), leafName(), ignoreMalformed()) { final GeoPoint point = new GeoPoint(); @Override diff --git a/server/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java index 278b994af2f44..32d734a622eed 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java @@ -184,7 +184,7 @@ public GeoShapeFieldMapper( @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName(), builder.ignoreMalformed.getDefaultValue().value(), builder.coerce.getDefaultValue().value()).init( + return new Builder(leafName(), builder.ignoreMalformed.getDefaultValue().value(), builder.coerce.getDefaultValue().value()).init( this ); } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java index d30c6b060edfc..d8bd9d7cc55ab 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java @@ -589,7 +589,7 @@ protected void indexScriptValues( @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName(), scriptCompiler, ignoreMalformedByDefault, indexCreatedVersion).dimension(dimension).init(this); + return new Builder(leafName(), scriptCompiler, ignoreMalformedByDefault, indexCreatedVersion).dimension(dimension).init(this); } @Override @@ -621,7 +621,7 @@ public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() { "field [" + name() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to" ); } - return new SortedSetDocValuesSyntheticFieldLoader(name(), simpleName(), null, ignoreMalformed) { + return new SortedSetDocValuesSyntheticFieldLoader(name(), leafName(), null, ignoreMalformed) { @Override protected BytesRef convert(BytesRef value) { byte[] bytes = Arrays.copyOfRange(value.bytes, value.offset, value.offset + value.length); diff --git a/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java index bac176b102026..fca898c3914fe 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java @@ -995,8 +995,7 @@ public Map indexAnalyzers() { @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName(), indexAnalyzers, scriptCompiler, indexCreatedVersion).dimension(fieldType().isDimension()) - .init(this); + return new Builder(leafName(), indexAnalyzers, scriptCompiler, indexCreatedVersion).dimension(fieldType().isDimension()).init(this); } @Override @@ -1028,7 +1027,7 @@ protected SyntheticSourceMode syntheticSourceMode() { @Override public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() { - return syntheticFieldLoader(simpleName()); + return syntheticFieldLoader(leafName()); } public SourceLoader.SyntheticFieldLoader syntheticFieldLoader(String simpleName) { diff --git a/server/src/main/java/org/elasticsearch/index/mapper/Mapper.java b/server/src/main/java/org/elasticsearch/index/mapper/Mapper.java index c9080250974bf..765b2d7c48fe7 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/Mapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/Mapper.java @@ -53,18 +53,15 @@ default boolean supportsVersion(IndexVersion indexCreatedVersion) { } } - private final String simpleName; + private final String leafName; - public Mapper(String simpleName) { - Objects.requireNonNull(simpleName); - this.simpleName = internFieldName(simpleName); + public Mapper(String leafName) { + Objects.requireNonNull(leafName); + this.leafName = internFieldName(leafName); } - /** Returns the simple name, which identifies this mapper against other mappers at the same level in the mappers hierarchy - * TODO: make this protected once Mapper and FieldMapper are merged together */ - // TODO rename this to leafName? - public final String simpleName() { - return simpleName; + public final String leafName() { + return leafName; } /** Returns the canonical name which uniquely identifies the mapper against other mappers in a type. */ diff --git a/server/src/main/java/org/elasticsearch/index/mapper/MappingLookup.java b/server/src/main/java/org/elasticsearch/index/mapper/MappingLookup.java index 83e6984285749..77eac1d50f707 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/MappingLookup.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/MappingLookup.java @@ -226,7 +226,7 @@ private static boolean assertMapperNamesInterned(Map mappers, Ma private static void assertNamesInterned(String name, Mapper mapper) { assert name == name.intern(); assert mapper.name() == mapper.name().intern(); - assert mapper.simpleName() == mapper.simpleName().intern(); + assert mapper.leafName() == mapper.leafName().intern(); if (mapper instanceof ObjectMapper) { ((ObjectMapper) mapper).mappers.forEach(MappingLookup::assertNamesInterned); } @@ -362,7 +362,7 @@ private void checkFieldNameLengthLimit(long limit) { private static void validateMapperNameIn(Collection mappers, long limit) { for (Mapper mapper : mappers) { - String name = mapper.simpleName(); + String name = mapper.leafName(); if (name.length() > limit) { throw new IllegalArgumentException("Field name [" + name + "] is longer than the limit of [" + limit + "] characters"); } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java index 93ffbbf552071..433d9a1c5b653 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java @@ -188,7 +188,7 @@ public final XContentBuilder toXContent(XContentBuilder builder, Params params) if (mergeBuilder == null || mergeBuilder.isConfigured() == false) { return builder; } - builder.startObject(simpleName()); + builder.startObject(leafName()); getMergeBuilder().toXContent(builder, params); return builder.endObject(); } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/NestedObjectMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/NestedObjectMapper.java index 16fe3d928f8fd..21ddf0fc1c115 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/NestedObjectMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/NestedObjectMapper.java @@ -244,7 +244,7 @@ public Map getChildren() { @Override public ObjectMapper.Builder newBuilder(IndexVersion indexVersionCreated) { - NestedObjectMapper.Builder builder = new NestedObjectMapper.Builder(simpleName(), indexVersionCreated, bitsetProducer); + NestedObjectMapper.Builder builder = new NestedObjectMapper.Builder(leafName(), indexVersionCreated, bitsetProducer); builder.enabled = enabled; builder.dynamic = dynamic; builder.includeInRoot = includeInRoot; @@ -255,7 +255,7 @@ public ObjectMapper.Builder newBuilder(IndexVersion indexVersionCreated) { @Override NestedObjectMapper withoutMappers() { return new NestedObjectMapper( - simpleName(), + leafName(), fullPath(), Map.of(), enabled, @@ -272,7 +272,7 @@ NestedObjectMapper withoutMappers() { @Override public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { - builder.startObject(simpleName()); + builder.startObject(leafName()); builder.field("type", CONTENT_TYPE); if (includeInParent.explicit() && includeInParent.value()) { builder.field("include_in_parent", includeInParent.value()); @@ -330,7 +330,7 @@ public ObjectMapper merge(Mapper mergeWith, MapperMergeContext parentMergeContex } } return new NestedObjectMapper( - simpleName(), + leafName(), fullPath(), mergeResult.mappers(), mergeResult.enabled(), @@ -451,12 +451,12 @@ public boolean hasValue() { public void write(XContentBuilder b) throws IOException { assert (children != null && children.size() > 0); if (children.size() == 1) { - b.startObject(simpleName()); + b.startObject(leafName()); leafStoredFieldLoader.advanceTo(children.get(0)); leafSourceLoader.write(leafStoredFieldLoader, children.get(0), b); b.endObject(); } else { - b.startArray(simpleName()); + b.startArray(leafName()); for (int childId : children) { b.startObject(); leafStoredFieldLoader.advanceTo(childId); 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 d6c19132709de..979f378e6a3bf 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java @@ -1970,7 +1970,7 @@ protected void indexScriptValues( @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName(), type, scriptCompiler, ignoreMalformedByDefault, coerceByDefault, indexCreatedVersion, indexMode) + return new Builder(leafName(), type, scriptCompiler, ignoreMalformedByDefault, coerceByDefault, indexCreatedVersion, indexMode) .dimension(dimension) .metric(metricType) .allowMultipleValues(allowMultipleValues) @@ -2006,7 +2006,7 @@ public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() { "field [" + name() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to" ); } - return type.syntheticFieldLoader(name(), simpleName(), ignoreMalformed.value()); + return type.syntheticFieldLoader(name(), leafName(), ignoreMalformed.value()); } // For testing only: 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 bef53fb8ae39e..f2a81f05fe0fb 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java @@ -166,7 +166,7 @@ protected final Map buildMappers(MapperBuilderContext mapperBuil Map mappers = new HashMap<>(); for (Mapper.Builder builder : mappersBuilders) { Mapper mapper = builder.build(mapperBuilderContext); - Mapper existing = mappers.get(mapper.simpleName()); + Mapper existing = mappers.get(mapper.leafName()); if (existing != null) { // The same mappings or document may hold the same field twice, either because duplicated JSON keys are allowed or // the same field is provided using the object notation as well as the dot notation at the same time. @@ -177,9 +177,9 @@ protected final Map buildMappers(MapperBuilderContext mapperBuil } if (subobjects.value() == false && mapper instanceof ObjectMapper objectMapper) { // We're parsing a mapping that has set `subobjects: false` but has defined sub-objects - objectMapper.asFlattenedFieldMappers(mapperBuilderContext).forEach(m -> mappers.put(m.simpleName(), m)); + objectMapper.asFlattenedFieldMappers(mapperBuilderContext).forEach(m -> mappers.put(m.leafName(), m)); } else { - mappers.put(mapper.simpleName(), mapper); + mappers.put(mapper.leafName(), mapper); } } return mappers; @@ -418,7 +418,7 @@ private static void validateFieldName(String fieldName, IndexVersion indexCreate * @return a Builder that will produce an empty ObjectMapper with the same configuration as this one */ public ObjectMapper.Builder newBuilder(IndexVersion indexVersionCreated) { - ObjectMapper.Builder builder = new ObjectMapper.Builder(simpleName(), subobjects); + ObjectMapper.Builder builder = new ObjectMapper.Builder(leafName(), subobjects); builder.enabled = this.enabled; builder.dynamic = this.dynamic; return builder; @@ -429,7 +429,7 @@ public ObjectMapper.Builder newBuilder(IndexVersion indexVersionCreated) { * This is typically used in the context of a mapper merge when there's not enough budget to add the entire object. */ ObjectMapper withoutMappers() { - return new ObjectMapper(simpleName(), fullPath, enabled, subobjects, storeArraySource, dynamic, Map.of()); + return new ObjectMapper(leafName(), fullPath, enabled, subobjects, storeArraySource, dynamic, Map.of()); } @Override @@ -500,7 +500,7 @@ public ObjectMapper merge(Mapper mergeWith, MapperMergeContext parentMergeContex } var mergeResult = MergeResult.build(this, (ObjectMapper) mergeWith, parentMergeContext); return new ObjectMapper( - simpleName(), + leafName(), fullPath, mergeResult.enabled, mergeResult.subObjects, @@ -559,7 +559,7 @@ static MergeResult build(ObjectMapper existing, ObjectMapper mergeWithObject, Ma } else { trackArraySource = existing.storeArraySource; } - MapperMergeContext objectMergeContext = existing.createChildContext(parentMergeContext, existing.simpleName()); + MapperMergeContext objectMergeContext = existing.createChildContext(parentMergeContext, existing.leafName()); Map mergedMappers = buildMergedMappers(existing, mergeWithObject, objectMergeContext, subObjects.value()); return new MergeResult( enabled, @@ -581,13 +581,13 @@ private static Map buildMergedMappers( if (subobjects == false && childOfExistingMapper instanceof ObjectMapper objectMapper) { // An existing mapping with sub-objects is merged with a mapping that has set `subobjects: false` objectMapper.asFlattenedFieldMappers(objectMergeContext.getMapperBuilderContext()) - .forEach(m -> mergedMappers.put(m.simpleName(), m)); + .forEach(m -> mergedMappers.put(m.leafName(), m)); } else { putMergedMapper(mergedMappers, childOfExistingMapper); } } for (Mapper mergeWithMapper : mergeWithObject) { - Mapper mergeIntoMapper = mergedMappers.get(mergeWithMapper.simpleName()); + Mapper mergeIntoMapper = mergedMappers.get(mergeWithMapper.leafName()); if (mergeIntoMapper == null) { if (subobjects == false && mergeWithMapper instanceof ObjectMapper objectMapper) { // An existing mapping that has set `subobjects: false` is merged with a mapping with sub-objects @@ -625,7 +625,7 @@ private static Map buildMergedMappers( private static void putMergedMapper(Map mergedMappers, @Nullable Mapper merged) { if (merged != null) { - mergedMappers.put(merged.simpleName(), merged); + mergedMappers.put(merged.leafName(), merged); } } @@ -656,11 +656,11 @@ List asFlattenedFieldMappers(MapperBuilderContext context) { private void asFlattenedFieldMappers(MapperBuilderContext context, List flattenedMappers, ContentPath path) { ensureFlattenable(context, path); - path.add(simpleName()); + path.add(leafName()); for (Mapper mapper : mappers.values()) { if (mapper instanceof FieldMapper fieldMapper) { FieldMapper.Builder fieldBuilder = fieldMapper.getMergeBuilder(); - fieldBuilder.setLeafName(path.pathAsText(mapper.simpleName())); + fieldBuilder.setLeafName(path.pathAsText(mapper.leafName())); flattenedMappers.add(fieldBuilder.build(context)); } else if (mapper instanceof ObjectMapper objectMapper) { objectMapper.asFlattenedFieldMappers(context, flattenedMappers, path); @@ -691,10 +691,10 @@ private void ensureFlattenable(MapperBuilderContext context, ContentPath path) { private void throwAutoFlatteningException(ContentPath path, String reason) { throw new IllegalArgumentException( "Object mapper [" - + path.pathAsText(simpleName()) + + path.pathAsText(leafName()) + "] was found in a context where subobjects is set to false. " + "Auto-flattening [" - + path.pathAsText(simpleName()) + + path.pathAsText(leafName()) + "] failed because " + reason ); @@ -707,7 +707,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws } void toXContent(XContentBuilder builder, Params params, ToXContent custom) throws IOException { - builder.startObject(simpleName()); + builder.startObject(leafName()); if (mappers.isEmpty() && custom == null) { // only write the object content type if there are no properties, otherwise, it is automatically detected builder.field("type", CONTENT_TYPE); @@ -849,7 +849,7 @@ public void write(XContentBuilder b) throws IOException { if (isRoot()) { b.startObject(); } else { - b.startObject(simpleName()); + b.startObject(leafName()); } } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/PassThroughObjectMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/PassThroughObjectMapper.java index 0fed111a9298b..413a645cebce6 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/PassThroughObjectMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/PassThroughObjectMapper.java @@ -113,7 +113,7 @@ public PassThroughObjectMapper build(MapperBuilderContext context) { @Override PassThroughObjectMapper withoutMappers() { - return new PassThroughObjectMapper(simpleName(), fullPath(), enabled, dynamic, Map.of(), timeSeriesDimensionSubFields, priority); + return new PassThroughObjectMapper(leafName(), fullPath(), enabled, dynamic, Map.of(), timeSeriesDimensionSubFields, priority); } @Override @@ -131,7 +131,7 @@ public int priority() { @Override public PassThroughObjectMapper.Builder newBuilder(IndexVersion indexVersionCreated) { - PassThroughObjectMapper.Builder builder = new PassThroughObjectMapper.Builder(simpleName()); + PassThroughObjectMapper.Builder builder = new PassThroughObjectMapper.Builder(leafName()); builder.enabled = enabled; builder.dynamic = dynamic; builder.timeSeriesDimensionSubFields = timeSeriesDimensionSubFields; @@ -153,7 +153,7 @@ public PassThroughObjectMapper merge(Mapper mergeWith, MapperMergeContext parent : this.timeSeriesDimensionSubFields; return new PassThroughObjectMapper( - simpleName(), + leafName(), fullPath(), mergeResult.enabled(), mergeResult.dynamic(), @@ -165,7 +165,7 @@ public PassThroughObjectMapper merge(Mapper mergeWith, MapperMergeContext parent @Override public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { - builder.startObject(simpleName()); + builder.startObject(leafName()); builder.field("type", CONTENT_TYPE); if (timeSeriesDimensionSubFields.explicit()) { builder.field(TimeSeriesParams.TIME_SERIES_DIMENSION_PARAM, timeSeriesDimensionSubFields.value()); diff --git a/server/src/main/java/org/elasticsearch/index/mapper/PlaceHolderFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/PlaceHolderFieldMapper.java index 0fd8a80599a5e..4a12ed77b4f26 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/PlaceHolderFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/PlaceHolderFieldMapper.java @@ -277,7 +277,7 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio @Override public FieldMapper.Builder getMergeBuilder() { - return new PlaceHolderFieldMapper.Builder(simpleName(), typeName()).init(this); + return new PlaceHolderFieldMapper.Builder(leafName(), typeName()).init(this); } @Override diff --git a/server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java index 384656ecc92d9..e88131bc18e3a 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java @@ -364,7 +364,7 @@ boolean coerce() { @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName(), type, coerceByDefault).init(this); + return new Builder(leafName(), type, coerceByDefault).init(this); } @Override @@ -488,11 +488,11 @@ protected void writeValue(XContentBuilder b, BytesRef value) throws IOException case 0: return; case 1: - b.field(simpleName()); + b.field(leafName()); ranges.get(0).toXContent(b, fieldType().dateTimeFormatter); break; default: - b.startArray(simpleName()); + b.startArray(leafName()); for (var range : ranges) { range.toXContent(b, fieldType().dateTimeFormatter); } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java index a3c2d6149a4f2..4bfce65a8bc92 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java @@ -161,7 +161,7 @@ public RootObjectMapper.Builder newBuilder(IndexVersion indexVersionCreated) { @Override RootObjectMapper withoutMappers() { return new RootObjectMapper( - simpleName(), + leafName(), enabled, subobjects, storeArraySource, @@ -277,7 +277,7 @@ public RootObjectMapper merge(Mapper mergeWith, MapperMergeContext parentMergeCo } return new RootObjectMapper( - simpleName(), + leafName(), mergeResult.enabled(), mergeResult.subObjects(), mergeResult.trackArraySource(), diff --git a/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java index 0ead2b7a7b45a..f8f4828c5d003 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java @@ -1265,7 +1265,7 @@ public Map indexAnalyzers() { @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName(), indexCreatedVersion, indexAnalyzers, isSyntheticSourceEnabledViaIndexMode).init(this); + return new Builder(leafName(), indexCreatedVersion, indexAnalyzers, isSyntheticSourceEnabledViaIndexMode).init(this); } @Override @@ -1459,7 +1459,7 @@ public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() { ); } if (store) { - return new StringStoredFieldFieldLoader(name(), simpleName(), null) { + return new StringStoredFieldFieldLoader(name(), leafName(), null) { @Override protected void write(XContentBuilder b, Object value) throws IOException { b.value((String) value); @@ -1469,7 +1469,7 @@ protected void write(XContentBuilder b, Object value) throws IOException { var kwd = SyntheticSourceHelper.getKeywordFieldMapperForSyntheticSource(this); if (kwd != null) { - return kwd.syntheticFieldLoader(simpleName()); + return kwd.syntheticFieldLoader(leafName()); } throw new IllegalArgumentException( diff --git a/server/src/main/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldMapper.java index c7c3ace9b1989..4666c6f7427c9 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldMapper.java @@ -801,7 +801,7 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName()).init(this); + return new Builder(leafName()).init(this); } @Override @@ -815,7 +815,7 @@ public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() { return SourceLoader.SyntheticFieldLoader.NOTHING; } if (fieldType().hasDocValues()) { - return new FlattenedSortedSetDocValuesSyntheticFieldLoader(name() + "._keyed", simpleName()); + return new FlattenedSortedSetDocValuesSyntheticFieldLoader(name() + "._keyed", leafName()); } throw new IllegalArgumentException( 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 175ff8dc97945..beb64973ff0fb 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 @@ -1666,7 +1666,7 @@ public void parse(DocumentParserContext context) throws IOException { fieldType().meta() ); Mapper update = new DenseVectorFieldMapper( - simpleName(), + leafName(), updatedDenseVectorFieldType, indexOptions, indexCreatedVersion, @@ -1757,7 +1757,7 @@ protected String contentType() { @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName(), indexCreatedVersion).init(this); + return new Builder(leafName(), indexCreatedVersion).init(this); } private static IndexOptions parseIndexOptions(String fieldName, Object propNode) { @@ -1883,7 +1883,7 @@ public void write(XContentBuilder b) throws IOException { if (hasMagnitude) { magnitude = Float.intBitsToFloat((int) magnitudeReader.longValue()); } - b.startArray(simpleName()); + b.startArray(leafName()); if (values != null) { for (float v : values.vectorValue()) { if (hasMagnitude) { @@ -1943,7 +1943,7 @@ public void write(XContentBuilder b) throws IOException { if (false == hasValue) { return; } - b.startArray(simpleName()); + b.startArray(leafName()); BytesRef ref = values.binaryValue(); ByteBuffer byteBuffer = ByteBuffer.wrap(ref.bytes, ref.offset, ref.length); if (indexCreatedVersion.onOrAfter(LITTLE_ENDIAN_FLOAT_STORED_INDEX_VERSION)) { diff --git a/server/src/main/java/org/elasticsearch/index/mapper/vectors/SparseVectorFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/vectors/SparseVectorFieldMapper.java index c20fe7b812f86..593a45c0c325a 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/vectors/SparseVectorFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/vectors/SparseVectorFieldMapper.java @@ -142,7 +142,7 @@ public Map indexAnalyzers() { @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName()).init(this); + return new Builder(leafName()).init(this); } @Override diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java index d417d6c647d05..e6e06d331a0c7 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java @@ -2606,7 +2606,7 @@ same name need to be part of the same mappings (hence the same document). If th Mapper baz = ((ObjectMapper) barMapper).getMapper("baz"); assertNotNull(baz); assertEquals("foo.bar.baz", baz.name()); - assertEquals("baz", baz.simpleName()); + assertEquals("baz", baz.leafName()); List fields = doc.rootDoc().getFields("foo.bar.baz"); assertEquals(2, fields.size()); String[] fieldStrings = fields.stream().map(Object::toString).toArray(String[]::new); @@ -3245,7 +3245,7 @@ protected String contentType() { @Override public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() { - return new StringStoredFieldFieldLoader(name(), simpleName(), null) { + return new StringStoredFieldFieldLoader(name(), leafName(), null) { @Override protected void write(XContentBuilder b, Object value) throws IOException { BytesRef ref = (BytesRef) value; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java b/server/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java index bb5d50267642f..3b46f15b33cc7 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java @@ -273,7 +273,7 @@ public void testMappingRecoverySkipFieldNameLengthLimit() throws Throwable { DocumentMapper documentMapper = mapperService.merge("_doc", mapping, MergeReason.MAPPING_RECOVERY); - assertEquals(testString, documentMapper.mappers().getMapper(testString).simpleName()); + assertEquals(testString, documentMapper.mappers().getMapper(testString).leafName()); } public void testIsMetadataField() throws IOException { diff --git a/server/src/test/java/org/elasticsearch/index/mapper/MappingLookupInferenceFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/MappingLookupInferenceFieldMapperTests.java index 868d60cda567e..e3da8b39e1ec6 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/MappingLookupInferenceFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/MappingLookupInferenceFieldMapperTests.java @@ -114,7 +114,7 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio @Override public Builder getMergeBuilder() { - return new Builder(simpleName()); + return new Builder(leafName()); } @Override diff --git a/server/src/test/java/org/elasticsearch/index/mapper/MappingParserTests.java b/server/src/test/java/org/elasticsearch/index/mapper/MappingParserTests.java index aa22a345c5cec..ddc4b4b7dc674 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/MappingParserTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/MappingParserTests.java @@ -206,19 +206,19 @@ to get the wrong path (missing the first portion). assertEquals(1, mapping.getRoot().mappers.size()); Mapper object = mapping.getRoot().getMapper("obj"); assertThat(object, CoreMatchers.instanceOf(ObjectMapper.class)); - assertEquals("obj", object.simpleName()); + assertEquals("obj", object.leafName()); assertEquals("obj", object.name()); ObjectMapper objectMapper = (ObjectMapper) object; assertEquals(1, objectMapper.mappers.size()); object = objectMapper.getMapper("source"); assertThat(object, CoreMatchers.instanceOf(ObjectMapper.class)); - assertEquals("source", object.simpleName()); + assertEquals("source", object.leafName()); assertEquals("obj.source", object.name()); objectMapper = (ObjectMapper) object; assertEquals(1, objectMapper.mappers.size()); object = objectMapper.getMapper("geo"); assertThat(object, CoreMatchers.instanceOf(ObjectMapper.class)); - assertEquals("geo", object.simpleName()); + assertEquals("geo", object.leafName()); assertEquals("obj.source.geo", object.name()); objectMapper = (ObjectMapper) object; assertEquals(1, objectMapper.mappers.size()); @@ -226,7 +226,7 @@ to get the wrong path (missing the first portion). assertThat(location, CoreMatchers.instanceOf(GeoPointFieldMapper.class)); GeoPointFieldMapper geoPointFieldMapper = (GeoPointFieldMapper) location; assertEquals("obj.source.geo.location", geoPointFieldMapper.name()); - assertEquals("location", geoPointFieldMapper.simpleName()); + assertEquals("location", geoPointFieldMapper.leafName()); assertEquals("obj.source.geo.location", geoPointFieldMapper.mappedFieldType.name()); } diff --git a/server/src/test/java/org/elasticsearch/index/mapper/NonDynamicFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NonDynamicFieldMapperTests.java index 9e4ed2e0b4f14..8c64868045490 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/NonDynamicFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/NonDynamicFieldMapperTests.java @@ -82,7 +82,7 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName()).init(this); + return new Builder(leafName()).init(this); } } } diff --git a/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperMergeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperMergeTests.java index 25ef3c8550ec0..b76949b8a8e4f 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperMergeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperMergeTests.java @@ -53,10 +53,10 @@ public void testMerge() { final ObjectMapper mergedFoo = (ObjectMapper) merged.getMapper("foo"); { Mapper bar = mergedFoo.getMapper("bar"); - assertEquals("bar", bar.simpleName()); + assertEquals("bar", bar.leafName()); assertEquals("foo.bar", bar.name()); Mapper baz = mergedFoo.getMapper("baz"); - assertEquals("baz", baz.simpleName()); + assertEquals("baz", baz.leafName()); assertEquals("foo.baz", baz.name()); } } @@ -140,7 +140,7 @@ public void testMergedFieldNamesFieldWithDotsSubobjectsFalseAtRoot() { final KeywordFieldMapper keywordFieldMapper = (KeywordFieldMapper) merged.getMapper("host.name"); assertEquals("host.name", keywordFieldMapper.name()); - assertEquals("host.name", keywordFieldMapper.simpleName()); + assertEquals("host.name", keywordFieldMapper.leafName()); } public void testMergedFieldNamesFieldWithDotsSubobjectsFalse() { @@ -157,7 +157,7 @@ public void testMergedFieldNamesFieldWithDotsSubobjectsFalse() { ObjectMapper metrics = (ObjectMapper) foo.getMapper("metrics"); final KeywordFieldMapper keywordFieldMapper = (KeywordFieldMapper) metrics.getMapper("host.name"); assertEquals("foo.metrics.host.name", keywordFieldMapper.name()); - assertEquals("host.name", keywordFieldMapper.simpleName()); + assertEquals("host.name", keywordFieldMapper.leafName()); } public void testMergedFieldNamesMultiFields() { @@ -170,10 +170,10 @@ public void testMergedFieldNamesMultiFields() { TextFieldMapper text = (TextFieldMapper) merged.getMapper("text"); assertEquals("text", text.name()); - assertEquals("text", text.simpleName()); + assertEquals("text", text.leafName()); KeywordFieldMapper keyword = (KeywordFieldMapper) text.multiFields().iterator().next(); assertEquals("text.keyword", keyword.name()); - assertEquals("keyword", keyword.simpleName()); + assertEquals("keyword", keyword.leafName()); } public void testMergedFieldNamesMultiFieldsWithinSubobjectsFalse() { @@ -190,10 +190,10 @@ public void testMergedFieldNamesMultiFieldsWithinSubobjectsFalse() { ObjectMapper metrics = (ObjectMapper) foo.getMapper("metrics"); final TextFieldMapper textFieldMapper = (TextFieldMapper) metrics.getMapper("host.name"); assertEquals("foo.metrics.host.name", textFieldMapper.name()); - assertEquals("host.name", textFieldMapper.simpleName()); + assertEquals("host.name", textFieldMapper.leafName()); FieldMapper fieldMapper = textFieldMapper.multiFields.iterator().next(); assertEquals("foo.metrics.host.name.keyword", fieldMapper.name()); - assertEquals("keyword", fieldMapper.simpleName()); + assertEquals("keyword", fieldMapper.leafName()); } public void testMergeWithLimit() { @@ -324,7 +324,7 @@ public void testMergeSubobjectsFalseWithObject() { private static RootObjectMapper createRootSubobjectFalseLeafWithDots() { FieldMapper.Builder fieldBuilder = new KeywordFieldMapper.Builder("host.name", IndexVersion.current()); FieldMapper fieldMapper = fieldBuilder.build(MapperBuilderContext.root(false, false)); - assertEquals("host.name", fieldMapper.simpleName()); + assertEquals("host.name", fieldMapper.leafName()); assertEquals("host.name", fieldMapper.name()); return new RootObjectMapper.Builder("_doc", Explicit.EXPLICIT_FALSE).add(fieldBuilder) .build(MapperBuilderContext.root(false, false)); @@ -342,7 +342,7 @@ private static ObjectMapper.Builder createObjectSubobjectsFalseLeafWithDots() { MapperService.MergeReason.MAPPING_UPDATE ) ); - assertEquals("host.name", fieldMapper.simpleName()); + assertEquals("host.name", fieldMapper.leafName()); assertEquals("foo.metrics.host.name", fieldMapper.name()); return new ObjectMapper.Builder("foo", ObjectMapper.Defaults.SUBOBJECTS).add( new ObjectMapper.Builder("metrics", Explicit.EXPLICIT_FALSE).add(fieldBuilder) @@ -361,10 +361,10 @@ private ObjectMapper.Builder createObjectSubobjectsFalseLeafWithMultiField() { MapperService.MergeReason.MAPPING_UPDATE ) ); - assertEquals("host.name", textKeywordMultiField.simpleName()); + assertEquals("host.name", textKeywordMultiField.leafName()); assertEquals("foo.metrics.host.name", textKeywordMultiField.name()); FieldMapper fieldMapper = textKeywordMultiField.multiFields.iterator().next(); - assertEquals("keyword", fieldMapper.simpleName()); + assertEquals("keyword", fieldMapper.leafName()); assertEquals("foo.metrics.host.name.keyword", fieldMapper.name()); return new ObjectMapper.Builder("foo", ObjectMapper.Defaults.SUBOBJECTS).add( new ObjectMapper.Builder("metrics", Explicit.EXPLICIT_FALSE).add(fieldBuilder) diff --git a/server/src/test/java/org/elasticsearch/index/mapper/ParametrizedMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/ParametrizedMapperTests.java index 8c68b134980af..55761e5ec339d 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/ParametrizedMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/ParametrizedMapperTests.java @@ -228,7 +228,7 @@ protected TestMapper( @Override public Builder getMergeBuilder() { - return new ParametrizedMapperTests.Builder(simpleName()).init(this); + return new ParametrizedMapperTests.Builder(leafName()).init(this); } @Override diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/MockFieldMapper.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/MockFieldMapper.java index 8cd8aa0b41e08..f207f3c4cd314 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/MockFieldMapper.java +++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/MockFieldMapper.java @@ -34,7 +34,7 @@ public MockFieldMapper(String fullName, MappedFieldType fieldType, MultiFields m @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName()); + return new Builder(leafName()); } static String findSimpleName(String fullName) { diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java index c5d3a66f403ff..90b50d3df34bd 100644 --- a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java +++ b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java @@ -138,7 +138,7 @@ protected String contentType() { @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName(), ignoreMalformedByDefault).init(this); + return new Builder(leafName(), ignoreMalformedByDefault).init(this); } @Override @@ -289,7 +289,7 @@ protected boolean supportsParsingObject() { @Override public void parse(DocumentParserContext context) throws IOException { - context.path().add(simpleName()); + context.path().add(leafName()); boolean shouldStoreMalformedDataForSyntheticSource = context.mappingLookup().isSourceSynthetic() && ignoreMalformed(); XContentParser.Token token; @@ -521,7 +521,7 @@ public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() { } return new CompositeSyntheticFieldLoader( - simpleName(), + leafName(), name(), new HistogramSyntheticFieldLoader(), new CompositeSyntheticFieldLoader.MalformedValuesLayer(name()) diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/mapper/SemanticTextFieldMapper.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/mapper/SemanticTextFieldMapper.java index f0537cf6264ac..dac0b2fae4b05 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/mapper/SemanticTextFieldMapper.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/mapper/SemanticTextFieldMapper.java @@ -137,7 +137,7 @@ protected void merge(FieldMapper mergeWith, Conflicts conflicts, MapperMergeCont super.merge(mergeWith, conflicts, mapperMergeContext); conflicts.check(); var semanticMergeWith = (SemanticTextFieldMapper) mergeWith; - var context = mapperMergeContext.createChildContext(mergeWith.simpleName(), ObjectMapper.Dynamic.FALSE); + var context = mapperMergeContext.createChildContext(mergeWith.leafName(), ObjectMapper.Dynamic.FALSE); var inferenceField = inferenceFieldBuilder.apply(context.getMapperBuilderContext()); var mergedInferenceField = inferenceField.merge(semanticMergeWith.fieldType().getInferenceField(), context); inferenceFieldBuilder = c -> mergedInferenceField; @@ -182,7 +182,7 @@ public Iterator iterator() { @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName(), fieldType().indexVersionCreated, fieldType().getChunksField().bitsetProducer()).init(this); + return new Builder(leafName(), fieldType().indexVersionCreated, fieldType().getChunksField().bitsetProducer()).init(this); } @Override @@ -221,7 +221,7 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio if (fieldType().getModelSettings() == null) { context.path().remove(); Builder builder = (Builder) new Builder( - simpleName(), + leafName(), fieldType().indexVersionCreated, fieldType().getChunksField().bitsetProducer() ).init(this); @@ -231,7 +231,7 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio .build(context.createDynamicMapperBuilderContext()); context.addDynamicMapper(mapper); } finally { - context.path().add(simpleName()); + context.path().add(leafName()); } } else { Conflicts conflicts = new Conflicts(fullFieldName); diff --git a/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapper.java b/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapper.java index 1eca747c8a3be..92c45c51f0516 100644 --- a/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapper.java +++ b/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapper.java @@ -588,7 +588,7 @@ protected boolean supportsParsingObject() { @Override protected void parseCreateField(DocumentParserContext context) throws IOException { - context.path().add(simpleName()); + context.path().add(leafName()); XContentParser.Token token; XContentSubParser subParser = null; EnumMap metricsParsed = new EnumMap<>(Metric.class); @@ -707,7 +707,7 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName(), ignoreMalformedByDefault, indexCreatedVersion, indexMode).metric(metricType).init(this); + return new Builder(leafName(), ignoreMalformedByDefault, indexCreatedVersion, indexMode).metric(metricType).init(this); } @Override @@ -718,9 +718,9 @@ protected SyntheticSourceMode syntheticSourceMode() { @Override public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() { return new CompositeSyntheticFieldLoader( - simpleName(), + leafName(), name(), - new AggregateMetricSyntheticFieldLoader(name(), simpleName(), metrics), + new AggregateMetricSyntheticFieldLoader(name(), leafName(), metrics), new CompositeSyntheticFieldLoader.MalformedValuesLayer(name()) ); } 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 d1866f9ac8475..dedbfe8275f19 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 @@ -74,7 +74,7 @@ private static ConstantKeywordFieldMapper toType(FieldMapper in) { @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName()).init(this); + return new Builder(leafName()).init(this); } public static class Builder extends FieldMapper.Builder { @@ -321,7 +321,7 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio if (fieldType().value == null) { ConstantKeywordFieldType newFieldType = new ConstantKeywordFieldType(fieldType().name(), value, fieldType().meta()); - Mapper update = new ConstantKeywordFieldMapper(simpleName(), newFieldType); + Mapper update = new ConstantKeywordFieldMapper(leafName(), newFieldType); boolean dynamicMapperAdded = context.addDynamicMapper(update); // the mapper is already part of the mapping, we're just updating it with the new value assert dynamicMapperAdded; @@ -374,7 +374,7 @@ public boolean hasValue() { @Override public void write(XContentBuilder b) throws IOException { if (fieldType().value != null) { - b.field(simpleName(), fieldType().value); + b.field(leafName(), fieldType().value); } } diff --git a/x-pack/plugin/mapper-counted-keyword/src/main/java/org/elasticsearch/xpack/countedkeyword/CountedKeywordFieldMapper.java b/x-pack/plugin/mapper-counted-keyword/src/main/java/org/elasticsearch/xpack/countedkeyword/CountedKeywordFieldMapper.java index 7bbd21e588e73..16c2eb3e6c51c 100644 --- a/x-pack/plugin/mapper-counted-keyword/src/main/java/org/elasticsearch/xpack/countedkeyword/CountedKeywordFieldMapper.java +++ b/x-pack/plugin/mapper-counted-keyword/src/main/java/org/elasticsearch/xpack/countedkeyword/CountedKeywordFieldMapper.java @@ -401,7 +401,7 @@ public Iterator iterator() { @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName()).init(this); + return new Builder(leafName()).init(this); } @Override diff --git a/x-pack/plugin/mapper-unsigned-long/src/main/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongFieldMapper.java b/x-pack/plugin/mapper-unsigned-long/src/main/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongFieldMapper.java index 74076c0c4a0ab..9da04ef3db114 100644 --- a/x-pack/plugin/mapper-unsigned-long/src/main/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongFieldMapper.java +++ b/x-pack/plugin/mapper-unsigned-long/src/main/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongFieldMapper.java @@ -679,7 +679,7 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName(), ignoreMalformedByDefault, indexMode).dimension(dimension).metric(metricType).init(this); + return new Builder(leafName(), ignoreMalformedByDefault, indexMode).dimension(dimension).metric(metricType).init(this); } /** @@ -777,7 +777,7 @@ public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() { "field [" + name() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to" ); } - return new SortedNumericDocValuesSyntheticFieldLoader(name(), simpleName(), ignoreMalformed()) { + return new SortedNumericDocValuesSyntheticFieldLoader(name(), leafName(), ignoreMalformed()) { @Override protected void writeValue(XContentBuilder b, long value) throws IOException { b.value(DocValueFormat.UNSIGNED_LONG_SHIFTED.format(value)); diff --git a/x-pack/plugin/mapper-version/src/main/java/org/elasticsearch/xpack/versionfield/VersionStringFieldMapper.java b/x-pack/plugin/mapper-version/src/main/java/org/elasticsearch/xpack/versionfield/VersionStringFieldMapper.java index 7229dac6daa7a..e1c600edab6fb 100644 --- a/x-pack/plugin/mapper-version/src/main/java/org/elasticsearch/xpack/versionfield/VersionStringFieldMapper.java +++ b/x-pack/plugin/mapper-version/src/main/java/org/elasticsearch/xpack/versionfield/VersionStringFieldMapper.java @@ -442,7 +442,7 @@ public String toString() { @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName()).init(this); + return new Builder(leafName()).init(this); } @Override @@ -457,7 +457,7 @@ public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() { "field [" + name() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to" ); } - return new SortedSetDocValuesSyntheticFieldLoader(name(), simpleName(), null, false) { + return new SortedSetDocValuesSyntheticFieldLoader(name(), leafName(), null, false) { @Override protected BytesRef convert(BytesRef value) { return VersionEncoder.decodeVersion(value); diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/GeoShapeWithDocValuesFieldMapper.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/GeoShapeWithDocValuesFieldMapper.java index 4d7997e656f48..158111bb98de8 100644 --- a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/GeoShapeWithDocValuesFieldMapper.java +++ b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/GeoShapeWithDocValuesFieldMapper.java @@ -458,7 +458,7 @@ protected String contentType() { @Override public FieldMapper.Builder getMergeBuilder() { return new Builder( - simpleName(), + leafName(), builder.version, builder.scriptCompiler, builder.ignoreMalformed.getDefaultValue().value(), diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java index ddd4ad68d8861..de49e0c5a5563 100644 --- a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java +++ b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java @@ -177,7 +177,7 @@ public PointFieldType fieldType() { @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName(), builder.ignoreMalformed.getDefaultValue().value()).init(this); + return new Builder(leafName(), builder.ignoreMalformed.getDefaultValue().value()).init(this); } public static class PointFieldType extends AbstractPointFieldType implements ShapeQueryable { diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/ShapeFieldMapper.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/ShapeFieldMapper.java index a28eb4374ff6a..4cc983592d0c1 100644 --- a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/ShapeFieldMapper.java +++ b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/ShapeFieldMapper.java @@ -237,7 +237,7 @@ protected String contentType() { @Override public FieldMapper.Builder getMergeBuilder() { return new Builder( - simpleName(), + leafName(), builder.version, builder.ignoreMalformed.getDefaultValue().value(), builder.coerce.getDefaultValue().value() diff --git a/x-pack/plugin/wildcard/src/main/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapper.java b/x-pack/plugin/wildcard/src/main/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapper.java index 46fde564385f1..8a895bb3627ce 100644 --- a/x-pack/plugin/wildcard/src/main/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapper.java +++ b/x-pack/plugin/wildcard/src/main/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapper.java @@ -988,7 +988,7 @@ protected String contentType() { @Override public FieldMapper.Builder getMergeBuilder() { - return new Builder(simpleName(), indexVersionCreated).init(this); + return new Builder(leafName(), indexVersionCreated).init(this); } @Override @@ -1053,10 +1053,10 @@ public void write(XContentBuilder b) throws IOException { case 0: return; case 1: - b.field(simpleName()); + b.field(leafName()); break; default: - b.startArray(simpleName()); + b.startArray(leafName()); } for (int i = 0; i < docValueCount; i++) { int length = docValuesStream.readVInt();