You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2013/04/18 10:10:54 UTC
svn commit: r1469219 - in /lucene/dev/branches/lucene_solr_4_3: ./ lucene/
lucene/join/
lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
Author: simonw
Date: Thu Apr 18 08:10:53 2013
New Revision: 1469219
URL: http://svn.apache.org/r1469219
Log:
LUCENE-4940: ToParentBlockJoinQuery throws exception on empty parent filter DocIdSet
Modified:
lucene/dev/branches/lucene_solr_4_3/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/join/ (props changed)
lucene/dev/branches/lucene_solr_4_3/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
lucene/dev/branches/lucene_solr_4_3/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
Modified: lucene/dev/branches/lucene_solr_4_3/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_3/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java?rev=1469219&r1=1469218&r2=1469219&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_3/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java (original)
+++ lucene/dev/branches/lucene_solr_4_3/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java Thu Apr 18 08:10:53 2013
@@ -181,8 +181,7 @@ public class ToParentBlockJoinQuery exte
// acceptDocs when we score:
final DocIdSet parents = parentsFilter.getDocIdSet(readerContext, null);
- if (parents == null
- || parents.iterator().docID() == DocIdSetIterator.NO_MORE_DOCS) { // <-- means DocIdSet#EMPTY_DOCIDSET
+ if (parents == null || parents == DocIdSet.EMPTY_DOCIDSET) {
// No matches
return null;
}
Modified: lucene/dev/branches/lucene_solr_4_3/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_3/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java?rev=1469219&r1=1469218&r2=1469219&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_3/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java (original)
+++ lucene/dev/branches/lucene_solr_4_3/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java Thu Apr 18 08:10:53 2013
@@ -61,6 +61,64 @@ public class TestBlockJoin extends Lucen
job.add(new IntField("year", year, Field.Store.NO));
return job;
}
+
+ public void testEmptyChildFilter() throws Exception {
+
+ final Directory dir = newDirectory();
+ final RandomIndexWriter w = new RandomIndexWriter(random(), dir);
+
+ final List<Document> docs = new ArrayList<Document>();
+
+ docs.add(makeJob("java", 2007));
+ docs.add(makeJob("python", 2010));
+ docs.add(makeResume("Lisa", "United Kingdom"));
+ w.addDocuments(docs);
+
+ docs.clear();
+ docs.add(makeJob("ruby", 2005));
+ docs.add(makeJob("java", 2006));
+ docs.add(makeResume("Frank", "United States"));
+ w.addDocuments(docs);
+
+ w.commit();
+ int num = atLeast(10); // produce a segment that doesn't have a value in the docType field
+ for (int i = 0; i < num; i++) {
+ docs.clear();
+ docs.add(makeJob("java", 2007));
+ w.addDocuments(docs);
+ }
+
+ IndexReader r = w.getReader();
+ w.close();
+ IndexSearcher s = newSearcher(r);
+ Filter parentsFilter = new CachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("docType", "resume"))));
+
+ BooleanQuery childQuery = new BooleanQuery();
+ childQuery.add(new BooleanClause(new TermQuery(new Term("skill", "java")), Occur.MUST));
+ childQuery.add(new BooleanClause(NumericRangeQuery.newIntRange("year", 2006, 2011, true, true), Occur.MUST));
+
+ ToParentBlockJoinQuery childJoinQuery = new ToParentBlockJoinQuery(childQuery, parentsFilter, ScoreMode.Avg);
+
+ BooleanQuery fullQuery = new BooleanQuery();
+ fullQuery.add(new BooleanClause(childJoinQuery, Occur.MUST));
+ fullQuery.add(new BooleanClause(new MatchAllDocsQuery(), Occur.MUST));
+ ToParentBlockJoinCollector c = new ToParentBlockJoinCollector(Sort.RELEVANCE, 1, true, true);
+ s.search(fullQuery, c);
+ TopGroups<Integer> results = c.getTopGroups(childJoinQuery, null, 0, 10, 0, true);
+ assertFalse(Float.isNaN(results.maxScore));
+ assertEquals(1, results.totalGroupedHitCount);
+ assertEquals(1, results.groups.length);
+ final GroupDocs<Integer> group = results.groups[0];
+ Document childDoc = s.doc(group.scoreDocs[0].doc);
+ assertEquals("java", childDoc.get("skill"));
+ assertNotNull(group.groupValue);
+ Document parentDoc = s.doc(group.groupValue);
+ assertEquals("Lisa", parentDoc.get("name"));
+
+ r.close();
+ dir.close();
+ }
+
public void testSimple() throws Exception {
@@ -79,7 +137,7 @@ public class TestBlockJoin extends Lucen
docs.add(makeJob("java", 2006));
docs.add(makeResume("Frank", "United States"));
w.addDocuments(docs);
-
+
IndexReader r = w.getReader();
w.close();
IndexSearcher s = newSearcher(r);