LUCENE-2858: fix contrib/sandbox

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene2858@1237340 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2012-01-29 16:51:18 +00:00
parent ba2db71886
commit f85c85c240
2 changed files with 7 additions and 7 deletions

View File

@ -17,7 +17,7 @@ package org.apache.lucene.sandbox.queries;
*/
import org.apache.lucene.index.*;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.Filter;
import org.apache.lucene.util.Bits;
@ -72,13 +72,13 @@ public class DuplicateFilter extends Filter {
@Override
public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) throws IOException {
if (processingMode == ProcessingMode.PM_FAST_INVALIDATION) {
return fastBits(context.reader, acceptDocs);
return fastBits(context.reader(), acceptDocs);
} else {
return correctBits(context.reader, acceptDocs);
return correctBits(context.reader(), acceptDocs);
}
}
private FixedBitSet correctBits(IndexReader reader, Bits acceptDocs) throws IOException {
private FixedBitSet correctBits(AtomicIndexReader reader, Bits acceptDocs) throws IOException {
FixedBitSet bits = new FixedBitSet(reader.maxDoc()); //assume all are INvalid
Terms terms = reader.fields().terms(fieldName);
@ -115,7 +115,7 @@ public class DuplicateFilter extends Filter {
return bits;
}
private FixedBitSet fastBits(IndexReader reader, Bits acceptDocs) throws IOException {
private FixedBitSet fastBits(AtomicIndexReader reader, Bits acceptDocs) throws IOException {
FixedBitSet bits = new FixedBitSet(reader.maxDoc());
bits.set(0, reader.maxDoc()); //assume all are valid
Terms terms = reader.fields().terms(fieldName);

View File

@ -20,7 +20,7 @@ package org.apache.lucene.sandbox.queries;
import java.io.IOException;
import java.text.Collator;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.FieldCache.DocTerms;
import org.apache.lucene.search.FieldComparator;
@ -91,7 +91,7 @@ public final class SlowCollatedStringComparator extends FieldComparator<String>
@Override
public FieldComparator setNextReader(AtomicReaderContext context) throws IOException {
currentDocTerms = FieldCache.DEFAULT.getTerms(context.reader, field);
currentDocTerms = FieldCache.DEFAULT.getTerms(context.reader(), field);
return this;
}