You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2011/09/20 21:16:02 UTC
svn commit: r1173311 - in /lucene/dev/branches/branch_3x/lucene: CHANGES.txt
src/java/org/apache/lucene/search/TermQuery.java
src/test/org/apache/lucene/search/TestQueryWrapperFilter.java
Author: uschindler
Date: Tue Sep 20 19:16:01 2011
New Revision: 1173311
URL: http://svn.apache.org/viewvc?rev=1173311&view=rev
Log:
LUCENE-3442: TermQuery.TermWeight.scorer() returns null for non-atomic IndexReaders (optimization bug, introcuced by LUCENE-2829), preventing QueryWrapperFilter and similar classes to get a top-level DocIdSet.
Modified:
lucene/dev/branches/branch_3x/lucene/CHANGES.txt
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/TermQuery.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java
Modified: lucene/dev/branches/branch_3x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/CHANGES.txt?rev=1173311&r1=1173310&r2=1173311&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/CHANGES.txt Tue Sep 20 19:16:01 2011
@@ -20,6 +20,11 @@ Bug fixes
should ignore the maxMergedSegmentMB setting (v.sevel via Mike
McCandless)
+* LUCENE-3442: TermQuery.TermWeight.scorer() returns null for non-atomic
+ IndexReaders (optimization bug, introcuced by LUCENE-2829), preventing
+ QueryWrapperFilter and similar classes to get a top-level DocIdSet.
+ (Dan C., Uwe Schindler)
+
New Features
Optimizations
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/TermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/TermQuery.java?rev=1173311&r1=1173310&r2=1173311&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/TermQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/TermQuery.java Tue Sep 20 19:16:01 2011
@@ -94,7 +94,8 @@ public class TermQuery extends Query {
@Override
public Scorer scorer(IndexReader reader, boolean scoreDocsInOrder, boolean topScorer) throws IOException {
- if (hash != null && !hash.contains(reader.hashCode())) {
+ // only use the early exit condition if we have an atomic reader, because Lucene 3.x still supports non-atomic readers here:
+ if (hash != null && reader.getSequentialSubReaders() == null && !hash.contains(reader.hashCode())) {
return null;
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java?rev=1173311&r1=1173310&r2=1173311&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java Tue Sep 20 19:16:01 2011
@@ -81,4 +81,37 @@ public class TestQueryWrapperFilter exte
reader.close();
dir.close();
}
+
+ // this test is for 3.x only, in 4.x we no longer support non-atomic readers passed to getDocIdSet():
+ public void test_LUCENE3442() throws Exception {
+ Directory dir = newDirectory();
+ RandomIndexWriter writer = new RandomIndexWriter(random, dir);
+ Document doc = new Document();
+ doc.add(newField("id", "1001", Store.YES, Index.NOT_ANALYZED));
+ doc.add(newField("text", "headline one group one", Store.YES, Index.ANALYZED));
+ writer.addDocument(doc);
+ IndexReader rdr = writer.getReader();
+ writer.close();
+ IndexSearcher searcher = new IndexSearcher(rdr);
+ TermQuery tq = new TermQuery(new Term("text", "headline"));
+ TopDocs results = searcher.search(tq, 5);
+ assertEquals(1, results.totalHits);
+
+ Filter f = new QueryWrapperFilter(tq);
+ // rdr may not be atomic (it isn't in most cases), TermQuery inside QWF should still work!
+ DocIdSet dis = f.getDocIdSet(rdr);
+ assertNotNull(dis);
+ DocIdSetIterator it = dis.iterator();
+ assertNotNull(it);
+ int docId, count = 0;
+ while ((docId = it.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) {
+ assertEquals("1001", rdr.document(docId).get("id"));
+ count++;
+ }
+ assertEquals(1, count);
+ searcher.close();
+ rdr.close();
+ dir.close();
+ }
+
}