You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2013/04/10 23:33:06 UTC
svn commit: r1466696 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/search/
lucene/core/src/test/org/apache/lucene/search/
Author: jpountz
Date: Wed Apr 10 21:33:05 2013
New Revision: 1466696
URL: http://svn.apache.org/r1466696
Log:
LUCENE-4925: Fix IndexSearcher.search(..., Sort, ...) (merged from r1466694).
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/Sort.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSort.java (contents, props changed)
Modified: lucene/dev/branches/branch_4x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/CHANGES.txt?rev=1466696&r1=1466695&r2=1466696&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/CHANGES.txt Wed Apr 10 21:33:05 2013
@@ -230,6 +230,10 @@ Bug Fixes
* LUCENE-4885: FacetsAccumulator did not set the correct value for
FacetResult.numValidDescendants. (Mike McCandless, Shai Erera)
+* LUCENE-4925: Fixed IndexSearcher.search when the argument list contains a Sort
+ and one of the sort fields is the relevance score. Only IndexSearchers created
+ with an ExecutorService are concerned. (Adrien Grand)
+
Documentation
* LUCENE-4841: Added example SimpleSortedSetFacetsExample to show how
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java?rev=1466696&r1=1466695&r2=1466696&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java Wed Apr 10 21:33:05 2013
@@ -812,7 +812,7 @@ public class IndexSearcher {
public TopFieldDocs call() throws IOException {
assert slice.leaves.length == 1;
final TopFieldDocs docs = searcher.search(Arrays.asList(slice.leaves),
- weight, after, nDocs, sort, true, doDocScores, doMaxScore);
+ weight, after, nDocs, sort, true, doDocScores || sort.needsScores(), doMaxScore);
lock.lock();
try {
final AtomicReaderContext ctx = slice.leaves[0];
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/Sort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/Sort.java?rev=1466696&r1=1466695&r2=1466696&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/Sort.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/Sort.java Wed Apr 10 21:33:05 2013
@@ -201,4 +201,15 @@ public class Sort {
public int hashCode() {
return 0x45aaf665 + Arrays.hashCode(fields);
}
+
+ /** Whether the relevance score is needed to sort documents. */
+ boolean needsScores() {
+ for (SortField sortField : fields) {
+ if (sortField.getType() == SortField.Type.SCORE) {
+ return true;
+ }
+ }
+ return false;
+ }
+
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSort.java?rev=1466696&r1=1466695&r2=1466696&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSort.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSort.java Wed Apr 10 21:33:05 2013
@@ -35,6 +35,7 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.index.Term;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
+import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
@@ -1516,4 +1517,31 @@ public class TestSort extends LuceneTest
ir.close();
dir.close();
}
+
+ public void testScore() throws IOException {
+ Directory dir = newDirectory();
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
+ Document doc = new Document();
+ doc.add(newStringField("value", "bar", Field.Store.NO));
+ writer.addDocument(doc);
+ doc = new Document();
+ doc.add(newStringField("value", "foo", Field.Store.NO));
+ writer.addDocument(doc);
+ IndexReader ir = writer.getReader();
+ writer.close();
+
+ IndexSearcher searcher = newSearcher(ir);
+ Sort sort = new Sort(SortField.FIELD_SCORE);
+
+ final BooleanQuery bq = new BooleanQuery();
+ bq.add(new TermQuery(new Term("value", "foo")), Occur.SHOULD);
+ bq.add(new MatchAllDocsQuery(), Occur.SHOULD);
+ TopDocs td = searcher.search(bq, 10, sort);
+ assertEquals(2, td.totalHits);
+ assertEquals(1, td.scoreDocs[0].doc);
+ assertEquals(0, td.scoreDocs[1].doc);
+
+ ir.close();
+ dir.close();
+ }
}