honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 10:25:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use XContentParser.isBooleanValue to detect all boolean values for the _source parameter for both _mget and _search

Browse Source 
Closes #3981
This commit is contained in:
Boaz Leskes 2013-10-26 22:19:05 +02:00
parent 0f8149dca4
commit 68de46ff05
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/elasticsearch/action/get/MultiGetRequest.java
View File

@ -322,10 +322,12 @@ public class MultiGetRequest extends ActionRequest<MultiGetRequest> {
} else if ("_version_type".equals(currentFieldName) || "_versionType".equals(currentFieldName) || "version_type".equals(currentFieldName) || "versionType".equals(currentFieldName)) { } else if ("_version_type".equals(currentFieldName) || "_versionType".equals(currentFieldName) || "version_type".equals(currentFieldName) || "versionType".equals(currentFieldName)) {
versionType = VersionType.fromString(parser.text()); versionType = VersionType.fromString(parser.text());
} else if ("_source".equals(currentFieldName)) { } else if ("_source".equals(currentFieldName)) {
if (token == XContentParser.Token.VALUE_BOOLEAN) { if (parser.isBooleanValue()) {
fetchSourceContext = new FetchSourceContext(parser.booleanValue()); fetchSourceContext = new FetchSourceContext(parser.booleanValue());
} else if (token == XContentParser.Token.VALUE_STRING) { } else if (token == XContentParser.Token.VALUE_STRING) {
fetchSourceContext = new FetchSourceContext(new String[]{parser.text()}); fetchSourceContext = new FetchSourceContext(new String[]{parser.text()});
} else {
throw new ElasticSearchParseException("illegal type for _source: [" + token + "]");
} }
} }
} else if (token == XContentParser.Token.START_ARRAY) { } else if (token == XContentParser.Token.START_ARRAY) {

2
src/main/java/org/elasticsearch/search/fetch/source/FetchSourceParseElement.java
View File

@ -48,7 +48,7 @@ public class FetchSourceParseElement implements SearchParseElement {
List<String> includes = null, excludes = null; List<String> includes = null, excludes = null;
String currentFieldName = null; String currentFieldName = null;
token = parser.currentToken(); // we get it on the value token = parser.currentToken(); // we get it on the value
if (token == XContentParser.Token.VALUE_BOOLEAN) { if (parser.isBooleanValue()) {
context.fetchSourceContext(new FetchSourceContext(parser.booleanValue())); context.fetchSourceContext(new FetchSourceContext(parser.booleanValue()));
return; return;
} else if (token == XContentParser.Token.VALUE_STRING) { } else if (token == XContentParser.Token.VALUE_STRING) {