Skip to content

Avoid duplicate _type fields in v7 compat layer #83239

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

Merged
merged 2 commits into from
Jan 29, 2022
Merged

Avoid duplicate _type fields in v7 compat layer #83239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
382082e
Avoid duplicate _type fields in v7 compat layer
ywelsch Jan 28, 2022
c79dc61
Merge branch 'master' into fix-duplicate-type
elasticmachine Jan 28, 2022
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
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/search/SearchHit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ public XContentBuilder toInnerXContent(XContentBuilder builder, Params params) t
if (index != null) {
builder.field(Fields._INDEX, RemoteClusterAware.buildRemoteIndexName(clusterAlias, index));
}
if (builder.getRestApiVersion() == RestApiVersion.V_7) {
if (builder.getRestApiVersion() == RestApiVersion.V_7 && metaFields.containsKey(MapperService.TYPE_FIELD_NAME) == false) {
builder.field(MapperService.TYPE_FIELD_NAME, MapperService.SINGLE_MAPPING_NAME);
}
if (id != null) {
Expand Down
14 changes: 10 additions & 4 deletions ...pository-old-versions/src/test/java/org/elasticsearch/oldrepos/OldRepositoryAccessIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,14 @@ private void assertDocs(
boolean sourceOnlyRepository,
Version oldVersion
) throws IOException {
RequestOptions v7RequestOptions = RequestOptions.DEFAULT.toBuilder()
.addHeader("Content-Type", "application/vnd.elasticsearch+json;compatible-with=7")
.addHeader("Accept", "application/vnd.elasticsearch+json;compatible-with=7")
.build();
RequestOptions randomRequestOptions = randomBoolean() ? RequestOptions.DEFAULT : v7RequestOptions;

// run a search against the index
SearchResponse searchResponse = client.search(new SearchRequest(index), RequestOptions.DEFAULT);
SearchResponse searchResponse = client.search(new SearchRequest(index), randomRequestOptions);
logger.info(searchResponse);
// check hit count
assertEquals(numDocs, searchResponse.getHits().getTotalHits().value);
Expand All @@ -420,7 +426,7 @@ private void assertDocs(
.query(QueryBuilders.matchQuery("val", num))
.runtimeMappings(Map.of("val", Map.of("type", "long")))
),
RequestOptions.DEFAULT
randomRequestOptions
);
logger.info(searchResponse);
assertEquals(1, searchResponse.getHits().getTotalHits().value);
Expand All @@ -445,7 +451,7 @@ private void assertDocs(
.query(QueryBuilders.matchAllQuery())
.sort(SortBuilders.fieldSort("val").order(SortOrder.DESC))
),
RequestOptions.DEFAULT
randomRequestOptions
);
logger.info(searchResponse);
// check sort order
Expand All @@ -460,7 +466,7 @@ private void assertDocs(
long typeCount = expectedIds.stream().filter(idd -> getType(oldVersion, idd).equals(randomType)).count();
searchResponse = client.search(
new SearchRequest(index).source(SearchSourceBuilder.searchSource().query(QueryBuilders.termQuery("_type", randomType))),
RequestOptions.DEFAULT
randomRequestOptions
);
logger.info(searchResponse);
assertEquals(typeCount, searchResponse.getHits().getTotalHits().value);
Expand Down