From bab7afb07271154f16558782d7f45f44585997d4 Mon Sep 17 00:00:00 2001 From: Yonik Seeley Date: Fri, 11 Sep 2015 23:57:24 +0000 Subject: [PATCH] SOLR-7918: remove dead code in DocSetUtil git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1702572 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/solr/search/DocSetUtil.java | 42 +++---------------- 1 file changed, 5 insertions(+), 37 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/search/DocSetUtil.java b/solr/core/src/java/org/apache/solr/search/DocSetUtil.java index 4f38d74f1ef..590f1bec285 100644 --- a/solr/core/src/java/org/apache/solr/search/DocSetUtil.java +++ b/solr/core/src/java/org/apache/solr/search/DocSetUtil.java @@ -46,43 +46,11 @@ import org.apache.lucene.util.FixedBitSet; /** @lucene.experimental */ public class DocSetUtil { - private static DocSet createDocSetByIterator(SolrIndexSearcher searcher, Filter filter) throws IOException { - int maxDoc = searcher.getIndexReader().maxDoc(); - - Map fcontext = null; - if (filter instanceof SolrFilter) { - fcontext = ValueSource.newContext(searcher); - ((SolrFilter) filter).createWeight(fcontext, searcher); - } - - DocSetCollector collector = new DocSetCollector((maxDoc >> 6) + 5, maxDoc); - - for (LeafReaderContext readerContext : searcher.getIndexReader().getContext().leaves()) { - collector.doSetNextReader(readerContext); - Bits acceptDocs = readerContext.reader().getLiveDocs(); - - DocIdSet docIdSet = filter instanceof SolrFilter - ? ((SolrFilter) filter).getDocIdSet(fcontext, readerContext, acceptDocs) - : filter.getDocIdSet(readerContext, acceptDocs); - - if (docIdSet == null) continue; - DocIdSetIterator iter = docIdSet.iterator(); - - for (;;) { - int id = iter.nextDoc(); - if (id == DocIdSetIterator.NO_MORE_DOCS) { - break; - } - collector.collect(id); - } - - } - - return collector.getDocSet(); - - } - - private static boolean equals(DocSet a, DocSet b) { + /** + * Iterates DocSets to test for equality - slow and for testing purposes only. + * @lucene.internal + */ + public static boolean equals(DocSet a, DocSet b) { DocIterator iter1 = a.iterator(); DocIterator iter2 = b.iterator();