honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

The relevancy score in explanation should match the actual score in custom_filters_query 

Fixes #2441
This commit is contained in:
Igor Motov 2012-11-25 09:06:30 -05:00 committed by Shay Banon
parent 69ef822da6
commit 6021515567
2 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/elasticsearch/common/lucene/search/function/FiltersFunctionScoreQuery.java
View File

@ -163,7 +163,11 @@ public class FiltersFunctionScoreQuery extends Query {
if (docSet.get(doc)) { if (docSet.get(doc)) {
filterFunction.function.setNextReader(context); filterFunction.function.setNextReader(context);
Explanation functionExplanation = filterFunction.function.explainFactor(doc); Explanation functionExplanation = filterFunction.function.explainFactor(doc);
float sc = getBoost() * subQueryExpl.getValue() * functionExplanation.getValue(); float factor = functionExplanation.getValue();
if (factor > maxBoost) {
factor = maxBoost;
}
float sc = getBoost() * factor;
Explanation filterExplanation = new ComplexExplanation(true, sc, "custom score, product of:"); Explanation filterExplanation = new ComplexExplanation(true, sc, "custom score, product of:");
filterExplanation.addDetail(new Explanation(1.0f, "match filter: " + filterFunction.filter.toString())); filterExplanation.addDetail(new Explanation(1.0f, "match filter: " + filterFunction.filter.toString()));
filterExplanation.addDetail(functionExplanation); filterExplanation.addDetail(functionExplanation);

47
src/test/java/org/elasticsearch/test/integration/search/customscore/CustomScoreSearchTests.java
View File

@ -84,7 +84,7 @@ public class CustomScoreSearchTests extends AbstractNodesTests {
.setQuery(customFiltersScoreQuery(matchAllQuery()) .setQuery(customFiltersScoreQuery(matchAllQuery())
.add(termFilter("field", "value4"), "2") .add(termFilter("field", "value4"), "2")
.add(termFilter("field", "value2"), "3") .add(termFilter("field", "value2"), "3")
.scoreMode("first")) .scoreMode("first"))
.setExplain(true) .setExplain(true)
.execute().actionGet(); .execute().actionGet();
@ -114,7 +114,7 @@ public class CustomScoreSearchTests extends AbstractNodesTests {
.add(termFilter("field", "value4"), "2") .add(termFilter("field", "value4"), "2")
.add(termFilter("field", "value2"), "3") .add(termFilter("field", "value2"), "3")
.boost(2) .boost(2)
.scoreMode("first")) .scoreMode("first"))
.setExplain(true) .setExplain(true)
.execute().actionGet(); .execute().actionGet();
@ -364,5 +364,48 @@ public class CustomScoreSearchTests extends AbstractNodesTests {
assertThat(searchResponse.hits().getAt(2).score(), equalTo(2.0f)); assertThat(searchResponse.hits().getAt(2).score(), equalTo(2.0f));
assertThat(searchResponse.hits().getAt(3).id(), equalTo("2")); assertThat(searchResponse.hits().getAt(3).id(), equalTo("2"));
assertThat(searchResponse.hits().getAt(3).score(), equalTo(1.0f)); assertThat(searchResponse.hits().getAt(3).score(), equalTo(1.0f));
searchResponse = client.prepareSearch("test")
.setQuery(customFiltersScoreQuery(termsQuery("field", "value1", "value2", "value3", "value4")).scoreMode("first")
.add(termFilter("field", "value4"), 2)
.add(termFilter("field", "value3"), 3)
.add(termFilter("field", "value2"), 4))
.setExplain(true)
.execute().actionGet();
assertThat(Arrays.toString(searchResponse.shardFailures()), searchResponse.failedShards(), equalTo(0));
assertThat(searchResponse.hits().totalHits(), equalTo(4l));
assertThat(searchResponse.hits().getAt(0).id(), equalTo("2"));
assertThat(searchResponse.hits().getAt(0).score(), equalTo(searchResponse.hits().getAt(0).explanation().getValue()));
logger.info("--> Hit[0] {} Explanation {}", searchResponse.hits().getAt(0).id(), searchResponse.hits().getAt(0).explanation());
assertThat(searchResponse.hits().getAt(1).id(), equalTo("3"));
assertThat(searchResponse.hits().getAt(1).score(), equalTo(searchResponse.hits().getAt(1).explanation().getValue()));
assertThat(searchResponse.hits().getAt(2).id(), equalTo("4"));
assertThat(searchResponse.hits().getAt(2).score(), equalTo(searchResponse.hits().getAt(2).explanation().getValue()));
assertThat(searchResponse.hits().getAt(3).id(), equalTo("1"));
assertThat(searchResponse.hits().getAt(3).score(), equalTo(searchResponse.hits().getAt(3).explanation().getValue()));
searchResponse = client.prepareSearch("test")
.setQuery(customFiltersScoreQuery(termsQuery("field", "value1", "value2", "value3", "value4")).scoreMode("multiply")
.add(termFilter("field", "value4"), 2)
.add(termFilter("field", "value1"), 3)
.add(termFilter("color", "red"), 5))
.setExplain(true)
.execute().actionGet();
assertThat(Arrays.toString(searchResponse.shardFailures()), searchResponse.failedShards(), equalTo(0));
assertThat(searchResponse.hits().totalHits(), equalTo(4l));
assertThat(searchResponse.hits().getAt(0).id(), equalTo("1"));
assertThat(searchResponse.hits().getAt(0).score(), equalTo(searchResponse.hits().getAt(0).explanation().getValue()));
logger.info("--> Hit[0] {} Explanation {}", searchResponse.hits().getAt(0).id(), searchResponse.hits().getAt(0).explanation());
assertThat(searchResponse.hits().getAt(1).id(), equalTo("3"));
assertThat(searchResponse.hits().getAt(1).score(), equalTo(searchResponse.hits().getAt(1).explanation().getValue()));
assertThat(searchResponse.hits().getAt(2).id(), equalTo("4"));
assertThat(searchResponse.hits().getAt(2).score(), equalTo(searchResponse.hits().getAt(2).explanation().getValue()));
assertThat(searchResponse.hits().getAt(3).id(), equalTo("2"));
assertThat(searchResponse.hits().getAt(3).score(), equalTo(searchResponse.hits().getAt(3).explanation().getValue()));
} }
} }