Bug no. 2 is fixed

elastic · Mar 12, 2015 · 99dcb3a · 99dcb3a
1 parent a19335c
commit 99dcb3a
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/...sticsearch/index/query/functionscore/fieldvaluefactor/FieldValueFactorFunctionParser.java b/...sticsearch/index/query/functionscore/fieldvaluefactor/FieldValueFactorFunctionParser.java
@@ -46,6 +46,8 @@
  *     }
  * </pre>
  */
+
+
 public class FieldValueFactorFunctionParser implements ScoreFunctionParser {
     public static String[] NAMES = { "field_value_factor", "fieldValueFactor" };
 
@@ -60,7 +62,15 @@ public ScoreFunction parse(QueryParseContext parseContext, XContentParser parser
         while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
             if (token == XContentParser.Token.FIELD_NAME) {
                 currentFieldName = parser.currentName();
-            } else if (token.isValue()) {
+            }
+             /*
+             Error here is thrown, as field_value_factor should not accept array params
+             Bug #2
+             */
+            else if(token == XContentParser.Token.START_ARRAY) {
+                throw new QueryParsingException(parseContext.index(), NAMES[0] + " query does not accept arrays");
+            }
+            else if (token.isValue()) {
                 if ("field".equals(currentFieldName)) {
                     field = parser.text();
                 } else if ("factor".equals(currentFieldName)) {
@@ -77,6 +87,7 @@ public ScoreFunction parse(QueryParseContext parseContext, XContentParser parser
             throw new QueryParsingException(parseContext.index(), "[" + NAMES[0] + "] required field 'field' missing");
         }
 
+
         SearchContext searchContext = SearchContext.current();
         FieldMapper mapper = searchContext.mapperService().smartNameFieldMapper(field);
         if (mapper == null) {