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

negative from parameter yields undescriptive error message, closes #1293.

This commit is contained in:
Shay Banon 2011-09-01 19:25:04 +03:00
parent 87049d0d29
commit b888684ff6
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/elasticsearch/src/main/java/org/elasticsearch/search/query/FromParseElement.java
View File

@ -21,6 +21,7 @@ package org.elasticsearch.search.query;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.search.SearchParseElement; import org.elasticsearch.search.SearchParseElement;
import org.elasticsearch.search.SearchParseException;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
/** /**
@ -31,7 +32,11 @@ public class FromParseElement implements SearchParseElement {
@Override public void parse(XContentParser parser, SearchContext context) throws Exception { @Override public void parse(XContentParser parser, SearchContext context) throws Exception {
XContentParser.Token token = parser.currentToken(); XContentParser.Token token = parser.currentToken();
if (token.isValue()) { if (token.isValue()) {
context.from(parser.intValue()); int from = parser.intValue();
if (from < 0) {
throw new SearchParseException(context, "from is set to [" + from + "] and is expected to be higher or equal to 0");
}
context.from(from);
} }
} }
} }

7
modules/elasticsearch/src/main/java/org/elasticsearch/search/query/SizeParseElement.java
View File

@ -21,6 +21,7 @@ package org.elasticsearch.search.query;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.search.SearchParseElement; import org.elasticsearch.search.SearchParseElement;
import org.elasticsearch.search.SearchParseException;
import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SearchContext;
/** /**
@ -31,7 +32,11 @@ public class SizeParseElement implements SearchParseElement {
@Override public void parse(XContentParser parser, SearchContext context) throws Exception { @Override public void parse(XContentParser parser, SearchContext context) throws Exception {
XContentParser.Token token = parser.currentToken(); XContentParser.Token token = parser.currentToken();
if (token.isValue()) { if (token.isValue()) {
context.size(parser.intValue()); int size = parser.intValue();
if (size < 0) {
throw new SearchParseException(context, "size is set to [" + size + "] and is expected to be higher or equal to 0");
}
context.size(size);
} }
} }
} }