|
|
@@ -40,21 +40,17 @@ import org.apache.lucene.index.LeafReaderContext;
|
|
|
import org.apache.lucene.index.NoMergePolicy;
|
|
|
import org.apache.lucene.index.SegmentCommitInfo;
|
|
|
import org.apache.lucene.index.SegmentInfos;
|
|
|
-import org.apache.lucene.search.Collector;
|
|
|
import org.apache.lucene.search.DocIdSetIterator;
|
|
|
import org.apache.lucene.search.Explanation;
|
|
|
import org.apache.lucene.search.FieldDoc;
|
|
|
import org.apache.lucene.search.IndexSearcher;
|
|
|
-import org.apache.lucene.search.LeafCollector;
|
|
|
import org.apache.lucene.search.Query;
|
|
|
import org.apache.lucene.search.ScoreDoc;
|
|
|
import org.apache.lucene.search.Scorer;
|
|
|
import org.apache.lucene.search.ScorerSupplier;
|
|
|
-import org.apache.lucene.search.SimpleCollector;
|
|
|
import org.apache.lucene.search.SortField;
|
|
|
import org.apache.lucene.search.SortedNumericSortField;
|
|
|
import org.apache.lucene.search.SortedSetSortField;
|
|
|
-import org.apache.lucene.search.TimeLimitingCollector;
|
|
|
import org.apache.lucene.search.TopDocs;
|
|
|
import org.apache.lucene.search.TopFieldDocs;
|
|
|
import org.apache.lucene.search.TwoPhaseIterator;
|
|
|
@@ -66,9 +62,7 @@ import org.apache.lucene.store.IndexInput;
|
|
|
import org.apache.lucene.store.Lock;
|
|
|
import org.apache.lucene.util.Bits;
|
|
|
import org.apache.lucene.util.BytesRef;
|
|
|
-import org.apache.lucene.util.Counter;
|
|
|
import org.apache.lucene.util.Version;
|
|
|
-import org.elasticsearch.ElasticsearchException;
|
|
|
import org.elasticsearch.ExceptionsHelper;
|
|
|
import org.elasticsearch.common.Nullable;
|
|
|
import org.elasticsearch.common.Strings;
|
|
|
@@ -87,7 +81,6 @@ import java.util.Collection;
|
|
|
import java.util.Collections;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
-import java.util.Objects;
|
|
|
|
|
|
public class Lucene {
|
|
|
public static final String LATEST_DOC_VALUES_FORMAT = "Lucene70";
|
|
|
@@ -769,7 +762,7 @@ public class Lucene {
|
|
|
return new Bits.MatchNoBits(maxDoc);
|
|
|
}
|
|
|
// Since we want bits, we need random-access
|
|
|
- final Scorer scorer = scorerSupplier.get(true); // this never returns null
|
|
|
+ final Scorer scorer = scorerSupplier.get(Long.MAX_VALUE); // this never returns null
|
|
|
final TwoPhaseIterator twoPhase = scorer.twoPhaseIterator();
|
|
|
final DocIdSetIterator iterator;
|
|
|
if (twoPhase == null) {
|