match_all filter with empty array (instead of obj) fires exception wh…

…en used with facets fixes elastic#2493
mute · Dec 26, 2012 · dc2cd0d · dc2cd0d
1 parent be09391
commit dc2cd0d
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 2 deletions.
diff --git a/src/main/java/org/elasticsearch/index/query/MatchAllFilterParser.java b/src/main/java/org/elasticsearch/index/query/MatchAllFilterParser.java
@@ -48,7 +48,7 @@ public Filter parse(QueryParseContext parseContext) throws IOException, QueryPar
         XContentParser parser = parseContext.parser();
 
         XContentParser.Token token;
-        while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
+        while (((token = parser.nextToken()) != XContentParser.Token.END_OBJECT && token != XContentParser.Token.END_ARRAY)) {
         }
 
         return Queries.MATCH_ALL_FILTER;

diff --git a/src/main/java/org/elasticsearch/index/query/MatchAllQueryParser.java b/src/main/java/org/elasticsearch/index/query/MatchAllQueryParser.java
@@ -53,7 +53,7 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
         String currentFieldName = null;
 
         XContentParser.Token token;
-        while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
+        while (((token = parser.nextToken()) != XContentParser.Token.END_OBJECT && token != XContentParser.Token.END_ARRAY)) {
             if (token == XContentParser.Token.FIELD_NAME) {
                 currentFieldName = parser.currentName();
             } else if (token.isValue()) {

diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/SimpleIndexQueryParserTests.java b/src/test/java/org/elasticsearch/test/unit/index/query/SimpleIndexQueryParserTests.java
@@ -246,6 +246,22 @@ public void testMatchAll() throws Exception {
         assertThat((double) matchAllDocsQuery.getBoost(), closeTo(1.2, 0.01));
     }
 
+    @Test
+    public void testMatchAllEmpty1() throws Exception {
+        IndexQueryParserService queryParser = queryParser();
+        String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/match_all_empty1.json");
+        Query parsedQuery = queryParser.parse(query).query();
+        assertThat(parsedQuery, sameInstance(Queries.MATCH_ALL_QUERY));
+    }
+
+    @Test
+    public void testMatchAllEmpty2() throws Exception {
+        IndexQueryParserService queryParser = queryParser();
+        String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/match_all_empty2.json");
+        Query parsedQuery = queryParser.parse(query).query();
+        assertThat(parsedQuery, sameInstance(Queries.MATCH_ALL_QUERY));
+    }
+
     @Test
     public void testStarColonStar() throws Exception {
         IndexQueryParserService queryParser = queryParser();

diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/match_all_empty1.json b/src/test/java/org/elasticsearch/test/unit/index/query/match_all_empty1.json
@@ -0,0 +1,3 @@
+{
+    "match_all": {}
+}
diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/match_all_empty2.json b/src/test/java/org/elasticsearch/test/unit/index/query/match_all_empty2.json
@@ -0,0 +1,3 @@
+{
+    "match_all": []
+}