Skip to content
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

Jump to bottom

Support 'include_type_name' in RestGetIndicesAction #37149

Merged
merged 11 commits into from
Jan 9, 2019
Merged

Support 'include_type_name' in RestGetIndicesAction #37149

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7b46b5f
Support 'include_type_name' in RestGetIndicesAction
Jan 3, 2019
4a07eed
iter
Jan 4, 2019
67670a8
Merge branch 'master' into types-deprecation-get-indices
Jan 7, 2019
e9f9f64
Use constant
Jan 7, 2019
e3988b7
iter
Jan 7, 2019
d169030
Remove parsing with types
Jan 7, 2019
296f2bc
change mapping toXContent
Jan 7, 2019
06cc067
Fix failing yaml test
Jan 7, 2019
9cb40f2
Revert changes in yaml tests
Jan 8, 2019
52ffb4b
iter
Jan 8, 2019
585ed20
Add Skipping types section to get-indices docs
Jan 9, 2019
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 rest-api-spec/src/main/resources/rest-api-spec/test/indices.get/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ setup:
- is_true: test_index.aliases
- is_true: test_index.settings
- is_true: test_index_2.settings
- is_false: test_index_2.mappings
- is_true: test_index_2.mappings
- is_true: test_index_2.aliases

---
Expand Down
27 changes: 16 additions & 11 deletions server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,17 +265,22 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
}
builder.endObject();
} else {
MappingMetaData mappings = null;
for (final ObjectObjectCursor<String, MappingMetaData> typeEntry : indexMappings) {
if (typeEntry.key.equals(MapperService.DEFAULT_MAPPING) == false) {
assert mappings == null;
mappings = typeEntry.value;
}
if (mappings == null) {
// no mappings yet
builder.startObject("mappings").endObject();
} else {
builder.field("mappings", mappings.sourceAsMap());
if (indexMappings.size() == 0) {
// special case where there are no index mappings at all, we still want to output an empty object
builder.startObject("mappings").endObject();
} else {
MappingMetaData mappings = null;
for (final ObjectObjectCursor<String, MappingMetaData> typeEntry : indexMappings) {
if (typeEntry.key.equals(MapperService.DEFAULT_MAPPING) == false) {
assert mappings == null;
mappings = typeEntry.value;
}
if (mappings == null) {
cbuescher marked this conversation as resolved.
Show resolved Hide resolved
// no mappings yet
builder.startObject("mappings").endObject();
} else {
builder.field("mappings", mappings.sourceAsMap());
}
}
}
}
Expand Down
6 changes: 1 addition & 5 deletions server/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexResponseTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,6 @@ protected GetIndexResponse createBlankInstance() {

@Override
protected GetIndexResponse createTestInstance() {
return createTestInstance(false);
}

private GetIndexResponse createTestInstance(boolean randomTypeName) {
String[] indices = generateRandomStringArray(5, 5, false, false);
ImmutableOpenMap.Builder<String, ImmutableOpenMap<String, MappingMetaData>> mappings = ImmutableOpenMap.builder();
ImmutableOpenMap.Builder<String, List<AliasMetaData>> aliases = ImmutableOpenMap.builder();
Expand All @@ -86,7 +82,7 @@ private GetIndexResponse createTestInstance(boolean randomTypeName) {
for (String index: indices) {
// rarely have no types
int typeCount = rarely() ? 0 : 1;
mappings.put(index, GetMappingsResponseTests.createMappingsForIndex(typeCount, randomTypeName));
mappings.put(index, GetMappingsResponseTests.createMappingsForIndex(typeCount, false));

List<AliasMetaData> aliasMetaDataList = new ArrayList<>();
int aliasesNum = randomIntBetween(0, 3);
Expand Down