Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-4513: Fixed that deleted nested docs are scored into the parent doc. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1404248 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Martijn van Groningen 2012-10-31 16:56:48 +00:00
parent c898b44722
commit 2e103d3555
3 changed files with 61 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lucene/CHANGES.txt
View File

@ -110,6 +110,9 @@ Bug Fixes
happened in the IndexWriter instance. (Ivan Vasilev via Mike
McCandless)
* LUCENE-4513: Fixed that deleted nested docs are scored into the
parent doc when using ToParentBlockJoinQuery. (Martijn van Groningen)
Optimizations
* LUCENE-4512: Additional memory savings for CompressingStoredFieldsIndex.MEMORY_CHUNK

4
lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
View File

@ -160,8 +160,8 @@ public class ToParentBlockJoinQuery extends Query {
public Scorer scorer(AtomicReaderContext readerContext, boolean scoreDocsInOrder,
boolean topScorer, Bits acceptDocs) throws IOException {
// Pass scoreDocsInOrder true, topScorer false to our sub:
final Scorer childScorer = childWeight.scorer(readerContext, true, false, null);
// Pass scoreDocsInOrder true, topScorer false to our sub and the live docs:
final Scorer childScorer = childWeight.scorer(readerContext, true, false, readerContext.reader().getLiveDocs());
if (childScorer == null) {
// No matches

56
lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
View File

@ -272,6 +272,62 @@ public class TestBlockJoin extends LuceneTestCase {
dir.close();
}
public void testNestedDocScoringWithDeletes() throws Exception {
final Directory dir = newDirectory();
final RandomIndexWriter w = new RandomIndexWriter(
random(),
dir,
newIndexWriterConfig(TEST_VERSION_CURRENT,
new MockAnalyzer(random())).setMergePolicy(NoMergePolicy.COMPOUND_FILES));
// Cannot assert this since we use NoMergePolicy:
w.setDoRandomForceMergeAssert(false);
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("c", 1999));
docs.add(makeJob("ruby", 2005));
docs.add(makeJob("java", 2006));
docs.add(makeResume("Frank", "United States"));
w.addDocuments(docs);
w.commit();
IndexSearcher s = newSearcher(DirectoryReader.open(dir));
ToParentBlockJoinQuery q = new ToParentBlockJoinQuery(
NumericRangeQuery.newIntRange("year", 1990, 2010, true, true),
new CachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("docType", "resume")))),
ScoreMode.Total
);
TopDocs topDocs = s.search(q, 10);
assertEquals(2, topDocs.totalHits);
assertEquals(6, topDocs.scoreDocs[0].doc);
assertEquals(3.0f, topDocs.scoreDocs[0].score, 0.0f);
assertEquals(2, topDocs.scoreDocs[1].doc);
assertEquals(2.0f, topDocs.scoreDocs[1].score, 0.0f);
s.getIndexReader().close();
w.deleteDocuments(new Term("skill", "java"));
w.close();
s = newSearcher(DirectoryReader.open(dir));
topDocs = s.search(q, 10);
assertEquals(2, topDocs.totalHits);
assertEquals(6, topDocs.scoreDocs[0].doc);
assertEquals(2.0f, topDocs.scoreDocs[0].score, 0.0f);
assertEquals(2, topDocs.scoreDocs[1].doc);
assertEquals(1.0f, topDocs.scoreDocs[1].score, 0.0f);
s.getIndexReader().close();
dir.close();
}
private String[][] getRandomFields(int maxUniqueValues) {
final String[][] fields = new String[_TestUtil.nextInt(random(), 2, 4)][];