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

Made `_source` parsing in `top_hits` aggregation consistent with regular `_source` parsing in search api. 

Closes #6997
This commit is contained in:
Martijn van Groningen 2014-07-23 23:34:32 +02:00
parent 8cb4471cca
commit 73f7f426de
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsParser.java
View File

@ -70,6 +70,10 @@ public class TopHitsParser implements Aggregator.Parser {
while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
if (token == XContentParser.Token.FIELD_NAME) {
currentFieldName = parser.currentName();
} else if ("sort".equals(currentFieldName)) {
sortParseElement.parse(parser, topHitsContext);
} else if ("_source".equals(currentFieldName)) {
sourceParseElement.parse(parser, topHitsContext);
} else if (token.isValue()) {
switch (currentFieldName) {
case "from":
@ -78,9 +82,6 @@ public class TopHitsParser implements Aggregator.Parser {
case "size":
topHitsContext.size(parser.intValue());
break;
case "sort":
sortParseElement.parse(parser, topHitsContext);
break;
case "track_scores":
case "trackScores":
topHitsContext.trackScores(parser.booleanValue());
@ -96,12 +97,6 @@ public class TopHitsParser implements Aggregator.Parser {
}
} else if (token == XContentParser.Token.START_OBJECT) {
switch (currentFieldName) {
case "sort":
sortParseElement.parse(parser, topHitsContext);
break;
case "_source":
sourceParseElement.parse(parser, topHitsContext);
break;
case "highlight":
highlighterParseElement.parse(parser, topHitsContext);
break;
@ -114,9 +109,6 @@ public class TopHitsParser implements Aggregator.Parser {
}
} else if (token == XContentParser.Token.START_ARRAY) {
switch (currentFieldName) {
case "sort":
sortParseElement.parse(parser, topHitsContext);
break;
case "fielddataFields":
case "fielddata_fields":
fieldDataFieldsParseElement.parse(parser, topHitsContext);