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

fix wrong handling of size and from when passed as request parameters

Browse Source
This commit is contained in:
kimchy 2010-03-20 23:44:24 +02:00
parent de69f5f0fd
commit 2ae6de2433
1 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java
View File

@ -43,11 +43,10 @@ import static org.elasticsearch.rest.RestRequest.Method.*;
import static org.elasticsearch.rest.RestResponse.Status.*;
import static org.elasticsearch.rest.action.support.RestActions.*;
import static org.elasticsearch.rest.action.support.RestJsonBuilder.*;
import static org.elasticsearch.search.builder.SearchSourceBuilder.*;
import static org.elasticsearch.util.TimeValue.*;
/**
* @author kimchy (Shay Banon)
* @author kimchy (shay.banon)
*/
public class RestSearchAction extends BaseRestHandler {
@ -125,22 +124,6 @@ public class RestSearchAction extends BaseRestHandler {
searchRequest.searchType(parseSearchType(request.param("searchType")));
SearchSourceBuilder extraSourceBuilder = null;
int from = request.paramAsInt("from", -1);
if (from != -1) {
if (extraSourceBuilder == null) {
extraSourceBuilder = searchSource();
}
extraSourceBuilder.from(from);
}
int size = request.paramAsInt("size", -1);
if (size != -1) {
if (extraSourceBuilder == null) {
extraSourceBuilder = searchSource();
}
extraSourceBuilder.size(size);
}
String scroll = request.param("scroll");
if (scroll != null) {
searchRequest.scroll(new Scroll(parseTimeValue(scroll, null)));
@ -155,10 +138,6 @@ public class RestSearchAction extends BaseRestHandler {
searchRequest.queryHint(request.param("queryHint"));
if (extraSourceBuilder != null) {
searchRequest.extraSource(extraSourceBuilder);
}
return searchRequest;
}
@ -181,7 +160,15 @@ public class RestSearchAction extends BaseRestHandler {
}
searchSourceBuilder.query(queryBuilder);
}
// TODO add different parameters to the query
int from = request.paramAsInt("from", -1);
if (from != -1) {
searchSourceBuilder.from(from);
}
int size = request.paramAsInt("size", -1);
if (size != -1) {
searchSourceBuilder.size(size);
}
searchSourceBuilder.queryParserName(request.param("queryParserName"));