Skip to content

Fix effective_mapping field to remove _doc wrapper in data stream API responses #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
augment-app-staging wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −15
Open

Fix effective_mapping field to remove _doc wrapper in data stream API responses #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions ...ms/src/yamlRestTest/resources/rest-api-spec/test/data_stream/250_data_stream_mappings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ setup:
name: my-data-stream-1
- match: { data_streams.0.name: my-data-stream-1 }
- match: { data_streams.0.mappings: {} }
- length: { data_streams.0.effective_mappings._doc.properties: 2 }
- length: { data_streams.0.effective_mappings.properties: 2 }

- do:
indices.get_data_stream:
Expand All @@ -56,7 +56,7 @@ setup:
- match: { data_streams.0.name: my-data-stream-1 }
- match: { data_streams.0.applied_to_data_stream: true }
- match: { data_streams.0.mappings.properties.name.type: "keyword" }
- match: { data_streams.0.effective_mappings._doc.properties.name.type: "keyword" }
- match: { data_streams.0.effective_mappings.properties.name.type: "keyword" }

- do:
indices.rollover:
Expand All @@ -71,9 +71,9 @@ setup:
indices.get_data_stream_mappings:
name: my-data-stream-1
- match: { data_streams.0.name: my-data-stream-1 }
- length: { data_streams.0.effective_mappings._doc.properties: 3 }
- length: { data_streams.0.effective_mappings.properties: 3 }
- match: { data_streams.0.mappings.properties.name.type: "keyword" }
- match: { data_streams.0.effective_mappings._doc.properties.name.type: "keyword" }
- match: { data_streams.0.effective_mappings.properties.name.type: "keyword" }

- do:
indices.get_data_stream:
Expand Down Expand Up @@ -149,9 +149,9 @@ setup:
- match: { data_streams.0.mappings.properties.field1.type: "text" }
- match: { data_streams.0.mappings.properties.field2: null }
- match: { data_streams.0.mappings.properties.field3.type: "text" }
- match: { data_streams.0.effective_mappings._doc.properties.field1.type: "text" }
- match: { data_streams.0.effective_mappings._doc.properties.field2.type: "keyword" }
- match: { data_streams.0.effective_mappings._doc.properties.field3.type: "text" }
- match: { data_streams.0.effective_mappings.properties.field1.type: "text" }
- match: { data_streams.0.effective_mappings.properties.field2.type: "keyword" }
- match: { data_streams.0.effective_mappings.properties.field3.type: "text" }

- do:
cluster.put_component_template:
Expand Down Expand Up @@ -180,10 +180,10 @@ setup:
indices.get_data_stream_mappings:
name: my-component-only-data-stream-1
- match: { data_streams.0.name: my-component-only-data-stream-1 }
- length: { data_streams.0.effective_mappings._doc.properties: 5 }
- length: { data_streams.0.effective_mappings.properties: 5 }
- match: { data_streams.0.mappings.properties.field1.type: "text" }
- match: { data_streams.0.effective_mappings._doc.properties.field3.type: "text" }
- match: { data_streams.0.effective_mappings._doc.properties.field4.type: "keyword" }
- match: { data_streams.0.effective_mappings.properties.field3.type: "text" }
- match: { data_streams.0.effective_mappings.properties.field4.type: "keyword" }

- do:
indices.get_data_stream:
Expand Down Expand Up @@ -212,7 +212,7 @@ setup:
- match: { data_streams.0.name: my-component-only-data-stream-1 }
- match: { data_streams.0.applied_to_data_stream: true }
- match: { data_streams.0.mappings null }
- match: { data_streams.0.effective_mappings._doc.properties.field1.type: "keyword" }
- match: { data_streams.0.effective_mappings._doc.properties.field2.type: "keyword" }
- match: { data_streams.0.effective_mappings._doc.properties.field3: null }
- match: { data_streams.0.effective_mappings._doc.properties.field4.type: "keyword" }
- match: { data_streams.0.effective_mappings.properties.field1.type: "keyword" }
- match: { data_streams.0.effective_mappings.properties.field2.type: "keyword" }
- match: { data_streams.0.effective_mappings.properties.field3: null }
- match: { data_streams.0.effective_mappings.properties.field4.type: "keyword" }
11 changes: 10 additions & 1 deletion server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ public static CompressedXContent getEffectiveMappings(
xContentRegistry,
writeIndex.getName()
);
return indicesService.withTempIndexService(projectMetadata.index(writeIndex), indexService -> {
CompressedXContent mergedMapping = indicesService.withTempIndexService(projectMetadata.index(writeIndex), indexService -> {
MapperService mapperService = indexService.mapperService();
DocumentMapper documentMapper = mapperService.merge(
MapperService.SINGLE_MAPPING_NAME,
Expand All @@ -508,6 +508,15 @@ public static CompressedXContent getEffectiveMappings(
);
return documentMapper.mappingSource();
});

// Strip the _doc wrapper from the merged mapping to match the API specification
Map<String, Object> mergedMappingMap = XContentHelper.convertToMap(mergedMapping.uncompressed(), true, XContentType.JSON).v2();
if (mergedMappingMap.containsKey(MapperService.SINGLE_MAPPING_NAME)) {
mergedMapping = ComposableIndexTemplate.convertMappingMapToXContent(
(Map<String, ?>) mergedMappingMap.get(MapperService.SINGLE_MAPPING_NAME)
);
}
return mergedMapping;
}

private ComposableIndexTemplate getMatchingIndexTemplate(ProjectMetadata projectMetadata) {
Expand Down