honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Get Mapping API: when asking for a mapping of a single index and single type, don't wrap the mapping with the index name, closes #838.

This commit is contained in:
kimchy 2011-04-06 22:12:34 +03:00
parent 8c50a65699
commit 08f594c3a0
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/get/RestGetMappingAction.java
View File

@ -72,9 +72,8 @@ public class RestGetMappingAction extends BaseRestHandler {
XContentBuilder builder = RestXContentBuilder.restContentBuilder(request);
builder.startObject();
for (IndexMetaData indexMetaData : metaData) {
builder.startObject(indexMetaData.index());
if (indices.length == 1 && types.size() == 1) {
IndexMetaData indexMetaData = metaData.iterator().next();
for (MappingMetaData mappingMd : indexMetaData.mappings().values()) {
if (!types.isEmpty() && !types.contains(mappingMd.type())) {
// filter this type out...
@ -90,8 +89,28 @@ public class RestGetMappingAction extends BaseRestHandler {
builder.field(mappingMd.type());
builder.map(mapping);
}
} else {
for (IndexMetaData indexMetaData : metaData) {
builder.startObject(indexMetaData.index());
builder.endObject();
for (MappingMetaData mappingMd : indexMetaData.mappings().values()) {
if (!types.isEmpty() && !types.contains(mappingMd.type())) {
// filter this type out...
continue;
}
byte[] mappingSource = mappingMd.source().uncompressed();
XContentParser parser = XContentFactory.xContent(mappingSource).createParser(mappingSource);
Map<String, Object> mapping = parser.map();
if (mapping.size() == 1 && mapping.containsKey(mappingMd.type())) {
// the type name is the root value, reduce it
mapping = (Map<String, Object>) mapping.get(mappingMd.type());
}
builder.field(mappingMd.type());
builder.map(mapping);
}
builder.endObject();
}
}
builder.endObject();