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

rest _count endpoint to also allow for no query provided (defaults to match_all)

This commit is contained in:
Shay Banon 2011-10-14 17:53:27 +02:00
parent a76737ceaf
commit 6b497589ce
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/count/RestCountAction.java
View File

@ -76,7 +76,10 @@ public class RestCountAction extends BaseRestHandler {
if (source != null) { if (source != null) {
countRequest.query(source); countRequest.query(source);
} else { } else {
countRequest.query(RestActions.parseQuerySource(request)); byte[] querySource = RestActions.parseQuerySource(request);
if (querySource != null) {
countRequest.query(querySource);
}
} }
} }
countRequest.queryHint(request.param("query_hint")); countRequest.queryHint(request.param("query_hint"));

2
modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/support/RestActions.java
View File

@ -72,7 +72,7 @@ public class RestActions {
public static byte[] parseQuerySource(RestRequest request) { public static byte[] parseQuerySource(RestRequest request) {
String queryString = request.param("q"); String queryString = request.param("q");
if (queryString == null) { if (queryString == null) {
throw new ElasticSearchIllegalArgumentException("No query to execute, not in body, and not bounded to 'q' parameter"); return null;
} }
QueryStringQueryBuilder queryBuilder = QueryBuilders.queryString(queryString); QueryStringQueryBuilder queryBuilder = QueryBuilders.queryString(queryString);
queryBuilder.defaultField(request.param("df")); queryBuilder.defaultField(request.param("df"));