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

better error message on nested sorting

This commit is contained in:
Shay Banon 2013-02-25 13:32:00 +01:00
parent 4bb4e49155
commit 6e3300efd3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/elasticsearch/search/sort/SortParseElement.java
View File

@ -146,11 +146,11 @@ public class SortParseElement implements SearchParseElement {
ignoreUnmapped = parser.booleanValue(); ignoreUnmapped = parser.booleanValue();
} else if ("sort_mode".equals(innerJsonName) || "sortMode".equals(innerJsonName)) { } else if ("sort_mode".equals(innerJsonName) || "sortMode".equals(innerJsonName)) {
sortMode = SortMode.fromString(parser.text()); sortMode = SortMode.fromString(parser.text());
} else if ("nested_path".equals(innerJsonName)) { } else if ("nested_path".equals(innerJsonName) || "nestedPath".equals(innerJsonName)) {
nestedPath = parser.text(); nestedPath = parser.text();
} }
} else if (token == XContentParser.Token.START_OBJECT) { } else if (token == XContentParser.Token.START_OBJECT) {
if ("nested_filter".equals(innerJsonName)) { if ("nested_filter".equals(innerJsonName) || "nestedFilter".equals(innerJsonName)) {
nestedFilter = context.queryParserService().parseInnerFilter(parser); nestedFilter = context.queryParserService().parseInnerFilter(parser);
} }
} }
@ -207,9 +207,12 @@ public class SortParseElement implements SearchParseElement {
if (nestedPath != null) { if (nestedPath != null) {
ObjectMappers objectMappers = context.mapperService().objectMapper(nestedPath); ObjectMappers objectMappers = context.mapperService().objectMapper(nestedPath);
if (objectMappers == null) { if (objectMappers == null) {
throw new ElasticSearchIllegalArgumentException("Invalid nested path"); throw new ElasticSearchIllegalArgumentException("failed to find nested object mapping for explicit nested path [" + nestedPath + "]");
} }
objectMapper = objectMappers.mapper(); objectMapper = objectMappers.mapper();
if (!objectMapper.nested().isNested()) {
throw new ElasticSearchIllegalArgumentException("mapping for explicit nested path is not mapped as nested: [" + nestedPath + "]");
}
} else { } else {
objectMapper = resolveClosestNestedObjectMapper(fieldName, context); objectMapper = resolveClosestNestedObjectMapper(fieldName, context);
} }