You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/12/01 04:27:43 UTC
svn commit: r1642625 - in /lucene/dev/branches/lucene_solr_4_10: ./ lucene/
lucene/core/ lucene/core/src/test/org/apache/lucene/search/
lucene/core/src/test/org/apache/lucene/search/payloads/
lucene/core/src/test/org/apache/lucene/search/spans/ lucene/...
Author: rmuir
Date: Mon Dec 1 03:27:43 2014
New Revision: 1642625
URL: http://svn.apache.org/r1642625
Log:
LUCENE-6042: fix CustomScoreQuery explain to properly factor boost
Added:
lucene/dev/branches/lucene_solr_4_10/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreExplanations.java
- copied unchanged from r1636555, lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreExplanations.java
lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java
- copied, changed from r1636555, lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java
Modified:
lucene/dev/branches/lucene_solr_4_10/ (props changed)
lucene/dev/branches/lucene_solr_4_10/lucene/ (props changed)
lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene_solr_4_10/lucene/core/ (props changed)
lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java
lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java
lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadExplanations.java
lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanExplanations.java
lucene/dev/branches/lucene_solr_4_10/lucene/queries/ (props changed)
lucene/dev/branches/lucene_solr_4_10/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/ (props changed)
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt?rev=1642625&r1=1642624&r2=1642625&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt Mon Dec 1 03:27:43 2014
@@ -30,6 +30,9 @@ Bug fixes
* LUCENE-5980: Don't let document length overflow. (Robert Muir)
+* LUCENE-6042: CustomScoreQuery explain was incorrect in some cases,
+ such as when nested inside a boolean query. (Denis Lantsman via Robert Muir)
+
Documentation
* LUCENE-6057: Improve Sort(SortField) docs (Martin Braun via Mike McCandless)
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java?rev=1642625&r1=1642624&r2=1642625&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java Mon Dec 1 03:27:43 2014
@@ -27,7 +27,7 @@ import org.apache.lucene.search.spans.*;
* on the assumption that if the explanations work out right for them,
* they should work for anything.
*/
-public class TestComplexExplanations extends TestExplanations {
+public class TestComplexExplanations extends BaseExplanationTestCase {
/**
* Override the Similarity used in our searcher with one that plays
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java?rev=1642625&r1=1642624&r2=1642625&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java Mon Dec 1 03:27:43 2014
@@ -22,7 +22,7 @@ import org.apache.lucene.index.Term;
/**
* TestExplanations subclass focusing on basic query types
*/
-public class TestSimpleExplanations extends TestExplanations {
+public class TestSimpleExplanations extends BaseExplanationTestCase {
// we focus on queries that don't rewrite to other queries.
// if we get those covered well, then the ones that rewrite should
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadExplanations.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadExplanations.java?rev=1642625&r1=1642624&r2=1642625&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadExplanations.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadExplanations.java Mon Dec 1 03:27:43 2014
@@ -20,14 +20,14 @@ package org.apache.lucene.search.payload
import org.apache.lucene.index.Term;
import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.search.similarities.Similarity;
-import org.apache.lucene.search.TestExplanations;
+import org.apache.lucene.search.BaseExplanationTestCase;
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.util.BytesRef;
/**
* TestExplanations subclass focusing on payload queries
*/
-public class TestPayloadExplanations extends TestExplanations {
+public class TestPayloadExplanations extends BaseExplanationTestCase {
private PayloadFunction functions[] = new PayloadFunction[] {
new AveragePayloadFunction(),
new MinPayloadFunction(),
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanExplanations.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanExplanations.java?rev=1642625&r1=1642624&r2=1642625&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanExplanations.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanExplanations.java Mon Dec 1 03:27:43 2014
@@ -23,7 +23,7 @@ import org.apache.lucene.search.*;
/**
* TestExplanations subclass focusing on span queries
*/
-public class TestSpanExplanations extends TestExplanations {
+public class TestSpanExplanations extends BaseExplanationTestCase {
/* simple SpanTermQueries */
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java?rev=1642625&r1=1642624&r2=1642625&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java Mon Dec 1 03:27:43 2014
@@ -263,11 +263,11 @@ public class CustomScoreQuery extends Qu
valSrcExpls[i] = valSrcWeights[i].explain(info, doc);
}
Explanation customExp = CustomScoreQuery.this.getCustomScoreProvider(info).customExplain(doc,subQueryExpl,valSrcExpls);
- float sc = getBoost() * customExp.getValue();
+ float sc = queryWeight * customExp.getValue();
Explanation res = new ComplexExplanation(
true, sc, CustomScoreQuery.this.toString() + ", product of:");
res.addDetail(customExp);
- res.addDetail(new Explanation(getBoost(), "queryBoost")); // actually using the q boost as q weight (== weight value)
+ res.addDetail(new Explanation(queryWeight, "queryWeight"));
return res;
}
Copied: lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java (from r1636555, lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java?p2=lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java&p1=lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java&r1=1636555&r2=1642625&rev=1642625&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java Mon Dec 1 03:27:43 2014
@@ -113,7 +113,7 @@ public abstract class BaseExplanationTes
/**
* Convenience subclass of FieldCacheTermsFilter
*/
- public static class ItemizedFilter extends DocValuesTermsFilter {
+ public static class ItemizedFilter extends FieldCacheTermsFilter {
private static String[] int2str(int [] terms) {
String [] out = new String[terms.length];
for (int i = 0; i < terms.length; i++) {