Match query should fail when trying to provide several fields in its …

…simplified form fixes elastic#2432
mute · Nov 22, 2012 · f6067e6 · f6067e6
1 parent 7e2ebe3
commit f6067e6
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/org/elasticsearch/index/query/MatchQueryParser.java b/src/main/java/org/elasticsearch/index/query/MatchQueryParser.java
@@ -131,7 +131,7 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
                         } else if ("all".equalsIgnoreCase(zeroTermsDocs)) {
                             matchQuery.setZeroTermsQuery(MatchQuery.ZeroTermsQuery.ALL);
                         } else {
-                            throw new QueryParsingException(parseContext.index(), "Unsupported zero_terms_docs value [" + zeroTermsDocs +"]");
+                            throw new QueryParsingException(parseContext.index(), "Unsupported zero_terms_docs value [" + zeroTermsDocs + "]");
                         }
                     } else {
                         throw new QueryParsingException(parseContext.index(), "[match] query does not support [" + currentFieldName + "]");
@@ -142,7 +142,10 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
         } else {
             text = parser.text();
             // move to the next token
-            parser.nextToken();
+            token = parser.nextToken();
+            if (token != XContentParser.Token.END_OBJECT) {
+                throw new QueryParsingException(parseContext.index(), "[match] query parsed in simplified form, with direct field name, but included more options than just the field name, possibly use its 'options' form, with 'query' element?");
+            }
         }
 
         if (text == null) {