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

LUCENE-3474: don't pull our own liveDocs in MultiPhraseQuery 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1178881 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2011-10-04 17:57:10 +00:00
parent 76fd471b54
commit 2a73ef7e6c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java
View File

@ -179,7 +179,7 @@ public class MultiPhraseQuery extends Query {
int docFreq;
if (terms.length > 1) {
postingsEnum = new UnionDocsAndPositionsEnum(reader, terms);
postingsEnum = new UnionDocsAndPositionsEnum(liveDocs, reader, terms);
// coarse -- this overcounts since a given doc can
// have more than one terms:
@ -435,9 +435,8 @@ class UnionDocsAndPositionsEnum extends DocsAndPositionsEnum {
private DocsQueue _queue;
private IntQueue _posList;
public UnionDocsAndPositionsEnum(IndexReader indexReader, Term[] terms) throws IOException {
public UnionDocsAndPositionsEnum(Bits liveDocs, IndexReader indexReader, Term[] terms) throws IOException {
List<DocsAndPositionsEnum> docsEnums = new LinkedList<DocsAndPositionsEnum>();
final Bits liveDocs = indexReader.getLiveDocs();
for (int i = 0; i < terms.length; i++) {
DocsAndPositionsEnum postings = indexReader.termPositionsEnum(liveDocs,
terms[i].field(),