Merge branch 'master' into refactor_pluginservice

elastic · Jul 22, 2015 · 9453c41 · 9453c41
2 parents 3511a9c + 828d8c7
commit 9453c41
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/...c/main/java/org/elasticsearch/common/lucene/search/function/FieldValueFactorFunction.java b/...c/main/java/org/elasticsearch/common/lucene/search/function/FieldValueFactorFunction.java
@@ -161,9 +161,6 @@ public double apply(double n) {
 
         @Override
         public String toString() {
-            if (this == NONE) {
-                return "";
-            }
             return super.toString().toLowerCase(Locale.ROOT);
         }
     }

diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueTests.java b/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueTests.java
@@ -69,6 +69,14 @@ public void testFieldValueFactor() throws IOException {
                 .get();
         assertOrderedSearchHits(response, "2", "1");
 
+        // try again, but this time explicitly use the do-nothing modifier
+        response = client().prepareSearch("test")
+                .setExplain(randomBoolean())
+                .setQuery(functionScoreQuery(simpleQueryStringQuery("foo"),
+                        fieldValueFactorFunction("test").modifier(FieldValueFactorFunction.Modifier.NONE)))
+                .get();
+        assertOrderedSearchHits(response, "2", "1");
+
         // document 1 scores higher because 1/5 > 1/17
         response = client().prepareSearch("test")
                 .setExplain(randomBoolean())