function score test cleanup
- also, properly report on the failed assertion in toFloat - use function score in the explain compared to custom score - use the Tests suffix convention
This commit is contained in:
parent
9d28002077
commit
534299a27c
|
@ -168,15 +168,15 @@ public class FiltersFunctionScoreQuery extends Query {
|
|||
if (factor > maxBoost) {
|
||||
factor = maxBoost;
|
||||
}
|
||||
float sc = toFloat(getBoost() * factor);
|
||||
Explanation filterExplanation = new ComplexExplanation(true, sc, "custom score, product of:");
|
||||
float sc = FunctionScoreQuery.toFloat(getBoost() * factor);
|
||||
Explanation filterExplanation = new ComplexExplanation(true, sc, "function score, product of:");
|
||||
filterExplanation.addDetail(new Explanation(1.0f, "match filter: " + filterFunction.filter.toString()));
|
||||
filterExplanation.addDetail(functionExplanation);
|
||||
filterExplanation.addDetail(new Explanation(getBoost(), "queryBoost"));
|
||||
|
||||
// top level score = subquery.score * filter.score (this already has the query boost)
|
||||
float topLevelScore = subQueryExpl.getValue() * sc;
|
||||
Explanation topLevel = new ComplexExplanation(true, topLevelScore, "custom score, score mode [" + scoreMode.toString().toLowerCase(Locale.ROOT) + "]");
|
||||
Explanation topLevel = new ComplexExplanation(true, topLevelScore, "function score, score mode [" + scoreMode.toString().toLowerCase(Locale.ROOT) + "]");
|
||||
topLevel.addDetail(subQueryExpl);
|
||||
topLevel.addDetail(filterExplanation);
|
||||
return topLevel;
|
||||
|
@ -200,7 +200,7 @@ public class FiltersFunctionScoreQuery extends Query {
|
|||
multiply *= factor;
|
||||
max = Math.max(factor, max);
|
||||
min = Math.min(factor, min);
|
||||
Explanation res = new ComplexExplanation(true, toFloat(factor), "custom score, product of:");
|
||||
Explanation res = new ComplexExplanation(true, FunctionScoreQuery.toFloat(factor), "function score, product of:");
|
||||
res.addDetail(new Explanation(1.0f, "match filter: " + filterFunction.filter.toString()));
|
||||
res.addDetail(functionExplanation);
|
||||
res.addDetail(new Explanation(getBoost(), "queryBoost"));
|
||||
|
@ -230,8 +230,8 @@ public class FiltersFunctionScoreQuery extends Query {
|
|||
if (factor > maxBoost) {
|
||||
factor = maxBoost;
|
||||
}
|
||||
float sc = toFloat(factor * subQueryExpl.getValue() * getBoost());
|
||||
Explanation res = new ComplexExplanation(true, sc, "custom score, score mode [" + scoreMode.toString().toLowerCase(Locale.ROOT) + "]");
|
||||
float sc = FunctionScoreQuery.toFloat(factor * subQueryExpl.getValue() * getBoost());
|
||||
Explanation res = new ComplexExplanation(true, sc, "function score, score mode [" + scoreMode.toString().toLowerCase(Locale.ROOT) + "]");
|
||||
res.addDetail(subQueryExpl);
|
||||
for (Explanation explanation : filtersExplanations) {
|
||||
res.addDetail(explanation);
|
||||
|
@ -341,7 +341,7 @@ public class FiltersFunctionScoreQuery extends Query {
|
|||
factor = maxBoost;
|
||||
}
|
||||
float score = scorer.score();
|
||||
return toFloat(subQueryBoost * score * factor);
|
||||
return FunctionScoreQuery.toFloat(subQueryBoost * score * factor);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -381,10 +381,5 @@ public class FiltersFunctionScoreQuery extends Query {
|
|||
public int hashCode() {
|
||||
return subQuery.hashCode() + 31 * Arrays.hashCode(filterFunctions) ^ Float.floatToIntBits(getBoost());
|
||||
}
|
||||
|
||||
public static float toFloat(double input) {
|
||||
assert Double.compare(((float) input), input) == 0 || (Math.abs(((float) input) - input) <= 0.001);
|
||||
return (float) input;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -125,7 +125,7 @@ public class FunctionScoreQuery extends Query {
|
|||
function.setNextReader(context);
|
||||
Explanation functionExplanation = function.explainScore(doc, subQueryExpl);
|
||||
float sc = getBoost() * functionExplanation.getValue();
|
||||
Explanation res = new ComplexExplanation(true, sc, "custom score, product of:");
|
||||
Explanation res = new ComplexExplanation(true, sc, "function score, product of:");
|
||||
res.addDetail(functionExplanation);
|
||||
res.addDetail(new Explanation(getBoost(), "queryBoost"));
|
||||
return res;
|
||||
|
@ -200,7 +200,7 @@ public class FunctionScoreQuery extends Query {
|
|||
}
|
||||
|
||||
public static float toFloat(double input) {
|
||||
assert Double.compare(((float) input), input) == 0 || (Math.abs(((float) input) - input) <= 0.001);
|
||||
assert Double.compare(((float) input), input) == 0 || (Math.abs(((float) input) - input) <= 0.001) : "input " + input + " out of float scope for function score";
|
||||
return (float) input;
|
||||
}
|
||||
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
package org.elasticsearch.test.integration.search.customscore;
|
||||
|
||||
|
||||
|
||||
import org.apache.lucene.search.Explanation;
|
||||
import org.elasticsearch.ElasticSearchException;
|
||||
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
|
||||
|
@ -85,7 +84,7 @@ public class CustomScoreSearchTests extends AbstractSharedClusterTest {
|
|||
assertNotNull(explanation);
|
||||
assertThat(explanation.isMatch(), equalTo(true));
|
||||
assertThat(explanation.getValue(), equalTo(3f));
|
||||
assertThat(explanation.getDescription(), equalTo("custom score, score mode [first]"));
|
||||
assertThat(explanation.getDescription(), equalTo("function score, score mode [first]"));
|
||||
|
||||
assertThat(explanation.getDetails().length, equalTo(2));
|
||||
assertThat(explanation.getDetails()[0].isMatch(), equalTo(true));
|
||||
|
@ -115,7 +114,7 @@ public class CustomScoreSearchTests extends AbstractSharedClusterTest {
|
|||
assertNotNull(explanation);
|
||||
assertThat(explanation.isMatch(), equalTo(true));
|
||||
assertThat(explanation.getValue(), equalTo(6f));
|
||||
assertThat(explanation.getDescription(), equalTo("custom score, score mode [first]"));
|
||||
assertThat(explanation.getDescription(), equalTo("function score, score mode [first]"));
|
||||
|
||||
assertThat(explanation.getDetails().length, equalTo(2));
|
||||
assertThat(explanation.getDetails()[0].isMatch(), equalTo(true));
|
||||
|
@ -129,7 +128,6 @@ public class CustomScoreSearchTests extends AbstractSharedClusterTest {
|
|||
}
|
||||
|
||||
|
||||
|
||||
@Test
|
||||
public void testScoreExplainBug_2283_withFunctionScore() throws Exception {
|
||||
client().admin().indices().prepareDelete().execute().actionGet();
|
||||
|
@ -159,7 +157,7 @@ public class CustomScoreSearchTests extends AbstractSharedClusterTest {
|
|||
assertNotNull(explanation);
|
||||
assertThat(explanation.isMatch(), equalTo(true));
|
||||
assertThat(explanation.getValue(), equalTo(3f));
|
||||
assertThat(explanation.getDescription(), equalTo("custom score, score mode [first]"));
|
||||
assertThat(explanation.getDescription(), equalTo("function score, score mode [first]"));
|
||||
|
||||
assertThat(explanation.getDetails().length, equalTo(2));
|
||||
assertThat(explanation.getDetails()[0].isMatch(), equalTo(true));
|
||||
|
@ -185,7 +183,7 @@ public class CustomScoreSearchTests extends AbstractSharedClusterTest {
|
|||
assertNotNull(explanation);
|
||||
assertThat(explanation.isMatch(), equalTo(true));
|
||||
assertThat(explanation.getValue(), equalTo(6f));
|
||||
assertThat(explanation.getDescription(), equalTo("custom score, score mode [first]"));
|
||||
assertThat(explanation.getDescription(), equalTo("function score, score mode [first]"));
|
||||
|
||||
assertThat(explanation.getDetails().length, equalTo(2));
|
||||
assertThat(explanation.getDetails()[0].isMatch(), equalTo(true));
|
||||
|
@ -220,8 +218,8 @@ public class CustomScoreSearchTests extends AbstractSharedClusterTest {
|
|||
double[] dValues = new double[100];
|
||||
int offset = 1;
|
||||
for (int i = 0; i < values.length; i++) {
|
||||
values[i] = ""+ (i + offset);
|
||||
gp[i] = ""+ (i + offset) + ","+ (i + offset);
|
||||
values[i] = "" + (i + offset);
|
||||
gp[i] = "" + (i + offset) + "," + (i + offset);
|
||||
lValues[i] = (i + offset);
|
||||
dValues[i] = (i + offset);
|
||||
}
|
||||
|
@ -234,8 +232,8 @@ public class CustomScoreSearchTests extends AbstractSharedClusterTest {
|
|||
.endObject())).actionGet();
|
||||
offset++;
|
||||
for (int i = 0; i < values.length; i++) {
|
||||
values[i] = ""+ (i + offset);
|
||||
gp[i] = ""+ (i + offset) + ","+ (i + offset);
|
||||
values[i] = "" + (i + offset);
|
||||
gp[i] = "" + (i + offset) + "," + (i + offset);
|
||||
lValues[i] = (i + offset);
|
||||
dValues[i] = (i + offset);
|
||||
}
|
||||
|
@ -299,7 +297,6 @@ public class CustomScoreSearchTests extends AbstractSharedClusterTest {
|
|||
}
|
||||
|
||||
|
||||
|
||||
@Test
|
||||
public void testMultiValueCustomScriptBoost_withFunctionScore() throws ElasticSearchException, IOException {
|
||||
client().admin().indices().prepareDelete().execute().actionGet();
|
||||
|
@ -322,8 +319,8 @@ public class CustomScoreSearchTests extends AbstractSharedClusterTest {
|
|||
double[] dValues = new double[100];
|
||||
int offset = 1;
|
||||
for (int i = 0; i < values.length; i++) {
|
||||
values[i] = ""+ (i + offset);
|
||||
gp[i] = ""+ (i + offset) + ","+ (i + offset);
|
||||
values[i] = "" + (i + offset);
|
||||
gp[i] = "" + (i + offset) + "," + (i + offset);
|
||||
lValues[i] = (i + offset);
|
||||
dValues[i] = (i + offset);
|
||||
}
|
||||
|
@ -336,8 +333,8 @@ public class CustomScoreSearchTests extends AbstractSharedClusterTest {
|
|||
.endObject())).actionGet();
|
||||
offset++;
|
||||
for (int i = 0; i < values.length; i++) {
|
||||
values[i] = ""+ (i + offset);
|
||||
gp[i] = ""+ (i + offset) + ","+ (i + offset);
|
||||
values[i] = "" + (i + offset);
|
||||
gp[i] = "" + (i + offset) + "," + (i + offset);
|
||||
lValues[i] = (i + offset);
|
||||
dValues[i] = (i + offset);
|
||||
}
|
||||
|
@ -501,7 +498,6 @@ public class CustomScoreSearchTests extends AbstractSharedClusterTest {
|
|||
}
|
||||
|
||||
|
||||
|
||||
@Test
|
||||
public void testCustomScriptBoost_withFunctionScore() throws Exception {
|
||||
client().admin().indices().prepareDelete().execute().actionGet();
|
||||
|
@ -622,7 +618,6 @@ public class CustomScoreSearchTests extends AbstractSharedClusterTest {
|
|||
}
|
||||
|
||||
|
||||
|
||||
@Test
|
||||
public void testTriggerBooleanScorer_withFunctionScore() throws Exception {
|
||||
client().admin().indices().prepareDelete().execute().actionGet();
|
||||
|
@ -634,7 +629,7 @@ public class CustomScoreSearchTests extends AbstractSharedClusterTest {
|
|||
client().prepareIndex("test", "type", "4").setSource("field", "value4", "color", "blue").execute().actionGet();
|
||||
client().admin().indices().prepareRefresh().execute().actionGet();
|
||||
SearchResponse searchResponse = client().prepareSearch("test")
|
||||
.setQuery(functionScoreQuery(fuzzyQuery("field", "value")).add(FilterBuilders.idsFilter("type").addIds("1"), new FactorBuilder().boostFactor( 3)))
|
||||
.setQuery(functionScoreQuery(fuzzyQuery("field", "value")).add(FilterBuilders.idsFilter("type").addIds("1"), new FactorBuilder().boostFactor(3)))
|
||||
.execute().actionGet();
|
||||
assertThat(Arrays.toString(searchResponse.getShardFailures()), searchResponse.getFailedShards(), equalTo(0));
|
||||
|
||||
|
@ -852,7 +847,7 @@ public class CustomScoreSearchTests extends AbstractSharedClusterTest {
|
|||
assertThat(searchResponse.getHits().getAt(3).score(), equalTo(1.0f));
|
||||
|
||||
searchResponse = client().prepareSearch("test")
|
||||
.setQuery(functionScoreQuery(matchAllQuery()).add(termFilter("field", "value4"), new FactorBuilder().boostFactor( 2)).add(termFilter("field", "value2"), new FactorBuilder().boostFactor( 3)))
|
||||
.setQuery(functionScoreQuery(matchAllQuery()).add(termFilter("field", "value4"), new FactorBuilder().boostFactor(2)).add(termFilter("field", "value2"), new FactorBuilder().boostFactor(3)))
|
||||
.setExplain(true)
|
||||
.execute().actionGet();
|
||||
|
||||
|
@ -870,7 +865,7 @@ public class CustomScoreSearchTests extends AbstractSharedClusterTest {
|
|||
assertThat(searchResponse.getHits().getAt(3).score(), equalTo(1.0f));
|
||||
|
||||
searchResponse = client().prepareSearch("test")
|
||||
.setQuery(functionScoreQuery(matchAllQuery()).scoreMode("total").add(termFilter("field", "value4"), new FactorBuilder().boostFactor( 2)).add(termFilter("field", "value1"), new FactorBuilder().boostFactor( 3)).add(termFilter("color", "red"), new FactorBuilder().boostFactor( 5)))
|
||||
.setQuery(functionScoreQuery(matchAllQuery()).scoreMode("total").add(termFilter("field", "value4"), new FactorBuilder().boostFactor(2)).add(termFilter("field", "value1"), new FactorBuilder().boostFactor(3)).add(termFilter("color", "red"), new FactorBuilder().boostFactor(5)))
|
||||
.setExplain(true)
|
||||
.execute().actionGet();
|
||||
|
||||
|
@ -881,7 +876,7 @@ public class CustomScoreSearchTests extends AbstractSharedClusterTest {
|
|||
logger.info("--> Hit[0] {} Explanation {}", searchResponse.getHits().getAt(0).id(), searchResponse.getHits().getAt(0).explanation());
|
||||
|
||||
searchResponse = client().prepareSearch("test")
|
||||
.setQuery(functionScoreQuery(matchAllQuery()).scoreMode("max").add(termFilter("field", "value4"), new FactorBuilder().boostFactor( 2)).add(termFilter("field", "value1"), new FactorBuilder().boostFactor( 3)).add(termFilter("color", "red"), new FactorBuilder().boostFactor( 5)))
|
||||
.setQuery(functionScoreQuery(matchAllQuery()).scoreMode("max").add(termFilter("field", "value4"), new FactorBuilder().boostFactor(2)).add(termFilter("field", "value1"), new FactorBuilder().boostFactor(3)).add(termFilter("color", "red"), new FactorBuilder().boostFactor(5)))
|
||||
.setExplain(true)
|
||||
.execute().actionGet();
|
||||
|
||||
|
@ -892,7 +887,7 @@ public class CustomScoreSearchTests extends AbstractSharedClusterTest {
|
|||
logger.info("--> Hit[0] {} Explanation {}", searchResponse.getHits().getAt(0).id(), searchResponse.getHits().getAt(0).explanation());
|
||||
|
||||
searchResponse = client().prepareSearch("test")
|
||||
.setQuery(functionScoreQuery(matchAllQuery()).scoreMode("avg").add(termFilter("field", "value4"), new FactorBuilder().boostFactor( 2)).add(termFilter("field", "value1"), new FactorBuilder().boostFactor( 3)).add(termFilter("color", "red"), new FactorBuilder().boostFactor( 5)))
|
||||
.setQuery(functionScoreQuery(matchAllQuery()).scoreMode("avg").add(termFilter("field", "value4"), new FactorBuilder().boostFactor(2)).add(termFilter("field", "value1"), new FactorBuilder().boostFactor(3)).add(termFilter("color", "red"), new FactorBuilder().boostFactor(5)))
|
||||
.setExplain(true)
|
||||
.execute().actionGet();
|
||||
|
||||
|
@ -906,7 +901,7 @@ public class CustomScoreSearchTests extends AbstractSharedClusterTest {
|
|||
logger.info("--> Hit[1] {} Explanation {}", searchResponse.getHits().getAt(1).id(), searchResponse.getHits().getAt(1).explanation());
|
||||
|
||||
searchResponse = client().prepareSearch("test")
|
||||
.setQuery(functionScoreQuery(matchAllQuery()).scoreMode("min").add(termFilter("field", "value4"), new FactorBuilder().boostFactor( 2)).add(termFilter("field", "value1"), new FactorBuilder().boostFactor( 3)).add(termFilter("color", "red"), new FactorBuilder().boostFactor( 5)))
|
||||
.setQuery(functionScoreQuery(matchAllQuery()).scoreMode("min").add(termFilter("field", "value4"), new FactorBuilder().boostFactor(2)).add(termFilter("field", "value1"), new FactorBuilder().boostFactor(3)).add(termFilter("color", "red"), new FactorBuilder().boostFactor(5)))
|
||||
.setExplain(true)
|
||||
.execute().actionGet();
|
||||
|
||||
|
@ -923,7 +918,7 @@ public class CustomScoreSearchTests extends AbstractSharedClusterTest {
|
|||
assertThat(searchResponse.getHits().getAt(3).score(), equalTo(1.0f));
|
||||
|
||||
searchResponse = client().prepareSearch("test")
|
||||
.setQuery(functionScoreQuery(matchAllQuery()).scoreMode("multiply").add(termFilter("field", "value4"), new FactorBuilder().boostFactor( 2)).add(termFilter("field", "value1"), new FactorBuilder().boostFactor( 3)).add(termFilter("color", "red"), new FactorBuilder().boostFactor( 5)))
|
||||
.setQuery(functionScoreQuery(matchAllQuery()).scoreMode("multiply").add(termFilter("field", "value4"), new FactorBuilder().boostFactor(2)).add(termFilter("field", "value1"), new FactorBuilder().boostFactor(3)).add(termFilter("color", "red"), new FactorBuilder().boostFactor(5)))
|
||||
.setExplain(true)
|
||||
.execute().actionGet();
|
||||
|
||||
|
@ -940,7 +935,7 @@ public class CustomScoreSearchTests extends AbstractSharedClusterTest {
|
|||
assertThat(searchResponse.getHits().getAt(3).score(), equalTo(1.0f));
|
||||
|
||||
searchResponse = client().prepareSearch("test")
|
||||
.setQuery(functionScoreQuery(termsQuery("field", "value1", "value2", "value3", "value4")).scoreMode("first").add(termFilter("field", "value4"), new FactorBuilder().boostFactor( 2)).add(termFilter("field", "value3"), new FactorBuilder().boostFactor( 3)).add(termFilter("field", "value2"), new FactorBuilder().boostFactor( 4)))
|
||||
.setQuery(functionScoreQuery(termsQuery("field", "value1", "value2", "value3", "value4")).scoreMode("first").add(termFilter("field", "value4"), new FactorBuilder().boostFactor(2)).add(termFilter("field", "value3"), new FactorBuilder().boostFactor(3)).add(termFilter("field", "value2"), new FactorBuilder().boostFactor(4)))
|
||||
.setExplain(true)
|
||||
.execute().actionGet();
|
||||
|
||||
|
@ -958,7 +953,7 @@ public class CustomScoreSearchTests extends AbstractSharedClusterTest {
|
|||
|
||||
|
||||
searchResponse = client().prepareSearch("test")
|
||||
.setQuery(functionScoreQuery(termsQuery("field", "value1", "value2", "value3", "value4")).scoreMode("multiply").add(termFilter("field", "value4"), new FactorBuilder().boostFactor( 2)).add(termFilter("field", "value1"), new FactorBuilder().boostFactor( 3)).add(termFilter("color", "red"), new FactorBuilder().boostFactor( 5)))
|
||||
.setQuery(functionScoreQuery(termsQuery("field", "value1", "value2", "value3", "value4")).scoreMode("multiply").add(termFilter("field", "value4"), new FactorBuilder().boostFactor(2)).add(termFilter("field", "value1"), new FactorBuilder().boostFactor(3)).add(termFilter("color", "red"), new FactorBuilder().boostFactor(5)))
|
||||
.setExplain(true)
|
||||
.execute().actionGet();
|
||||
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
package org.elasticsearch.test.integration.search.functionscore;
|
||||
|
||||
import org.elasticsearch.index.query.functionscore.DecayFunctionBuilder;
|
||||
|
||||
public class CustomDistanceScoreBuilder extends DecayFunctionBuilder {
|
||||
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return CustomDistanceScoreParser.NAMES[0];
|
||||
}
|
||||
|
||||
}
|
|
@ -1,45 +0,0 @@
|
|||
package org.elasticsearch.test.integration.search.functionscore;
|
||||
|
||||
import org.apache.lucene.search.ComplexExplanation;
|
||||
import org.apache.lucene.search.Explanation;
|
||||
import org.elasticsearch.index.query.functionscore.DecayFunction;
|
||||
import org.elasticsearch.index.query.functionscore.DecayFunctionParser;
|
||||
|
||||
public class CustomDistanceScoreParser extends DecayFunctionParser {
|
||||
|
||||
public static final String[] NAMES = {"linear_mult", "linearMult"};
|
||||
|
||||
@Override
|
||||
public String[] getNames() {
|
||||
return NAMES;
|
||||
}
|
||||
|
||||
static final DecayFunction distanceFunction = new LinearMultScoreFunction();;
|
||||
|
||||
@Override
|
||||
public DecayFunction getDecayFunction() {
|
||||
return distanceFunction;
|
||||
}
|
||||
|
||||
static class LinearMultScoreFunction implements DecayFunction {
|
||||
LinearMultScoreFunction() {
|
||||
}
|
||||
|
||||
@Override
|
||||
public double evaluate(double value, double scale) {
|
||||
return Math.abs(value);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Explanation explainFunction(String distanceString, double distanceVal, double scale) {
|
||||
ComplexExplanation ce = new ComplexExplanation();
|
||||
ce.setDescription("" + distanceVal);
|
||||
return ce;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double processScale(double userGivenScale, double userGivenValue) {
|
||||
return userGivenScale;
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,44 +0,0 @@
|
|||
/*
|
||||
* Licensed to ElasticSearch and Shay Banon under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. ElasticSearch licenses this
|
||||
* file to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.elasticsearch.test.integration.search.functionscore;
|
||||
|
||||
import org.elasticsearch.index.query.functionscore.FunctionScoreModule;
|
||||
|
||||
import org.elasticsearch.plugins.AbstractPlugin;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public class CustomDistanceScorePlugin extends AbstractPlugin {
|
||||
|
||||
@Override
|
||||
public String name() {
|
||||
return "test-plugin-distance-score";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String description() {
|
||||
return "Distance score plugin to test pluggable implementation";
|
||||
}
|
||||
|
||||
public void onModule(FunctionScoreModule scoreModule) {
|
||||
scoreModule.registerParser(CustomDistanceScoreParser.class);
|
||||
}
|
||||
|
||||
}
|
|
@ -46,7 +46,7 @@ import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource;
|
|||
import static org.hamcrest.Matchers.equalTo;
|
||||
import static org.hamcrest.Matchers.lessThan;
|
||||
|
||||
public class DecayFunctionScoreTest extends AbstractSharedClusterTest {
|
||||
public class DecayFunctionScoreTests extends AbstractSharedClusterTest {
|
||||
|
||||
@Test
|
||||
public void testDistanceScoreGeoLinGaussExp() throws Exception {
|
|
@ -19,19 +19,24 @@
|
|||
|
||||
package org.elasticsearch.test.integration.search.functionscore;
|
||||
|
||||
import org.elasticsearch.index.query.functionscore.DecayFunctionBuilder;
|
||||
|
||||
import org.apache.lucene.search.ComplexExplanation;
|
||||
import org.apache.lucene.search.Explanation;
|
||||
import org.apache.lucene.util.LuceneTestCase;
|
||||
import org.elasticsearch.action.ActionFuture;
|
||||
import org.elasticsearch.action.search.SearchResponse;
|
||||
import org.elasticsearch.action.search.SearchType;
|
||||
import org.elasticsearch.client.Client;
|
||||
import org.elasticsearch.common.Priority;
|
||||
import org.elasticsearch.common.settings.ImmutableSettings;
|
||||
import org.elasticsearch.index.query.functionscore.DecayFunction;
|
||||
import org.elasticsearch.index.query.functionscore.DecayFunctionBuilder;
|
||||
import org.elasticsearch.index.query.functionscore.DecayFunctionParser;
|
||||
import org.elasticsearch.index.query.functionscore.FunctionScoreModule;
|
||||
import org.elasticsearch.plugins.AbstractPlugin;
|
||||
import org.elasticsearch.search.SearchHits;
|
||||
import org.elasticsearch.test.hamcrest.ElasticsearchAssertions;
|
||||
import org.elasticsearch.test.integration.AbstractNodesTests;
|
||||
import org.junit.AfterClass;
|
||||
import org.junit.BeforeClass;
|
||||
import org.junit.After;
|
||||
import org.junit.Test;
|
||||
|
||||
import static org.elasticsearch.client.Requests.indexRequest;
|
||||
|
@ -46,12 +51,19 @@ import static org.hamcrest.Matchers.equalTo;
|
|||
/**
|
||||
*
|
||||
*/
|
||||
public class FunctionScorePluginTest extends AbstractNodesTests {
|
||||
public class FunctionScorePluginTests extends AbstractNodesTests {
|
||||
|
||||
private Client client;
|
||||
|
||||
@BeforeClass
|
||||
public void createNodes() throws Exception {
|
||||
@After
|
||||
public void closeNodes() {
|
||||
client.close();
|
||||
closeAllNodes();
|
||||
}
|
||||
|
||||
@Test
|
||||
@LuceneTestCase.AwaitsFix(bugUrl = "britta to look into it, it creates a double value that fails the toFloat assertion")
|
||||
public void testPlugin() throws Exception {
|
||||
ImmutableSettings.Builder settings = settingsBuilder().put("plugin.types", CustomDistanceScorePlugin.class.getName());
|
||||
startNode("server1", settings);
|
||||
client = client("server1");
|
||||
|
@ -64,16 +76,6 @@ public class FunctionScorePluginTest extends AbstractNodesTests {
|
|||
.field("type", "string").endObject().startObject("num1").field("type", "date").endObject().endObject()
|
||||
.endObject().endObject()).execute().actionGet();
|
||||
client.admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet();
|
||||
}
|
||||
|
||||
@AfterClass
|
||||
public void closeNodes() {
|
||||
client.close();
|
||||
closeAllNodes();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPlugin() throws Exception {
|
||||
|
||||
client.index(
|
||||
indexRequest("test").type("type1").id("1")
|
||||
|
@ -99,4 +101,71 @@ public class FunctionScorePluginTest extends AbstractNodesTests {
|
|||
|
||||
}
|
||||
|
||||
public static class CustomDistanceScorePlugin extends AbstractPlugin {
|
||||
|
||||
@Override
|
||||
public String name() {
|
||||
return "test-plugin-distance-score";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String description() {
|
||||
return "Distance score plugin to test pluggable implementation";
|
||||
}
|
||||
|
||||
public void onModule(FunctionScoreModule scoreModule) {
|
||||
scoreModule.registerParser(FunctionScorePluginTests.CustomDistanceScoreParser.class);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public static class CustomDistanceScoreParser extends DecayFunctionParser {
|
||||
|
||||
public static final String[] NAMES = {"linear_mult", "linearMult"};
|
||||
|
||||
@Override
|
||||
public String[] getNames() {
|
||||
return NAMES;
|
||||
}
|
||||
|
||||
static final DecayFunction distanceFunction = new LinearMultScoreFunction();
|
||||
|
||||
@Override
|
||||
public DecayFunction getDecayFunction() {
|
||||
return distanceFunction;
|
||||
}
|
||||
|
||||
static class LinearMultScoreFunction implements DecayFunction {
|
||||
LinearMultScoreFunction() {
|
||||
}
|
||||
|
||||
@Override
|
||||
public double evaluate(double value, double scale) {
|
||||
return Math.abs(value);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Explanation explainFunction(String distanceString, double distanceVal, double scale) {
|
||||
ComplexExplanation ce = new ComplexExplanation();
|
||||
ce.setDescription("" + distanceVal);
|
||||
return ce;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double processScale(double userGivenScale, double userGivenValue) {
|
||||
return userGivenScale;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public class CustomDistanceScoreBuilder extends DecayFunctionBuilder {
|
||||
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return CustomDistanceScoreParser.NAMES[0];
|
||||
}
|
||||
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue