Index: lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermGroupFacetCollector.java =================================================================== --- lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermGroupFacetCollector.java (revision 1454777) +++ lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermGroupFacetCollector.java (working copy) @@ -24,9 +24,7 @@ import org.apache.lucene.index.AtomicReaderContext; import org.apache.lucene.index.DocTermOrds; import org.apache.lucene.index.SortedDocValues; -import org.apache.lucene.index.SortedDocValuesTermsEnum; import org.apache.lucene.index.SortedSetDocValues; -import org.apache.lucene.index.SortedSetDocValuesTermsEnum; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.search.FieldCache; import org.apache.lucene.search.grouping.AbstractGroupFacetCollector; @@ -170,7 +168,7 @@ @Override protected SegmentResult createSegmentResult() throws IOException { - return new SegmentResult(segmentFacetCounts, segmentTotalCount, new SortedDocValuesTermsEnum(facetFieldTermsIndex), startFacetOrd, endFacetOrd); + return new SegmentResult(segmentFacetCounts, segmentTotalCount, facetFieldTermsIndex.termsEnum(), startFacetOrd, endFacetOrd); } private static class SegmentResult extends AbstractGroupFacetCollector.SegmentResult { @@ -289,7 +287,7 @@ if (facetFieldNumTerms == 0) { facetOrdTermsEnum = null; } else { - facetOrdTermsEnum = new SortedSetDocValuesTermsEnum(facetFieldDocTermOrds); + facetOrdTermsEnum = facetFieldDocTermOrds.termsEnum(); } // [facetFieldNumTerms() + 1] for all possible facet values and docs not containing facet field segmentFacetCounts = new int[facetFieldNumTerms + 1]; Index: lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java (revision 1454777) +++ lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java (working copy) @@ -219,7 +219,7 @@ int nTerms = termsIndex.getValueCount(); - TermsEnum tenum = new SortedDocValuesTermsEnum(termsIndex); + TermsEnum tenum = termsIndex.termsEnum(); BytesRef val = new BytesRef(); for (int i=0; i in; + + // this is all for the complicated seek(ord)... + // maybe we should add a FSTEnum that supports this operation? + final FST fst; + final FST.BytesReader bytesReader; + final Arc firstArc = new Arc(); + final Arc scratchArc = new Arc(); + final IntsRef scratchInts = new IntsRef(); + final BytesRef scratchBytes = new BytesRef(); + + FSTTermsEnum(FST fst) { + this.fst = fst; + in = new BytesRefFSTEnum(fst); + bytesReader = fst.getBytesReader(); + } + + @Override + public BytesRef next() throws IOException { + InputOutput io = in.next(); + if (io == null) { + return null; + } else { + return io.input; + } + } + + @Override + public Comparator getComparator() { + return BytesRef.getUTF8SortedAsUnicodeComparator(); + } + + @Override + public SeekStatus seekCeil(BytesRef text, boolean useCache) throws IOException { + if (in.seekCeil(text) == null) { + return SeekStatus.NOT_FOUND; + } else if (term().equals(text)) { + // TODO: add SeekStatus to FSTEnum like in https://issues.apache.org/jira/browse/LUCENE-3729 + // to remove this comparision? + return SeekStatus.FOUND; + } else { + return SeekStatus.NOT_FOUND; + } + } + + @Override + public boolean seekExact(BytesRef text, boolean useCache) throws IOException { + if (in.seekExact(text) == null) { + return false; + } else { + return true; + } + } + + @Override + public void seekExact(long ord) throws IOException { + // TODO: would be better to make this simpler and faster. + // but we dont want to introduce a bug that corrupts our enum state! + bytesReader.setPosition(0); + fst.getFirstArc(firstArc); + IntsRef output = Util.getByOutput(fst, ord, bytesReader, firstArc, scratchArc, scratchInts); + scratchBytes.bytes = new byte[output.length]; + scratchBytes.offset = 0; + scratchBytes.length = 0; + Util.toBytesRef(output, scratchBytes); + // TODO: we could do this lazily, better to try to push into FSTEnum though? + in.seekExact(scratchBytes); + } + + @Override + public BytesRef term() throws IOException { + return in.current().input; + } + + @Override + public long ord() throws IOException { + return in.current().output; + } + + @Override + public int docFreq() throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public long totalTermFreq() throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public DocsEnum docs(Bits liveDocs, DocsEnum reuse, int flags) throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public DocsAndPositionsEnum docsAndPositions(Bits liveDocs, DocsAndPositionsEnum reuse, int flags) throws IOException { + throw new UnsupportedOperationException(); + } + } } Index: lucene/core/src/java/org/apache/lucene/codecs/DocValuesConsumer.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/DocValuesConsumer.java (revision 1454777) +++ lucene/core/src/java/org/apache/lucene/codecs/DocValuesConsumer.java (working copy) @@ -32,9 +32,7 @@ import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.index.SortedDocValues; -import org.apache.lucene.index.SortedDocValuesTermsEnum; import org.apache.lucene.index.SortedSetDocValues; -import org.apache.lucene.index.SortedSetDocValuesTermsEnum; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.Bits; @@ -269,7 +267,7 @@ SortedDocValues dv = dvs[sub]; Bits liveDocs = reader.getLiveDocs(); if (liveDocs == null) { - liveTerms[sub] = new SortedDocValuesTermsEnum(dv); + liveTerms[sub] = dv.termsEnum(); } else { OpenBitSet bitset = new OpenBitSet(dv.getValueCount()); for (int i = 0; i < reader.maxDoc(); i++) { @@ -277,7 +275,7 @@ bitset.set(dv.getOrd(i)); } } - liveTerms[sub] = new BitsFilteredTermsEnum(new SortedDocValuesTermsEnum(dv), bitset); + liveTerms[sub] = new BitsFilteredTermsEnum(dv.termsEnum(), bitset); } } @@ -401,7 +399,7 @@ SortedSetDocValues dv = dvs[sub]; Bits liveDocs = reader.getLiveDocs(); if (liveDocs == null) { - liveTerms[sub] = new SortedSetDocValuesTermsEnum(dv); + liveTerms[sub] = dv.termsEnum(); } else { OpenBitSet bitset = new OpenBitSet(dv.getValueCount()); for (int i = 0; i < reader.maxDoc(); i++) { @@ -413,7 +411,7 @@ } } } - liveTerms[sub] = new BitsFilteredTermsEnum(new SortedSetDocValuesTermsEnum(dv), bitset); + liveTerms[sub] = new BitsFilteredTermsEnum(dv.termsEnum(), bitset); } } Index: lucene/core/src/java/org/apache/lucene/search/DocTermOrdsRewriteMethod.java =================================================================== --- lucene/core/src/java/org/apache/lucene/search/DocTermOrdsRewriteMethod.java (revision 1454777) +++ lucene/core/src/java/org/apache/lucene/search/DocTermOrdsRewriteMethod.java (working copy) @@ -23,7 +23,6 @@ import org.apache.lucene.index.AtomicReaderContext; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.SortedSetDocValues; -import org.apache.lucene.index.SortedSetDocValuesTermsEnum; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.util.Bits; @@ -98,7 +97,7 @@ @Override public TermsEnum iterator(TermsEnum reuse) { - return new SortedSetDocValuesTermsEnum(docTermOrds); + return docTermOrds.termsEnum(); } @Override Index: lucene/core/src/java/org/apache/lucene/search/FieldCacheRewriteMethod.java =================================================================== --- lucene/core/src/java/org/apache/lucene/search/FieldCacheRewriteMethod.java (revision 1454777) +++ lucene/core/src/java/org/apache/lucene/search/FieldCacheRewriteMethod.java (working copy) @@ -23,7 +23,6 @@ import org.apache.lucene.index.AtomicReaderContext; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.SortedDocValues; -import org.apache.lucene.index.SortedDocValuesTermsEnum; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.util.Bits; @@ -98,7 +97,7 @@ @Override public TermsEnum iterator(TermsEnum reuse) { - return new SortedDocValuesTermsEnum(fcsi); + return fcsi.termsEnum(); } @Override Index: lucene/core/src/java/org/apache/lucene/index/SortedSetDocValuesTermsEnum.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/SortedSetDocValuesTermsEnum.java (revision 1454777) +++ lucene/core/src/java/org/apache/lucene/index/SortedSetDocValuesTermsEnum.java (working copy) @@ -26,7 +26,7 @@ /** Implements a {@link TermsEnum} wrapping a provided * {@link SortedSetDocValues}. */ -public class SortedSetDocValuesTermsEnum extends TermsEnum { +class SortedSetDocValuesTermsEnum extends TermsEnum { private final SortedSetDocValues values; private long currentOrd = -1; private final BytesRef term = new BytesRef(); Index: lucene/core/src/java/org/apache/lucene/index/SortedSetDocValues.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/SortedSetDocValues.java (revision 1454777) +++ lucene/core/src/java/org/apache/lucene/index/SortedSetDocValues.java (working copy) @@ -117,4 +117,12 @@ return -(low + 1); // key not found. } + + /** + * Returns a {@link TermsEnum} over the values. + * The enum supports {@link TermsEnum#ord()} and {@link TermsEnum#seekExact(long)}. + */ + public TermsEnum termsEnum() { + return new SortedSetDocValuesTermsEnum(this); + } } Index: lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java (revision 1454777) +++ lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java (working copy) @@ -217,7 +217,7 @@ } else { TermsEnum enums[] = new TermsEnum[values.length]; for (int i = 0; i < values.length; i++) { - enums[i] = new SortedDocValuesTermsEnum(values[i]); + enums[i] = values[i].termsEnum(); } OrdinalMap mapping = new OrdinalMap(r.getCoreCacheKey(), enums); return new MultiSortedDocValues(values, starts, mapping); @@ -261,7 +261,7 @@ } else { TermsEnum enums[] = new TermsEnum[values.length]; for (int i = 0; i < values.length; i++) { - enums[i] = new SortedSetDocValuesTermsEnum(values[i]); + enums[i] = values[i].termsEnum(); } OrdinalMap mapping = new OrdinalMap(r.getCoreCacheKey(), enums); return new MultiSortedSetDocValues(values, starts, mapping); Index: lucene/core/src/java/org/apache/lucene/index/SortedDocValues.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/SortedDocValues.java (revision 1454777) +++ lucene/core/src/java/org/apache/lucene/index/SortedDocValues.java (working copy) @@ -114,4 +114,12 @@ return -(low + 1); // key not found. } + + /** + * Returns a {@link TermsEnum} over the values. + * The enum supports {@link TermsEnum#ord()} and {@link TermsEnum#seekExact(long)}. + */ + public TermsEnum termsEnum() { + return new SortedDocValuesTermsEnum(this); + } } Index: lucene/core/src/java/org/apache/lucene/index/SortedDocValuesTermsEnum.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/SortedDocValuesTermsEnum.java (revision 1454777) +++ lucene/core/src/java/org/apache/lucene/index/SortedDocValuesTermsEnum.java (working copy) @@ -26,7 +26,7 @@ /** Implements a {@link TermsEnum} wrapping a provided * {@link SortedDocValues}. */ -public class SortedDocValuesTermsEnum extends TermsEnum { +class SortedDocValuesTermsEnum extends TermsEnum { private final SortedDocValues values; private int currentOrd = -1; private final BytesRef term = new BytesRef(); Index: solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java =================================================================== --- solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java (revision 1454777) +++ solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java (working copy) @@ -23,7 +23,6 @@ import org.apache.lucene.index.AtomicReaderContext; import org.apache.lucene.index.SortedDocValues; -import org.apache.lucene.index.SortedDocValuesTermsEnum; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.search.DocIdSet; import org.apache.lucene.search.DocIdSetIterator; @@ -155,7 +154,7 @@ seg.pos = seg.startTermIndex; } if (seg.pos < seg.endTermIndex) { - seg.tenum = new SortedDocValuesTermsEnum(seg.si); + seg.tenum = seg.si.termsEnum(); seg.tenum.seekExact(seg.pos); seg.tempBR = seg.tenum.term(); queue.add(seg);