IndexTemplateMetaData should only store a single mapping #50753
Conversation
romseygeek
added
:Search Foundations/Mapping
|
Pinging @elastic/es-search (:Search/Mapping) |
|
Pinging @elastic/es-core-features (:Core/Features/Indices APIs) |
There was a problem hiding this comment.
Thanks @romseygeek, for now I would like to clarify some things
| private final ImmutableOpenMap<String, CompressedXContent> mappings; | ||
|
|
||
| private final ImmutableOpenMap<String, AliasMetaData> aliases; | ||
|
|
||
| public IndexTemplateMetaData(String name, int order, Integer version, | ||
| List<String> patterns, Settings settings, | ||
| ImmutableOpenMap<String, CompressedXContent> mappings, | ||
| CompressedXContent mappings, |
There was a problem hiding this comment.
It is not very clear if we expect CompressedXContent mappings to contain the type or not? From line 98, it looks like it should not contain type, but then how IndexTemplateMetaData is built fromXContent and builder it looks like mappings already contain a type?
Or we can expect both cases?
| @@ -281,13 +302,13 @@ public Builder settings(Settings settings) { | |||
| return this; | |||
| } | |||
|
|
|||
| public Builder putMapping(String mappingType, CompressedXContent mappingSource) { | |||
| mappings.put(mappingType, mappingSource); | |||
| public Builder setMapping(CompressedXContent mappingSource) { | |||
There was a problem hiding this comment.
here it is not very clear if we expect mappingSource to contain a type or not. I saw examples of both
| Map<String, Object> mappingSource = | ||
| MapBuilder.<String, Object>newMapBuilder().put(mappingType, parser.mapOrdered()).map(); | ||
| builder.putMapping(mappingType, Strings.toString(XContentFactory.jsonBuilder().map(mappingSource))); | ||
| builder.setMapping(Strings.toString(XContentFactory.jsonBuilder().map(mappingSource))); |
There was a problem hiding this comment.
here looks like setMapping expects mapping with a type
| @@ -94,7 +95,8 @@ public IndexTemplateMetaData(String name, int order, Integer version, | |||
| this.version = version; | |||
| this.patterns = patterns; | |||
| this.settings = settings; | |||
| this.mappings = mappings; | |||
| this.mappings = ImmutableOpenMap.<String, CompressedXContent>builder() | |||
| .fPut(MapperService.SINGLE_MAPPING_NAME, mappings).build(); | |||
There was a problem hiding this comment.
it is not very clear, why we can't have mappings just as CompressedXContent and have this.mappings = mappings?
|
I've opened #52961 as a replacement here, which just changes the method signature of |
Index templates can only store a single mapping, but
getMappings()returns a mapof mapping type to mappings. This commit changes the signature of
getMappings()tojust return the mappings.
In addition, index templates stored in the cluster state will now always convert their type
to
_doc, and templates added viaPutIndexTemplateRequestwill also convert theirtype.