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

support also mode in search sorting, and fail on illegal parameters

This commit is contained in:
Shay Banon 2013-03-12 15:16:25 -07:00
parent 55ceb01c44
commit 5ed9fb2c54
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,6 +122,8 @@ public class SortParseElement implements SearchParseElement {
reverse = SCORE_FIELD_NAME.equals(fieldName); reverse = SCORE_FIELD_NAME.equals(fieldName);
} else if (direction.equals("desc")) { } else if (direction.equals("desc")) {
reverse = !SCORE_FIELD_NAME.equals(fieldName); reverse = !SCORE_FIELD_NAME.equals(fieldName);
} else {
throw new ElasticSearchIllegalArgumentException("sort direction [" + fieldName + "] not supported");
} }
addSortField(context, sortFields, fieldName, reverse, ignoreUnmapped, missing, sortMode, nestedPath, nestedFilter); addSortField(context, sortFields, fieldName, reverse, ignoreUnmapped, missing, sortMode, nestedPath, nestedFilter);
} else { } else {
@ -144,14 +146,18 @@ public class SortParseElement implements SearchParseElement {
missing = parser.textOrNull(); missing = parser.textOrNull();
} else if ("ignore_unmapped".equals(innerJsonName) || "ignoreUnmapped".equals(innerJsonName)) { } else if ("ignore_unmapped".equals(innerJsonName) || "ignoreUnmapped".equals(innerJsonName)) {
ignoreUnmapped = parser.booleanValue(); ignoreUnmapped = parser.booleanValue();
} else if ("sort_mode".equals(innerJsonName) || "sortMode".equals(innerJsonName)) { } else if ("sort_mode".equals(innerJsonName) || "sortMode".equals(innerJsonName) || "mode".equals(innerJsonName)) {
sortMode = SortMode.fromString(parser.text()); sortMode = SortMode.fromString(parser.text());
} else if ("nested_path".equals(innerJsonName) || "nestedPath".equals(innerJsonName)) { } else if ("nested_path".equals(innerJsonName) || "nestedPath".equals(innerJsonName)) {
nestedPath = parser.text(); nestedPath = parser.text();
} else {
throw new ElasticSearchIllegalArgumentException("sort option [" + innerJsonName + "] not supported");
} }
} else if (token == XContentParser.Token.START_OBJECT) { } else if (token == XContentParser.Token.START_OBJECT) {
if ("nested_filter".equals(innerJsonName) || "nestedFilter".equals(innerJsonName)) { if ("nested_filter".equals(innerJsonName) || "nestedFilter".equals(innerJsonName)) {
nestedFilter = context.queryParserService().parseInnerFilter(parser); nestedFilter = context.queryParserService().parseInnerFilter(parser);
} else {
throw new ElasticSearchIllegalArgumentException("sort option [" + innerJsonName + "] not supported");
} }
} }
} }