honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sync with latest Lucene block join, init parentDoc to -1, which makes the assert commented out valid again

This commit is contained in:
Shay Banon 2011-11-28 23:47:31 +02:00
parent 6b894d9f53
commit e9fe8ec469
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/elasticsearch/src/main/java/org/elasticsearch/index/search/nested/BlockJoinQuery.java
View File

@ -211,7 +211,7 @@ public class BlockJoinQuery extends Query {
private final FixedBitSet parentBits;
private final ScoreMode scoreMode;
private final Collector childCollector;
private int parentDoc;
private int parentDoc = -1;
private float parentScore;
private int nextChildDoc;
@ -349,18 +349,20 @@ public class BlockJoinQuery extends Query {
return parentDoc = NO_MORE_DOCS;
}
// CHANGE: Remove this and if parentTarget is 0, we can simply call nextdoc
// Every parent must have at least one child:
// assert parentTarget != 0;
if (parentTarget == 0) {
// Callers should only be passing in a docID from
// the parent space, so this means this parent
// has no children (it got docID 0), so it cannot
// possibly match. We must handle this case
// separately otherwise we pass invalid -1 to
// prevSetBit below:
return nextDoc();
}
final int prevParentDoc = parentBits.prevSetBit(parentTarget - 1);
//System.out.println(" rolled back to prevParentDoc=" + prevParentDoc + " vs parentDoc=" + parentDoc);
// CHANGE: Commented out the assert because it might happen with a single nested and parent doc reader
//assert prevParentDoc >= parentDoc;
assert prevParentDoc >= parentDoc;
if (prevParentDoc > nextChildDoc) {
nextChildDoc = childScorer.advance(prevParentDoc);
// System.out.println(" childScorer advanced to child docID=" + nextChildDoc);