Index: solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java =================================================================== --- solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java (revision 1436361) +++ solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java (working copy) @@ -13,7 +13,7 @@ import java.util.Map; import java.util.Map.Entry; -import org.apache.lucene.index.DocsAndPositionsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.Fields; import org.apache.lucene.index.IndexReader; @@ -335,7 +335,7 @@ docNL.add(field, fieldNL); BytesRef text; - DocsAndPositionsEnum dpEnum = null; + DocsEnum dpEnum = null; while((text = termsEnum.next()) != null) { String term = text.utf8ToString(); NamedList termInfo = new NamedList(); Index: lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java =================================================================== --- lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (revision 1436361) +++ lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (working copy) @@ -38,8 +38,8 @@ import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.DocValues; import org.apache.lucene.index.DocValues.Source; -import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.DocsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.Fields; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; @@ -198,9 +198,9 @@ while(iwTermsIter.next() != null) { assertNotNull(memTermsIter.next()); assertEquals(iwTermsIter.term(), memTermsIter.term()); - DocsAndPositionsEnum iwDocsAndPos = iwTermsIter.docsAndPositions(null, null); - DocsAndPositionsEnum memDocsAndPos = memTermsIter.docsAndPositions(null, null); - while(iwDocsAndPos.nextDoc() != DocsAndPositionsEnum.NO_MORE_DOCS) { + DocsEnum iwDocsAndPos = iwTermsIter.docsAndPositions(null, null); + DocsEnum memDocsAndPos = memTermsIter.docsAndPositions(null, null); + while(iwDocsAndPos.nextDoc() != DocsEnum.NO_MORE_DOCS) { assertEquals(iwDocsAndPos.docID(), memDocsAndPos.nextDoc()); assertEquals(iwDocsAndPos.freq(), memDocsAndPos.freq()); for (int i = 0; i < iwDocsAndPos.freq(); i++) { @@ -219,7 +219,7 @@ assertEquals(iwTermsIter.term(), memTermsIter.term()); DocsEnum iwDocsAndPos = iwTermsIter.docs(null, null); DocsEnum memDocsAndPos = memTermsIter.docs(null, null); - while(iwDocsAndPos.nextDoc() != DocsAndPositionsEnum.NO_MORE_DOCS) { + while(iwDocsAndPos.nextDoc() != DocsEnum.NO_MORE_DOCS) { assertEquals(iwDocsAndPos.docID(), memDocsAndPos.nextDoc()); assertEquals(iwDocsAndPos.freq(), memDocsAndPos.freq()); } @@ -317,7 +317,7 @@ memory.addField("foo", "bar", analyzer); AtomicReader reader = (AtomicReader) memory.createSearcher().getIndexReader(); assertEquals(1, reader.terms("foo").getSumTotalTermFreq()); - DocsAndPositionsEnum disi = reader.termPositionsEnum(new Term("foo", "bar")); + DocsEnum disi = reader.termPositionsEnum(new Term("foo", "bar")); int docid = disi.docID(); assertTrue(docid == -1 || docid == DocIdSetIterator.NO_MORE_DOCS); assertTrue(disi.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); Index: lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java =================================================================== --- lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (revision 1436361) +++ lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (working copy) @@ -38,7 +38,6 @@ import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.Norm; import org.apache.lucene.index.DocValues; -import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.FieldInfos; import org.apache.lucene.index.FieldInvertState; @@ -933,7 +932,7 @@ } @Override - public DocsAndPositionsEnum docsAndPositions(Bits liveDocs, DocsAndPositionsEnum reuse, int flags) { + public DocsEnum docsAndPositions(Bits liveDocs, DocsEnum reuse, int flags) { if (reuse == null || !(reuse instanceof MemoryDocsAndPositionsEnum)) { reuse = new MemoryDocsAndPositionsEnum(); } @@ -1000,7 +999,7 @@ } } - private class MemoryDocsAndPositionsEnum extends DocsAndPositionsEnum { + private class MemoryDocsAndPositionsEnum extends DocsEnum { private int posUpto; // for assert private boolean hasNext; private Bits liveDocs; @@ -1014,7 +1013,7 @@ this.sliceReader = new SliceReader(intBlockPool); } - public DocsAndPositionsEnum reset(Bits liveDocs, int start, int end, int freq) { + public DocsEnum reset(Bits liveDocs, int start, int end, int freq) { this.liveDocs = liveDocs; this.sliceReader.reset(start, end); posUpto = 0; // for assert Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java (revision 1436361) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java (working copy) @@ -7,7 +7,7 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; -import org.apache.lucene.index.DocsAndPositionsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; @@ -282,7 +282,7 @@ // Make sure position is still incremented when // massive term is skipped: - DocsAndPositionsEnum tps = MultiFields.getTermPositionsEnum(reader, + DocsEnum tps = MultiFields.getTermPositionsEnum(reader, MultiFields.getLiveDocs(reader), "content", new BytesRef("another")); Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java (revision 1436361) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java (working copy) @@ -31,7 +31,7 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; -import org.apache.lucene.index.DocsAndPositionsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.Terms; @@ -111,7 +111,7 @@ TermsEnum termsEnum = vector.iterator(null); termsEnum.next(); assertEquals(2, termsEnum.totalTermFreq()); - DocsAndPositionsEnum positions = termsEnum.docsAndPositions(null, null); + DocsEnum positions = termsEnum.docsAndPositions(null, null); assertTrue(positions.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); assertEquals(2, positions.freq()); positions.nextPosition(); Index: lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java (revision 1436361) +++ lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java (working copy) @@ -36,8 +36,8 @@ import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.TermStats; import org.apache.lucene.codecs.TermsConsumer; -import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.DocsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.FieldInfo.IndexOptions; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.IndexFileNames; @@ -382,7 +382,7 @@ } @Override - public DocsAndPositionsEnum docsAndPositions(Bits liveDocs, DocsAndPositionsEnum reuse, int flags) { + public DocsEnum docsAndPositions(Bits liveDocs, DocsEnum reuse, int flags) { return new RAMDocsAndPositionsEnum(ramField.termToDocs.get(current), liveDocs); } } @@ -435,7 +435,7 @@ } } - private static class RAMDocsAndPositionsEnum extends DocsAndPositionsEnum { + private static class RAMDocsAndPositionsEnum extends DocsEnum { private final RAMTerm ramTerm; private final Bits liveDocs; private RAMDoc current; Index: lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java (revision 1436361) +++ lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java (working copy) @@ -113,7 +113,7 @@ /** Given the same random seed this always enumerates the * same random postings */ - private static class SeedPostings extends DocsAndPositionsEnum { + private static class SeedPostings extends DocsEnum { // Used only to generate docIDs; this way if you pull w/ // or w/o positions you get the same docID sequence: private final Random docRandom; @@ -574,7 +574,6 @@ private static class ThreadState { // Only used with REUSE option: public DocsEnum reuseDocsEnum; - public DocsAndPositionsEnum reuseDocsAndPositionsEnum; } private void verifyEnum(ThreadState threadState, @@ -635,31 +634,29 @@ DocsEnum prevDocsEnum = null; DocsEnum docsEnum; - DocsAndPositionsEnum docsAndPositionsEnum; if (!doCheckPositions) { if (allowPositions && random().nextInt(10) == 7) { // 10% of the time, even though we will not check positions, pull a DocsAndPositions enum if (options.contains(Option.REUSE_ENUMS) && random().nextInt(10) < 9) { - prevDocsEnum = threadState.reuseDocsAndPositionsEnum; + prevDocsEnum = threadState.reuseDocsEnum; } - int flags = 0; + int flags = DocsEnum.FLAG_NONE; if (alwaysTestMax || random().nextBoolean()) { - flags |= DocsAndPositionsEnum.FLAG_OFFSETS; + flags |= DocsEnum.FLAG_OFFSETS; } if (alwaysTestMax || random().nextBoolean()) { - flags |= DocsAndPositionsEnum.FLAG_PAYLOADS; + flags |= DocsEnum.FLAG_PAYLOADS; } if (VERBOSE) { - System.out.println(" get DocsAndPositionsEnum (but we won't check positions) flags=" + flags); + System.out.println(" get DocsEnum (but we won't check positions) flags=" + flags); } - threadState.reuseDocsAndPositionsEnum = termsEnum.docsAndPositions(liveDocs, (DocsAndPositionsEnum) prevDocsEnum, flags); - docsEnum = threadState.reuseDocsAndPositionsEnum; - docsAndPositionsEnum = threadState.reuseDocsAndPositionsEnum; + threadState.reuseDocsEnum = termsEnum.docsAndPositions(liveDocs, prevDocsEnum, flags); + docsEnum = threadState.reuseDocsEnum; } else { if (VERBOSE) { System.out.println(" get DocsEnum"); @@ -669,28 +666,26 @@ } threadState.reuseDocsEnum = termsEnum.docs(liveDocs, prevDocsEnum, doCheckFreqs ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE); docsEnum = threadState.reuseDocsEnum; - docsAndPositionsEnum = null; } } else { if (options.contains(Option.REUSE_ENUMS) && random().nextInt(10) < 9) { - prevDocsEnum = threadState.reuseDocsAndPositionsEnum; + prevDocsEnum = threadState.reuseDocsEnum; } - int flags = 0; + int flags = DocsEnum.FLAG_NONE; if (alwaysTestMax || doCheckOffsets || random().nextInt(3) == 1) { - flags |= DocsAndPositionsEnum.FLAG_OFFSETS; + flags |= DocsEnum.FLAG_OFFSETS; } if (alwaysTestMax || doCheckPayloads|| random().nextInt(3) == 1) { - flags |= DocsAndPositionsEnum.FLAG_PAYLOADS; + flags |= DocsEnum.FLAG_PAYLOADS; } if (VERBOSE) { - System.out.println(" get DocsAndPositionsEnum flags=" + flags); + System.out.println(" get DocsEnum flags=" + flags); } - threadState.reuseDocsAndPositionsEnum = termsEnum.docsAndPositions(liveDocs, (DocsAndPositionsEnum) prevDocsEnum, flags); - docsEnum = threadState.reuseDocsAndPositionsEnum; - docsAndPositionsEnum = threadState.reuseDocsAndPositionsEnum; + threadState.reuseDocsEnum = termsEnum.docsAndPositions(liveDocs, prevDocsEnum, flags); + docsEnum = threadState.reuseDocsEnum; } assertNotNull("null DocsEnum", docsEnum); @@ -832,7 +827,7 @@ if (VERBOSE) { System.out.println(" now nextPosition to " + pos); } - assertEquals("position is wrong", pos, docsAndPositionsEnum.nextPosition()); + assertEquals("position is wrong", pos, docsEnum.nextPosition()); if (doCheckPayloads) { BytesRef expectedPayload = expected.getPayload(); @@ -841,9 +836,9 @@ System.out.println(" now check expectedPayload length=" + (expectedPayload == null ? 0 : expectedPayload.length)); } if (expectedPayload == null || expectedPayload.length == 0) { - assertNull("should not have payload", docsAndPositionsEnum.getPayload()); + assertNull("should not have payload", docsEnum.getPayload()); } else { - BytesRef payload = docsAndPositionsEnum.getPayload(); + BytesRef payload = docsEnum.getPayload(); assertNotNull("should have payload but doesn't", payload); assertEquals("payload length is wrong", expectedPayload.length, payload.length); @@ -855,7 +850,7 @@ // make a deep copy payload = BytesRef.deepCopyOf(payload); - assertEquals("2nd call to getPayload returns something different!", payload, docsAndPositionsEnum.getPayload()); + assertEquals("2nd call to getPayload returns something different!", payload, docsEnum.getPayload()); } } else { if (VERBOSE) { @@ -869,8 +864,8 @@ if (VERBOSE) { System.out.println(" now check offsets: startOff=" + expected.startOffset() + " endOffset=" + expected.endOffset()); } - assertEquals("startOffset is wrong", expected.startOffset(), docsAndPositionsEnum.startOffset()); - assertEquals("endOffset is wrong", expected.endOffset(), docsAndPositionsEnum.endOffset()); + assertEquals("startOffset is wrong", expected.startOffset(), docsEnum.startOffset()); + assertEquals("endOffset is wrong", expected.endOffset(), docsEnum.endOffset()); } else { if (VERBOSE) { System.out.println(" skip check offsets"); @@ -880,8 +875,8 @@ if (VERBOSE) { System.out.println(" now check offsets are -1"); } - assertEquals("startOffset isn't -1", -1, docsAndPositionsEnum.startOffset()); - assertEquals("endOffset isn't -1", -1, docsAndPositionsEnum.endOffset()); + assertEquals("startOffset isn't -1", -1, docsEnum.startOffset()); + assertEquals("endOffset isn't -1", -1, docsEnum.endOffset()); } } } Index: lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java (revision 1436361) +++ lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java (working copy) @@ -124,7 +124,7 @@ } @Override - public DocsAndPositionsEnum docsAndPositions(Bits liveDocs, DocsAndPositionsEnum reuse, int flags) throws IOException { + public DocsEnum docsAndPositions(Bits liveDocs, DocsEnum reuse, int flags) throws IOException { assert state == State.POSITIONED: "docsAndPositions(...) called on unpositioned TermsEnum"; // TODO: should we give this thing a random to be super-evil, @@ -132,7 +132,7 @@ if (reuse instanceof AssertingDocsAndPositionsEnum) { reuse = ((AssertingDocsAndPositionsEnum) reuse).in; } - DocsAndPositionsEnum docs = super.docsAndPositions(liveDocs, reuse, flags); + DocsEnum docs = super.docsAndPositions(liveDocs, reuse, flags); return docs == null ? null : new AssertingDocsAndPositionsEnum(docs); } @@ -266,12 +266,12 @@ } } - static class AssertingDocsAndPositionsEnum extends FilterDocsAndPositionsEnum { + static class AssertingDocsAndPositionsEnum extends FilterDocsEnum { private DocsEnumState state = DocsEnumState.START; private int positionMax = 0; private int positionCount = 0; - public AssertingDocsAndPositionsEnum(DocsAndPositionsEnum in) { + public AssertingDocsAndPositionsEnum(DocsEnum in) { super(in); int docid = in.docID(); assert docid == -1 || docid == DocIdSetIterator.NO_MORE_DOCS : "invalid initial doc id: " + docid; Index: lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java (revision 1436361) +++ lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java (working copy) @@ -61,7 +61,6 @@ import org.apache.lucene.index.CheckIndex; import org.apache.lucene.index.ConcurrentMergeScheduler; import org.apache.lucene.index.DocValues; -import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.FieldInfos; import org.apache.lucene.index.IndexFileNames; @@ -901,13 +900,13 @@ if (random.nextBoolean()) { final int posFlags; switch (random.nextInt(4)) { - case 0: posFlags = 0; break; - case 1: posFlags = DocsAndPositionsEnum.FLAG_OFFSETS; break; - case 2: posFlags = DocsAndPositionsEnum.FLAG_PAYLOADS; break; - default: posFlags = DocsAndPositionsEnum.FLAG_OFFSETS | DocsAndPositionsEnum.FLAG_PAYLOADS; break; + case 0: posFlags = DocsEnum.FLAG_NONE; break; + case 1: posFlags = DocsEnum.FLAG_OFFSETS; break; + case 2: posFlags = DocsEnum.FLAG_PAYLOADS; break; + default: posFlags = DocsEnum.FLAG_OFFSETS | DocsEnum.FLAG_PAYLOADS; break; } // TODO: cast to DocsAndPositionsEnum? - DocsAndPositionsEnum docsAndPositions = termsEnum.docsAndPositions(liveDocs, null, posFlags); + DocsEnum docsAndPositions = termsEnum.docsAndPositions(liveDocs, null, posFlags); if (docsAndPositions != null) { return docsAndPositions; } Index: lucene/facet/src/java/org/apache/lucene/facet/index/FacetsPayloadMigrationReader.java =================================================================== --- lucene/facet/src/java/org/apache/lucene/facet/index/FacetsPayloadMigrationReader.java (revision 1436361) +++ lucene/facet/src/java/org/apache/lucene/facet/index/FacetsPayloadMigrationReader.java (working copy) @@ -31,7 +31,7 @@ import org.apache.lucene.index.DocValues; import org.apache.lucene.index.DocValues.Source; import org.apache.lucene.index.DocValues.Type; -import org.apache.lucene.index.DocsAndPositionsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.FieldInfos; import org.apache.lucene.index.Fields; @@ -78,9 +78,9 @@ private class PayloadMigratingDocValues extends DocValues { - private final DocsAndPositionsEnum dpe; + private final DocsEnum dpe; - public PayloadMigratingDocValues(DocsAndPositionsEnum dpe) { + public PayloadMigratingDocValues(DocsEnum dpe) { this.dpe = dpe; } @@ -103,10 +103,10 @@ private class PayloadMigratingSource extends Source { - private final DocsAndPositionsEnum dpe; + private final DocsEnum dpe; private int curDocID; - protected PayloadMigratingSource(Type type, DocsAndPositionsEnum dpe) { + protected PayloadMigratingSource(Type type, DocsEnum dpe) { super(type); this.dpe = dpe; if (dpe == null) { @@ -209,7 +209,7 @@ if (term == null) { return super.docValues(field); } else { - DocsAndPositionsEnum dpe = null; + DocsEnum dpe = null; Fields fields = fields(); if (fields != null) { Terms terms = fields.terms(term.field()); @@ -217,7 +217,7 @@ TermsEnum te = terms.iterator(null); // no use for reusing if (te.seekExact(term.bytes(), true)) { // we're not expected to be called for deleted documents - dpe = te.docsAndPositions(null, null, DocsAndPositionsEnum.FLAG_PAYLOADS); + dpe = te.docsAndPositions(null, null, DocsEnum.FLAG_PAYLOADS); } } } Index: lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/ParallelTaxonomyArrays.java =================================================================== --- lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/ParallelTaxonomyArrays.java (revision 1436361) +++ lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/ParallelTaxonomyArrays.java (working copy) @@ -4,7 +4,7 @@ import org.apache.lucene.facet.taxonomy.TaxonomyReader; import org.apache.lucene.index.CorruptIndexException; -import org.apache.lucene.index.DocsAndPositionsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiFields; import org.apache.lucene.search.DocIdSetIterator; @@ -144,9 +144,9 @@ // it's ok to use MultiFields because we only iterate on one posting list. // breaking it to loop over the leaves() only complicates code for no // apparent gain. - DocsAndPositionsEnum positions = MultiFields.getTermPositionsEnum(reader, null, + DocsEnum positions = MultiFields.getTermPositionsEnum(reader, null, Consts.FIELD_PAYLOADS, Consts.PAYLOAD_PARENT_BYTES_REF, - DocsAndPositionsEnum.FLAG_PAYLOADS); + DocsEnum.FLAG_PAYLOADS); // shouldn't really happen, if it does, something's wrong if (positions == null || positions.advance(first) == DocIdSetIterator.NO_MORE_DOCS) { Index: lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java =================================================================== --- lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java (revision 1436361) +++ lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java (working copy) @@ -26,7 +26,7 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiFields; -import org.apache.lucene.index.DocsAndPositionsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; @@ -72,7 +72,7 @@ writer.addDocument(doc); IndexReader reader = writer.getReader(); - DocsAndPositionsEnum termPositions = MultiFields.getTermPositionsEnum(reader, + DocsEnum termPositions = MultiFields.getTermPositionsEnum(reader, MultiFields.getLiveDocs(reader), "preanalyzed", new BytesRef("term1")); Index: lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat3.java =================================================================== --- lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat3.java (revision 1436361) +++ lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat3.java (working copy) @@ -40,7 +40,6 @@ import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.index.TermsEnum.SeekStatus; import org.apache.lucene.index.DirectoryReader; -import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; @@ -284,8 +283,8 @@ public void assertTermsEnum(TermsEnum leftTermsEnum, TermsEnum rightTermsEnum, boolean deep) throws Exception { BytesRef term; Bits randomBits = new RandomBits(MAXDOC, random().nextDouble(), random()); - DocsAndPositionsEnum leftPositions = null; - DocsAndPositionsEnum rightPositions = null; + DocsEnum leftPositions = null; + DocsEnum rightPositions = null; DocsEnum leftDocs = null; DocsEnum rightDocs = null; @@ -306,30 +305,30 @@ leftPositions = leftTermsEnum.docsAndPositions(randomBits, leftPositions), rightPositions = rightTermsEnum.docsAndPositions(randomBits, rightPositions)); // with payloads only - assertDocsAndPositionsEnum(leftPositions = leftTermsEnum.docsAndPositions(null, leftPositions, DocsAndPositionsEnum.FLAG_PAYLOADS), - rightPositions = rightTermsEnum.docsAndPositions(null, rightPositions, DocsAndPositionsEnum.FLAG_PAYLOADS)); - assertDocsAndPositionsEnum(leftPositions = leftTermsEnum.docsAndPositions(randomBits, leftPositions, DocsAndPositionsEnum.FLAG_PAYLOADS), - rightPositions = rightTermsEnum.docsAndPositions(randomBits, rightPositions, DocsAndPositionsEnum.FLAG_PAYLOADS)); + assertDocsAndPositionsEnum(leftPositions = leftTermsEnum.docsAndPositions(null, leftPositions, DocsEnum.FLAG_PAYLOADS), + rightPositions = rightTermsEnum.docsAndPositions(null, rightPositions, DocsEnum.FLAG_PAYLOADS)); + assertDocsAndPositionsEnum(leftPositions = leftTermsEnum.docsAndPositions(randomBits, leftPositions, DocsEnum.FLAG_PAYLOADS), + rightPositions = rightTermsEnum.docsAndPositions(randomBits, rightPositions, DocsEnum.FLAG_PAYLOADS)); assertPositionsSkipping(leftTermsEnum.docFreq(), - leftPositions = leftTermsEnum.docsAndPositions(null, leftPositions, DocsAndPositionsEnum.FLAG_PAYLOADS), - rightPositions = rightTermsEnum.docsAndPositions(null, rightPositions, DocsAndPositionsEnum.FLAG_PAYLOADS)); + leftPositions = leftTermsEnum.docsAndPositions(null, leftPositions, DocsEnum.FLAG_PAYLOADS), + rightPositions = rightTermsEnum.docsAndPositions(null, rightPositions, DocsEnum.FLAG_PAYLOADS)); assertPositionsSkipping(leftTermsEnum.docFreq(), - leftPositions = leftTermsEnum.docsAndPositions(randomBits, leftPositions, DocsAndPositionsEnum.FLAG_PAYLOADS), - rightPositions = rightTermsEnum.docsAndPositions(randomBits, rightPositions, DocsAndPositionsEnum.FLAG_PAYLOADS)); + leftPositions = leftTermsEnum.docsAndPositions(randomBits, leftPositions, DocsEnum.FLAG_PAYLOADS), + rightPositions = rightTermsEnum.docsAndPositions(randomBits, rightPositions, DocsEnum.FLAG_PAYLOADS)); // with offsets only - assertDocsAndPositionsEnum(leftPositions = leftTermsEnum.docsAndPositions(null, leftPositions, DocsAndPositionsEnum.FLAG_OFFSETS), - rightPositions = rightTermsEnum.docsAndPositions(null, rightPositions, DocsAndPositionsEnum.FLAG_OFFSETS)); - assertDocsAndPositionsEnum(leftPositions = leftTermsEnum.docsAndPositions(randomBits, leftPositions, DocsAndPositionsEnum.FLAG_OFFSETS), - rightPositions = rightTermsEnum.docsAndPositions(randomBits, rightPositions, DocsAndPositionsEnum.FLAG_OFFSETS)); + assertDocsAndPositionsEnum(leftPositions = leftTermsEnum.docsAndPositions(null, leftPositions, DocsEnum.FLAG_OFFSETS), + rightPositions = rightTermsEnum.docsAndPositions(null, rightPositions, DocsEnum.FLAG_OFFSETS)); + assertDocsAndPositionsEnum(leftPositions = leftTermsEnum.docsAndPositions(randomBits, leftPositions, DocsEnum.FLAG_OFFSETS), + rightPositions = rightTermsEnum.docsAndPositions(randomBits, rightPositions, DocsEnum.FLAG_OFFSETS)); assertPositionsSkipping(leftTermsEnum.docFreq(), - leftPositions = leftTermsEnum.docsAndPositions(null, leftPositions, DocsAndPositionsEnum.FLAG_OFFSETS), - rightPositions = rightTermsEnum.docsAndPositions(null, rightPositions, DocsAndPositionsEnum.FLAG_OFFSETS)); + leftPositions = leftTermsEnum.docsAndPositions(null, leftPositions, DocsEnum.FLAG_OFFSETS), + rightPositions = rightTermsEnum.docsAndPositions(null, rightPositions, DocsEnum.FLAG_OFFSETS)); assertPositionsSkipping(leftTermsEnum.docFreq(), - leftPositions = leftTermsEnum.docsAndPositions(randomBits, leftPositions, DocsAndPositionsEnum.FLAG_OFFSETS), - rightPositions = rightTermsEnum.docsAndPositions(randomBits, rightPositions, DocsAndPositionsEnum.FLAG_OFFSETS)); + leftPositions = leftTermsEnum.docsAndPositions(randomBits, leftPositions, DocsEnum.FLAG_OFFSETS), + rightPositions = rightTermsEnum.docsAndPositions(randomBits, rightPositions, DocsEnum.FLAG_OFFSETS)); // with positions only assertDocsAndPositionsEnum(leftPositions = leftTermsEnum.docsAndPositions(null, leftPositions, DocsEnum.FLAG_NONE), @@ -389,7 +388,7 @@ /** * checks docs + freqs + positions + payloads, sequentially */ - public void assertDocsAndPositionsEnum(DocsAndPositionsEnum leftDocs, DocsAndPositionsEnum rightDocs) throws Exception { + public void assertDocsAndPositionsEnum(DocsEnum leftDocs, DocsEnum rightDocs) throws Exception { if (leftDocs == null || rightDocs == null) { assertNull(leftDocs); assertNull(rightDocs); @@ -462,7 +461,7 @@ /** * checks advancing docs + positions */ - public void assertPositionsSkipping(int docFreq, DocsAndPositionsEnum leftDocs, DocsAndPositionsEnum rightDocs) throws Exception { + public void assertPositionsSkipping(int docFreq, DocsEnum leftDocs, DocsEnum rightDocs) throws Exception { if (leftDocs == null || rightDocs == null) { assertNull(leftDocs); assertNull(rightDocs); Index: lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java (revision 1436361) +++ lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java (working copy) @@ -130,7 +130,7 @@ assertEquals(expectedFields[i], fieldsEnum.next()); assertEquals(3, v.terms(expectedFields[i]).size()); - DocsAndPositionsEnum dpEnum = null; + DocsEnum dpEnum = null; Terms terms = v.terms(expectedFields[i]); assertNotNull(terms); TermsEnum termsEnum = terms.iterator(null); @@ -163,7 +163,7 @@ ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; assertEquals(1, hits.length); - DocsAndPositionsEnum dpEnum = null; + DocsEnum dpEnum = null; for (int i = 0; i < hits.length; i++) { Fields vectors = searcher.reader.getTermVectors(hits[i].doc); assertNotNull(vectors); @@ -427,7 +427,7 @@ assertNotNull(termsEnum.next()); assertEquals("one", termsEnum.term().utf8ToString()); assertEquals(5, termsEnum.totalTermFreq()); - DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null); + DocsEnum dpEnum = termsEnum.docsAndPositions(null, null); assertNotNull(dpEnum); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); assertEquals(5, dpEnum.freq()); Index: lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java (revision 1436361) +++ lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java (working copy) @@ -31,7 +31,7 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.index.AtomicReader; import org.apache.lucene.index.MultiFields; -import org.apache.lucene.index.DocsAndPositionsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SlowCompositeReaderWrapper; @@ -100,7 +100,7 @@ IndexSearcher searcher = newSearcher(reader); - DocsAndPositionsEnum pos = MultiFields.getTermPositionsEnum(searcher.getIndexReader(), + DocsEnum pos = MultiFields.getTermPositionsEnum(searcher.getIndexReader(), MultiFields.getLiveDocs(searcher.getIndexReader()), "field", new BytesRef("1")); @@ -212,7 +212,7 @@ final IndexReader readerFromWriter = writer.getReader(); AtomicReader r = SlowCompositeReaderWrapper.wrap(readerFromWriter); - DocsAndPositionsEnum tp = r.termPositionsEnum(new Term("content", "a")); + DocsEnum tp = r.termPositionsEnum(new Term("content", "a")); int count = 0; assertTrue(tp.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); Index: lucene/core/src/test/org/apache/lucene/index/TestDoc.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestDoc.java (revision 1436361) +++ lucene/core/src/test/org/apache/lucene/index/TestDoc.java (working copy) @@ -260,7 +260,7 @@ out.print(" term=" + field + ":" + tis.term()); out.println(" DF=" + tis.docFreq()); - DocsAndPositionsEnum positions = tis.docsAndPositions(reader.getLiveDocs(), null); + DocsEnum positions = tis.docsAndPositions(reader.getLiveDocs(), null); while (positions.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) { out.print(" doc=" + positions.docID()); Index: lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java (revision 1436361) +++ lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java (working copy) @@ -335,7 +335,7 @@ TermsEnum termsEnum = tfv.iterator(null); assertEquals(new BytesRef(""+counter), termsEnum.next()); assertEquals(1, termsEnum.totalTermFreq()); - DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null); + DocsEnum dpEnum = termsEnum.docsAndPositions(null, null); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); assertEquals(1, dpEnum.freq()); assertEquals(1, dpEnum.nextPosition()); Index: lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java (revision 1436361) +++ lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java (working copy) @@ -128,7 +128,7 @@ writer.close(); SegmentReader reader = new SegmentReader(info, DirectoryReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random())); - DocsAndPositionsEnum termPositions = MultiFields.getTermPositionsEnum(reader, MultiFields.getLiveDocs(reader), + DocsEnum termPositions = MultiFields.getTermPositionsEnum(reader, MultiFields.getLiveDocs(reader), "repeated", new BytesRef("repeated")); assertTrue(termPositions.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); int freq = termPositions.freq(); @@ -200,7 +200,7 @@ writer.close(); SegmentReader reader = new SegmentReader(info, DirectoryReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random())); - DocsAndPositionsEnum termPositions = MultiFields.getTermPositionsEnum(reader, reader.getLiveDocs(), "f1", new BytesRef("a")); + DocsEnum termPositions = MultiFields.getTermPositionsEnum(reader, reader.getLiveDocs(), "f1", new BytesRef("a")); assertTrue(termPositions.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); int freq = termPositions.freq(); assertEquals(3, freq); @@ -243,7 +243,7 @@ writer.close(); SegmentReader reader = new SegmentReader(info, DirectoryReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random())); - DocsAndPositionsEnum termPositions = reader.termPositionsEnum(new Term("preanalyzed", "term1")); + DocsEnum termPositions = reader.termPositionsEnum(new Term("preanalyzed", "term1")); assertTrue(termPositions.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); assertEquals(1, termPositions.freq()); assertEquals(0, termPositions.nextPosition()); Index: lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java (revision 1436361) +++ lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java (working copy) @@ -632,8 +632,8 @@ while(enum1.next() != null) { assertEquals("Different terms", enum1.term(), enum2.next()); - DocsAndPositionsEnum tp1 = enum1.docsAndPositions(liveDocs, null); - DocsAndPositionsEnum tp2 = enum2.docsAndPositions(liveDocs, null); + DocsEnum tp1 = enum1.docsAndPositions(liveDocs, null); + DocsEnum tp2 = enum2.docsAndPositions(liveDocs, null); while(tp1.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) { assertTrue(tp2.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); Index: lucene/core/src/test/org/apache/lucene/index/TestPayloads.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestPayloads.java (revision 1436361) +++ lucene/core/src/test/org/apache/lucene/index/TestPayloads.java (working copy) @@ -184,7 +184,7 @@ byte[] verifyPayloadData = new byte[payloadDataLength]; offset = 0; - DocsAndPositionsEnum[] tps = new DocsAndPositionsEnum[numTerms]; + DocsEnum[] tps = new DocsEnum[numTerms]; for (int i = 0; i < numTerms; i++) { tps[i] = MultiFields.getTermPositionsEnum(reader, MultiFields.getLiveDocs(reader), @@ -215,7 +215,7 @@ /* * test lazy skipping */ - DocsAndPositionsEnum tp = MultiFields.getTermPositionsEnum(reader, + DocsEnum tp = MultiFields.getTermPositionsEnum(reader, MultiFields.getLiveDocs(reader), terms[0].field(), new BytesRef(terms[0].text())); @@ -482,7 +482,7 @@ IndexReader reader = DirectoryReader.open(dir); TermsEnum terms = MultiFields.getFields(reader).terms(field).iterator(null); Bits liveDocs = MultiFields.getLiveDocs(reader); - DocsAndPositionsEnum tp = null; + DocsEnum tp = null; while (terms.next() != null) { String termText = terms.term().utf8ToString(); tp = terms.docsAndPositions(liveDocs, tp); @@ -605,7 +605,7 @@ writer.addDocument(doc); DirectoryReader reader = writer.getReader(); AtomicReader sr = SlowCompositeReaderWrapper.wrap(reader); - DocsAndPositionsEnum de = sr.termPositionsEnum(new Term("field", "withPayload")); + DocsEnum de = sr.termPositionsEnum(new Term("field", "withPayload")); de.nextDoc(); de.nextPosition(); assertEquals(new BytesRef("test"), de.getPayload()); @@ -639,7 +639,7 @@ writer.addDocument(doc); DirectoryReader reader = writer.getReader(); SegmentReader sr = getOnlySegmentReader(reader); - DocsAndPositionsEnum de = sr.termPositionsEnum(new Term("field", "withPayload")); + DocsEnum de = sr.termPositionsEnum(new Term("field", "withPayload")); de.nextDoc(); de.nextPosition(); assertEquals(new BytesRef("test"), de.getPayload()); Index: lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java (revision 1436361) +++ lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java (working copy) @@ -71,7 +71,7 @@ assert terms != null; TermsEnum termsEnum = terms.iterator(null); assertTrue(termsEnum.seekExact(new BytesRef("withPayload"), true)); - DocsAndPositionsEnum de = termsEnum.docsAndPositions(null, null); + DocsEnum de = termsEnum.docsAndPositions(null, null); assertEquals(0, de.nextDoc()); assertEquals(0, de.nextPosition()); assertEquals(new BytesRef("test"), de.getPayload()); @@ -113,7 +113,7 @@ assert terms != null; TermsEnum termsEnum = terms.iterator(null); assertTrue(termsEnum.seekExact(new BytesRef("withPayload"), true)); - DocsAndPositionsEnum de = termsEnum.docsAndPositions(null, null); + DocsEnum de = termsEnum.docsAndPositions(null, null); assertEquals(0, de.nextDoc()); assertEquals(3, de.nextPosition()); assertEquals(new BytesRef("test"), de.getPayload()); Index: lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java (revision 1436361) +++ lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java (working copy) @@ -170,7 +170,7 @@ System.out.println("\nTEST: iter=" + iter + " doS1=" + doS1); } - final DocsAndPositionsEnum postings = MultiFields.getTermPositionsEnum(r, null, "field", new BytesRef(term)); + final DocsEnum postings = MultiFields.getTermPositionsEnum(r, null, "field", new BytesRef(term)); int docID = -1; while(docID < DocIdSetIterator.NO_MORE_DOCS) { Index: lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java (revision 1436361) +++ lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java (working copy) @@ -245,7 +245,7 @@ assertNotNull(vector); assertEquals(testTerms.length, vector.size()); TermsEnum termsEnum = vector.iterator(null); - DocsAndPositionsEnum dpEnum = null; + DocsEnum dpEnum = null; for (int i = 0; i < testTerms.length; i++) { final BytesRef text = termsEnum.next(); assertNotNull(text); @@ -300,7 +300,7 @@ TermsEnum termsEnum = vector.iterator(null); assertNotNull(termsEnum); assertEquals(testTerms.length, vector.size()); - DocsAndPositionsEnum dpEnum = null; + DocsEnum dpEnum = null; for (int i = 0; i < testTerms.length; i++) { final BytesRef text = termsEnum.next(); assertNotNull(text); Index: lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java (revision 1436361) +++ lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java (working copy) @@ -84,7 +84,7 @@ for (int i = 0; i < 2; i++) { counter = 0; - DocsAndPositionsEnum tp = reader.termPositionsEnum(term); + DocsEnum tp = reader.termPositionsEnum(term); checkSkipTo(tp, 14, 185); // no skips checkSkipTo(tp, 17, 190); // one skip on level 0 checkSkipTo(tp, 287, 200); // one skip on level 1, two on level 0 @@ -95,7 +95,7 @@ } } - public void checkSkipTo(DocsAndPositionsEnum tp, int target, int maxCounter) throws IOException { + public void checkSkipTo(DocsEnum tp, int target, int maxCounter) throws IOException { tp.advance(target); if (maxCounter < counter) { fail("Too many bytes read: " + counter + " vs " + maxCounter); Index: lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java (revision 1436361) +++ lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java (working copy) @@ -75,14 +75,14 @@ } @Override - public DocsAndPositionsEnum docsAndPositions(Bits liveDocs, DocsAndPositionsEnum reuse, int flags) throws IOException { - return new TestPositions(super.docsAndPositions(liveDocs, reuse == null ? null : ((FilterDocsAndPositionsEnum) reuse).in, flags)); + public DocsEnum docsAndPositions(Bits liveDocs, DocsEnum reuse, int flags) throws IOException { + return new TestPositions(super.docsAndPositions(liveDocs, reuse == null ? null : ((FilterDocsEnum) reuse).in, flags)); } } /** Filter that only returns odd numbered documents. */ - private static class TestPositions extends FilterDocsAndPositionsEnum { - public TestPositions(DocsAndPositionsEnum in) { + private static class TestPositions extends FilterDocsEnum { + public TestPositions(DocsEnum in) { super(in); } @@ -150,7 +150,7 @@ assertEquals(TermsEnum.SeekStatus.FOUND, terms.seekCeil(new BytesRef("one"))); - DocsAndPositionsEnum positions = terms.docsAndPositions(MultiFields.getLiveDocs(reader), null); + DocsEnum positions = terms.docsAndPositions(MultiFields.getLiveDocs(reader), null); while (positions.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) { assertTrue((positions.docID() % 2) == 1); } @@ -182,7 +182,6 @@ checkOverrideMethods(FilterAtomicReader.FilterTerms.class); checkOverrideMethods(FilterAtomicReader.FilterTermsEnum.class); checkOverrideMethods(FilterAtomicReader.FilterDocsEnum.class); - checkOverrideMethods(FilterAtomicReader.FilterDocsAndPositionsEnum.class); } } Index: lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java (revision 1436361) +++ lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java (working copy) @@ -319,8 +319,8 @@ public void assertTermsEnum(TermsEnum leftTermsEnum, TermsEnum rightTermsEnum, boolean deep) throws Exception { BytesRef term; Bits randomBits = new RandomBits(leftReader.maxDoc(), random().nextDouble(), random()); - DocsAndPositionsEnum leftPositions = null; - DocsAndPositionsEnum rightPositions = null; + DocsEnum leftPositions = null; + DocsEnum rightPositions = null; DocsEnum leftDocs = null; DocsEnum rightDocs = null; @@ -393,7 +393,7 @@ /** * checks docs + freqs + positions + payloads, sequentially */ - public void assertDocsAndPositionsEnum(DocsAndPositionsEnum leftDocs, DocsAndPositionsEnum rightDocs) throws Exception { + public void assertDocsAndPositionsEnum(DocsEnum leftDocs, DocsEnum rightDocs) throws Exception { if (leftDocs == null || rightDocs == null) { assertNull(leftDocs); assertNull(rightDocs); @@ -472,7 +472,7 @@ /** * checks advancing docs + positions */ - public void assertPositionsSkipping(int docFreq, DocsAndPositionsEnum leftDocs, DocsAndPositionsEnum rightDocs) throws Exception { + public void assertPositionsSkipping(int docFreq, DocsEnum leftDocs, DocsEnum rightDocs) throws Exception { if (leftDocs == null || rightDocs == null) { assertNull(leftDocs); assertNull(rightDocs); Index: lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java (revision 1436361) +++ lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java (working copy) @@ -84,7 +84,7 @@ IndexReader r = w.getReader(); w.close(); - DocsAndPositionsEnum dp = MultiFields.getTermPositionsEnum(r, null, "content", new BytesRef("a")); + DocsEnum dp = MultiFields.getTermPositionsEnum(r, null, "content", new BytesRef("a")); assertNotNull(dp); assertEquals(0, dp.nextDoc()); assertEquals(2, dp.freq()); @@ -156,7 +156,7 @@ String terms[] = { "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten", "hundred" }; for (String term : terms) { - DocsAndPositionsEnum dp = MultiFields.getTermPositionsEnum(reader, null, "numbers", new BytesRef(term)); + DocsEnum dp = MultiFields.getTermPositionsEnum(reader, null, "numbers", new BytesRef(term)); int doc; while((doc = dp.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) { String storedNumbers = reader.document(doc).get("numbers"); @@ -184,7 +184,7 @@ for (int j = 0; j < numSkippingTests; j++) { int num = _TestUtil.nextInt(random(), 100, Math.min(numDocs-1, 999)); - DocsAndPositionsEnum dp = MultiFields.getTermPositionsEnum(reader, null, "numbers", new BytesRef("hundred")); + DocsEnum dp = MultiFields.getTermPositionsEnum(reader, null, "numbers", new BytesRef("hundred")); int doc = dp.advance(num); assertEquals(num, doc); int freq = dp.freq(); @@ -296,8 +296,8 @@ //System.out.println("\nsub=" + sub); final TermsEnum termsEnum = sub.fields().terms("content").iterator(null); DocsEnum docs = null; - DocsAndPositionsEnum docsAndPositions = null; - DocsAndPositionsEnum docsAndPositionsAndOffsets = null; + DocsEnum docsAndPositions = null; + DocsEnum docsAndPositionsAndOffsets = null; final int docIDToID[] = FieldCache.DEFAULT.getInts(sub, "id", false); for(String term : terms) { //System.out.println(" term=" + term); @@ -314,7 +314,7 @@ } // explicitly exclude offsets here - docsAndPositions = termsEnum.docsAndPositions(null, docsAndPositions, DocsAndPositionsEnum.FLAG_PAYLOADS); + docsAndPositions = termsEnum.docsAndPositions(null, docsAndPositions, DocsEnum.FLAG_PAYLOADS); assertNotNull(docsAndPositions); //System.out.println(" doc/freq/pos"); while((doc = docsAndPositions.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) { Index: lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java (revision 1436361) +++ lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java (working copy) @@ -155,7 +155,7 @@ writer.close(); IndexReader reader = DirectoryReader.open(directory); - DocsAndPositionsEnum tp = MultiFields.getTermPositionsEnum(reader, + DocsEnum tp = MultiFields.getTermPositionsEnum(reader, MultiFields.getLiveDocs(reader), this.field, new BytesRef("b")); Index: lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java (revision 1436361) +++ lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java (working copy) @@ -42,7 +42,7 @@ } /** - * Simple testcase for {@link DocsAndPositionsEnum} + * Simple testcase for {@link DocsEnum} */ public void testPositionsSimple() throws IOException { Directory directory = newDirectory(); @@ -65,7 +65,7 @@ BytesRef bytes = new BytesRef("1"); IndexReaderContext topReaderContext = reader.getContext(); for (AtomicReaderContext atomicReaderContext : topReaderContext.leaves()) { - DocsAndPositionsEnum docsAndPosEnum = getDocsAndPositions( + DocsEnum docsAndPosEnum = getDocsAndPositions( atomicReaderContext.reader(), bytes, null); assertNotNull(docsAndPosEnum); if (atomicReaderContext.reader().maxDoc() == 0) { @@ -90,7 +90,7 @@ directory.close(); } - public DocsAndPositionsEnum getDocsAndPositions(AtomicReader reader, + public DocsEnum getDocsAndPositions(AtomicReader reader, BytesRef bytes, Bits liveDocs) throws IOException { Terms terms = reader.terms(fieldName); if (terms != null) { @@ -147,7 +147,7 @@ BytesRef bytes = new BytesRef("" + term); IndexReaderContext topReaderContext = reader.getContext(); for (AtomicReaderContext atomicReaderContext : topReaderContext.leaves()) { - DocsAndPositionsEnum docsAndPosEnum = getDocsAndPositions( + DocsEnum docsAndPosEnum = getDocsAndPositions( atomicReaderContext.reader(), bytes, null); assertNotNull(docsAndPosEnum); int initDoc = 0; @@ -301,7 +301,7 @@ IndexReaderContext topReaderContext = reader.getContext(); for (AtomicReaderContext atomicReaderContext : topReaderContext.leaves()) { - DocsAndPositionsEnum docsAndPosEnum = getDocsAndPositions( + DocsEnum docsAndPosEnum = getDocsAndPositions( atomicReaderContext.reader(), bytes, null); assertNotNull(docsAndPosEnum); @@ -359,7 +359,7 @@ writer.addDocument(doc); DirectoryReader reader = writer.getReader(); AtomicReader r = getOnlySegmentReader(reader); - DocsAndPositionsEnum disi = r.termPositionsEnum(new Term("foo", "bar")); + DocsEnum disi = r.termPositionsEnum(new Term("foo", "bar")); int docid = disi.docID(); assertTrue(docid == -1 || docid == DocIdSetIterator.NO_MORE_DOCS); assertTrue(disi.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); Index: lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java (revision 1436361) +++ lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java (working copy) @@ -398,7 +398,7 @@ Fields tv1 = r1.getTermVectors(id1); System.out.println(" d1=" + tv1); if (tv1 != null) { - DocsAndPositionsEnum dpEnum = null; + DocsEnum dpEnum = null; DocsEnum dEnum = null; for (String field : tv1) { System.out.println(" " + field + ":"); @@ -430,7 +430,7 @@ Fields tv2 = r2.getTermVectors(id2); System.out.println(" d2=" + tv2); if (tv2 != null) { - DocsAndPositionsEnum dpEnum = null; + DocsEnum dpEnum = null; DocsEnum dEnum = null; for (String field : tv2) { System.out.println(" " + field + ":"); @@ -618,8 +618,8 @@ assertNotNull(terms2); TermsEnum termsEnum2 = terms2.iterator(null); - DocsAndPositionsEnum dpEnum1 = null; - DocsAndPositionsEnum dpEnum2 = null; + DocsEnum dpEnum1 = null; + DocsEnum dpEnum2 = null; DocsEnum dEnum1 = null; DocsEnum dEnum2 = null; Index: lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java (revision 1436361) +++ lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java (working copy) @@ -944,7 +944,7 @@ Terms tpv = r.getTermVectors(0).terms("field"); TermsEnum termsEnum = tpv.iterator(null); assertNotNull(termsEnum.next()); - DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null); + DocsEnum dpEnum = termsEnum.docsAndPositions(null, null); assertNotNull(dpEnum); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); assertEquals(1, dpEnum.freq()); @@ -1647,7 +1647,7 @@ // Make sure position is still incremented when // massive term is skipped: - DocsAndPositionsEnum tps = MultiFields.getTermPositionsEnum(reader, null, "content", new BytesRef("another")); + DocsEnum tps = MultiFields.getTermPositionsEnum(reader, null, "content", new BytesRef("another")); assertEquals(0, tps.nextDoc()); assertEquals(1, tps.freq()); assertEquals(3, tps.nextPosition()); Index: lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java (revision 1436361) +++ lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java (working copy) @@ -69,7 +69,7 @@ // Token "" occurred once assertEquals(1, termsEnum.totalTermFreq()); - DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null); + DocsEnum dpEnum = termsEnum.docsAndPositions(null, null); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); dpEnum.nextPosition(); assertEquals(8, dpEnum.startOffset()); @@ -118,7 +118,7 @@ IndexReader r = DirectoryReader.open(dir); TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null); assertNotNull(termsEnum.next()); - DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null); + DocsEnum dpEnum = termsEnum.docsAndPositions(null, null); assertEquals(2, termsEnum.totalTermFreq()); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); @@ -153,7 +153,7 @@ IndexReader r = DirectoryReader.open(dir); TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null); assertNotNull(termsEnum.next()); - DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null); + DocsEnum dpEnum = termsEnum.docsAndPositions(null, null); assertEquals(2, termsEnum.totalTermFreq()); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); @@ -192,7 +192,7 @@ IndexReader r = DirectoryReader.open(dir); TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null); assertNotNull(termsEnum.next()); - DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null); + DocsEnum dpEnum = termsEnum.docsAndPositions(null, null); assertEquals(2, termsEnum.totalTermFreq()); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); @@ -228,7 +228,7 @@ IndexReader r = DirectoryReader.open(dir); TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null); assertNotNull(termsEnum.next()); - DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null); + DocsEnum dpEnum = termsEnum.docsAndPositions(null, null); assertEquals(2, termsEnum.totalTermFreq()); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); @@ -265,7 +265,7 @@ IndexReader r = DirectoryReader.open(dir); TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null); assertNotNull(termsEnum.next()); - DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null); + DocsEnum dpEnum = termsEnum.docsAndPositions(null, null); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); dpEnum.nextPosition(); @@ -310,7 +310,7 @@ IndexReader r = DirectoryReader.open(dir); TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null); assertNotNull(termsEnum.next()); - DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null); + DocsEnum dpEnum = termsEnum.docsAndPositions(null, null); assertEquals(1, (int) termsEnum.totalTermFreq()); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); @@ -353,7 +353,7 @@ IndexReader r = DirectoryReader.open(dir); TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null); assertNotNull(termsEnum.next()); - DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null); + DocsEnum dpEnum = termsEnum.docsAndPositions(null, null); assertEquals(1, (int) termsEnum.totalTermFreq()); assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); Index: lucene/core/src/test/org/apache/lucene/index/TestCodecs.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestCodecs.java (revision 1436361) +++ lucene/core/src/test/org/apache/lucene/index/TestCodecs.java (working copy) @@ -430,7 +430,7 @@ assertTrue(doc != DocIdSetIterator.NO_MORE_DOCS); assertEquals(docs[i], doc); if (doPos) { - this.verifyPositions(positions[i], ((DocsAndPositionsEnum) docsEnum)); + this.verifyPositions(positions[i], docsEnum); } } assertEquals(DocIdSetIterator.NO_MORE_DOCS, docsEnum.nextDoc()); @@ -438,7 +438,7 @@ byte[] data = new byte[10]; - private void verifyPositions(final PositionData[] positions, final DocsAndPositionsEnum posEnum) throws Throwable { + private void verifyPositions(final PositionData[] positions, final DocsEnum posEnum) throws Throwable { for(int i=0;i * - * @see org.apache.lucene.index.DocsAndPositionsEnum + * @see org.apache.lucene.index.DocsEnum */ public interface PositionIncrementAttribute extends Attribute { /** Set the position increment. The default value is one. Index: lucene/core/src/java/org/apache/lucene/analysis/Token.java =================================================================== --- lucene/core/src/java/org/apache/lucene/analysis/Token.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/analysis/Token.java (working copy) @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.PositionLengthAttribute; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; -import org.apache.lucene.index.DocsAndPositionsEnum; // for javadoc +import org.apache.lucene.index.DocsEnum; // for javadoc import org.apache.lucene.util.Attribute; import org.apache.lucene.util.AttributeSource; import org.apache.lucene.util.AttributeImpl; @@ -47,7 +47,7 @@ with type "eos". The default token type is "word".

A Token can optionally have metadata (a.k.a. payload) in the form of a variable - length byte array. Use {@link DocsAndPositionsEnum#getPayload()} to retrieve the + length byte array. Use {@link DocsEnum#getPayload()} to retrieve the payloads from the index.

Index: lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java (working copy) @@ -28,8 +28,8 @@ import org.apache.lucene.codecs.CodecUtil; import org.apache.lucene.codecs.TermVectorsReader; -import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.DocsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.FieldInfos; import org.apache.lucene.index.Fields; @@ -542,7 +542,7 @@ } @Override - public DocsEnum docs(Bits liveDocs, DocsEnum reuse, int flags /* ignored */) throws IOException { + public DocsEnum docs(Bits liveDocs, DocsEnum reuse, int flags) throws IOException { TVDocsEnum docsEnum; if (reuse != null && reuse instanceof TVDocsEnum) { docsEnum = (TVDocsEnum) reuse; @@ -554,7 +554,7 @@ } @Override - public DocsAndPositionsEnum docsAndPositions(Bits liveDocs, DocsAndPositionsEnum reuse, int flags) throws IOException { + public DocsEnum docsAndPositions(Bits liveDocs, DocsEnum reuse, int flags) throws IOException { if (!storePositions && !storeOffsets) { return null; @@ -621,7 +621,7 @@ } } - private static class TVDocsAndPositionsEnum extends DocsAndPositionsEnum { + private static class TVDocsAndPositionsEnum extends DocsEnum { private boolean didNext; private int doc = -1; private int nextPos; Index: lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsReader.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsReader.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsReader.java (working copy) @@ -23,8 +23,8 @@ import org.apache.lucene.codecs.BlockTermState; import org.apache.lucene.codecs.CodecUtil; import org.apache.lucene.codecs.PostingsReaderBase; -import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.DocsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.FieldInfo.IndexOptions; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.FieldInfos; @@ -261,8 +261,8 @@ } @Override - public DocsAndPositionsEnum docsAndPositions(FieldInfo fieldInfo, BlockTermState termState, Bits liveDocs, - DocsAndPositionsEnum reuse, int flags) + public DocsEnum docsAndPositions(FieldInfo fieldInfo, BlockTermState termState, Bits liveDocs, + DocsEnum reuse, int flags) throws IOException { boolean hasOffsets = fieldInfo.getIndexOptions().compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS) >= 0; @@ -691,7 +691,7 @@ // TODO specialize DocsAndPosEnum too // Decodes docs & positions. payloads nor offsets are present. - private final class SegmentDocsAndPositionsEnum extends DocsAndPositionsEnum { + private final class SegmentDocsAndPositionsEnum extends DocsEnum { final IndexInput startFreqIn; private final IndexInput freqIn; private final IndexInput proxIn; @@ -889,7 +889,7 @@ } // Decodes docs & positions & (payloads and/or offsets) - private class SegmentFullPositionsEnum extends DocsAndPositionsEnum { + private class SegmentFullPositionsEnum extends DocsEnum { final IndexInput startFreqIn; private final IndexInput freqIn; private final IndexInput proxIn; Index: lucene/core/src/java/org/apache/lucene/codecs/MappingMultiDocsAndPositionsEnum.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/MappingMultiDocsAndPositionsEnum.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/codecs/MappingMultiDocsAndPositionsEnum.java (working copy) @@ -18,10 +18,10 @@ */ import org.apache.lucene.util.BytesRef; -import org.apache.lucene.index.DocsAndPositionsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.MergeState; -import org.apache.lucene.index.MultiDocsAndPositionsEnum; -import org.apache.lucene.index.MultiDocsAndPositionsEnum.EnumWithSlice; +import org.apache.lucene.index.MultiDocsEnum; +import org.apache.lucene.index.MultiDocsEnum.EnumWithSlice; import java.io.IOException; @@ -32,12 +32,12 @@ * @lucene.experimental */ -public final class MappingMultiDocsAndPositionsEnum extends DocsAndPositionsEnum { - private MultiDocsAndPositionsEnum.EnumWithSlice[] subs; +public final class MappingMultiDocsAndPositionsEnum extends DocsEnum { + private MultiDocsEnum.EnumWithSlice[] subs; int numSubs; int upto; MergeState.DocMap currentMap; - DocsAndPositionsEnum current; + DocsEnum current; int currentBase; int doc = -1; private MergeState mergeState; @@ -46,7 +46,7 @@ public MappingMultiDocsAndPositionsEnum() { } - MappingMultiDocsAndPositionsEnum reset(MultiDocsAndPositionsEnum postingsEnum) { + MappingMultiDocsAndPositionsEnum reset(MultiDocsEnum postingsEnum) { this.numSubs = postingsEnum.getNumSubs(); this.subs = postingsEnum.getSubs(); upto = -1; @@ -95,7 +95,7 @@ } else { upto++; final int reader = subs[upto].slice.readerIndex; - current = subs[upto].docsAndPositionsEnum; + current = subs[upto].docsEnum; currentBase = mergeState.docBase[reader]; currentMap = mergeState.docMaps[reader]; } Index: lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41PostingsReader.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41PostingsReader.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41PostingsReader.java (working copy) @@ -27,8 +27,8 @@ import org.apache.lucene.codecs.BlockTermState; import org.apache.lucene.codecs.CodecUtil; import org.apache.lucene.codecs.PostingsReaderBase; -import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.DocsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.FieldInfo.IndexOptions; import org.apache.lucene.index.FieldInfos; @@ -296,15 +296,15 @@ // TODO: specialize to liveDocs vs not @Override - public DocsAndPositionsEnum docsAndPositions(FieldInfo fieldInfo, BlockTermState termState, Bits liveDocs, - DocsAndPositionsEnum reuse, int flags) + public DocsEnum docsAndPositions(FieldInfo fieldInfo, BlockTermState termState, Bits liveDocs, + DocsEnum reuse, int flags) throws IOException { boolean indexHasOffsets = fieldInfo.getIndexOptions().compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS) >= 0; boolean indexHasPayloads = fieldInfo.hasPayloads(); - if ((!indexHasOffsets || (flags & DocsAndPositionsEnum.FLAG_OFFSETS) == 0) && - (!indexHasPayloads || (flags & DocsAndPositionsEnum.FLAG_PAYLOADS) == 0)) { + if ((!indexHasOffsets || (flags & DocsEnum.FLAG_OFFSETS) == 0) && + (!indexHasPayloads || (flags & DocsEnum.FLAG_PAYLOADS) == 0)) { BlockDocsAndPositionsEnum docsAndPositionsEnum; if (reuse instanceof BlockDocsAndPositionsEnum) { docsAndPositionsEnum = (BlockDocsAndPositionsEnum) reuse; @@ -602,7 +602,7 @@ } - final class BlockDocsAndPositionsEnum extends DocsAndPositionsEnum { + final class BlockDocsAndPositionsEnum extends DocsEnum { private final byte[] encoded; @@ -680,7 +680,7 @@ indexHasPayloads == fieldInfo.hasPayloads(); } - public DocsAndPositionsEnum reset(Bits liveDocs, IntBlockTermState termState) throws IOException { + public DocsEnum reset(Bits liveDocs, IntBlockTermState termState) throws IOException { this.liveDocs = liveDocs; // if (DEBUG) { // System.out.println(" FPR.reset: termState=" + termState); @@ -1013,7 +1013,7 @@ } // Also handles payloads + offsets - final class EverythingEnum extends DocsAndPositionsEnum { + final class EverythingEnum extends DocsEnum { private final byte[] encoded; @@ -1162,8 +1162,8 @@ lastPosBlockFP = posTermStartFP + termState.lastPosBlockOffset; } - this.needsOffsets = (flags & DocsAndPositionsEnum.FLAG_OFFSETS) != 0; - this.needsPayloads = (flags & DocsAndPositionsEnum.FLAG_PAYLOADS) != 0; + this.needsOffsets = (flags & DocsEnum.FLAG_OFFSETS) != 0; + this.needsPayloads = (flags & DocsEnum.FLAG_PAYLOADS) != 0; doc = -1; accum = 0; Index: lucene/core/src/java/org/apache/lucene/codecs/MappingMultiDocsEnum.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/MappingMultiDocsEnum.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/codecs/MappingMultiDocsEnum.java (working copy) @@ -21,6 +21,7 @@ import org.apache.lucene.index.MergeState; import org.apache.lucene.index.MultiDocsEnum; import org.apache.lucene.index.MultiDocsEnum.EnumWithSlice; +import org.apache.lucene.util.BytesRef; import java.io.IOException; @@ -84,8 +85,28 @@ public int advance(int target) { throw new UnsupportedOperationException(); } + + @Override + public int nextPosition() throws IOException { + return current.nextPosition(); + } @Override + public int startOffset() throws IOException { + return current.startOffset(); + } + + @Override + public int endOffset() throws IOException { + return current.endOffset(); + } + + @Override + public BytesRef getPayload() throws IOException { + return current.getPayload(); + } + + @Override public int nextDoc() throws IOException { while(true) { if (current == null) { Index: lucene/core/src/java/org/apache/lucene/codecs/PostingsReaderBase.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/PostingsReaderBase.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/codecs/PostingsReaderBase.java (working copy) @@ -21,7 +21,7 @@ import java.io.Closeable; import org.apache.lucene.index.DocsEnum; -import org.apache.lucene.index.DocsAndPositionsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.store.IndexInput; import org.apache.lucene.util.Bits; @@ -29,7 +29,7 @@ /** The core terms dictionaries (BlockTermsReader, * BlockTreeTermsReader) interact with a single instance * of this class to manage creation of {@link DocsEnum} and - * {@link DocsAndPositionsEnum} instances. It provides an + * {@link DocsEnum} instances. It provides an * IndexInput (termsIn) where this class may read any * previously stored data that it had written in its * corresponding {@link PostingsWriterBase} at indexing @@ -63,8 +63,9 @@ /** Must fully consume state, since after this call that * TermState may be reused. */ - public abstract DocsAndPositionsEnum docsAndPositions(FieldInfo fieldInfo, BlockTermState state, Bits skipDocs, DocsAndPositionsEnum reuse, + public abstract DocsEnum docsAndPositions(FieldInfo fieldInfo, BlockTermState state, Bits skipDocs, DocsEnum reuse, int flags) throws IOException; + // nocommit this still has the distinction - no need to remove this as long as we get the interface straight? @Override public abstract void close() throws IOException; Index: lucene/core/src/java/org/apache/lucene/codecs/TermsConsumer.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/TermsConsumer.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/codecs/TermsConsumer.java (working copy) @@ -21,13 +21,11 @@ import java.util.Comparator; import org.apache.lucene.index.FieldInfo; // javadocs -import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.FieldInfo.IndexOptions; import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.MergeState; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.index.MultiDocsEnum; -import org.apache.lucene.index.MultiDocsAndPositionsEnum; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.FixedBitSet; @@ -153,11 +151,11 @@ postingsEnum = new MappingMultiDocsAndPositionsEnum(); } postingsEnum.setMergeState(mergeState); - MultiDocsAndPositionsEnum postingsEnumIn = null; + MultiDocsEnum postingsEnumIn = null; while((term = termsEnum.next()) != null) { // We can pass null for liveDocs, because the // mapping enum will skip the non-live docs: - postingsEnumIn = (MultiDocsAndPositionsEnum) termsEnum.docsAndPositions(null, postingsEnumIn, DocsAndPositionsEnum.FLAG_PAYLOADS); + postingsEnumIn = (MultiDocsEnum) termsEnum.docsAndPositions(null, postingsEnumIn); assert postingsEnumIn != null; postingsEnum.reset(postingsEnumIn); @@ -180,11 +178,11 @@ postingsEnum = new MappingMultiDocsAndPositionsEnum(); } postingsEnum.setMergeState(mergeState); - MultiDocsAndPositionsEnum postingsEnumIn = null; + MultiDocsEnum postingsEnumIn = null; while((term = termsEnum.next()) != null) { // We can pass null for liveDocs, because the // mapping enum will skip the non-live docs: - postingsEnumIn = (MultiDocsAndPositionsEnum) termsEnum.docsAndPositions(null, postingsEnumIn); + postingsEnumIn = (MultiDocsEnum) termsEnum.docsAndPositions(null, postingsEnumIn); assert postingsEnumIn != null; postingsEnum.reset(postingsEnumIn); Index: lucene/core/src/java/org/apache/lucene/codecs/PostingsConsumer.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/PostingsConsumer.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/codecs/PostingsConsumer.java (working copy) @@ -19,7 +19,6 @@ import java.io.IOException; -import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.MergeState; import org.apache.lucene.index.FieldInfo.IndexOptions; @@ -105,7 +104,7 @@ totTF += freq; } } else if (indexOptions == IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) { - final DocsAndPositionsEnum postingsEnum = (DocsAndPositionsEnum) postings; + final DocsEnum postingsEnum = postings; while(true) { final int doc = postingsEnum.nextDoc(); if (doc == DocIdSetIterator.NO_MORE_DOCS) { @@ -125,7 +124,7 @@ } } else { assert indexOptions == IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS; - final DocsAndPositionsEnum postingsEnum = (DocsAndPositionsEnum) postings; + final DocsEnum postingsEnum = postings; while(true) { final int doc = postingsEnum.nextDoc(); if (doc == DocIdSetIterator.NO_MORE_DOCS) { Index: lucene/core/src/java/org/apache/lucene/codecs/TermVectorsReader.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/TermVectorsReader.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/codecs/TermVectorsReader.java (working copy) @@ -21,7 +21,7 @@ import java.io.IOException; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; // javadocs -import org.apache.lucene.index.DocsAndPositionsEnum; // javadocs +import org.apache.lucene.index.DocsEnum; // javadocs import org.apache.lucene.index.Fields; /** @@ -39,7 +39,7 @@ /** Returns term vectors for this document, or null if * term vectors were not indexed. If offsets are * available they are in an {@link OffsetAttribute} - * available from the {@link DocsAndPositionsEnum}. */ + * available from the {@link DocsEnum}. */ public abstract Fields get(int doc) throws IOException; /** Create a clone that one caller at a time may use to Index: lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java (working copy) @@ -28,8 +28,8 @@ import java.util.TreeMap; import org.apache.lucene.index.CorruptIndexException; -import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.DocsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.FieldInfo.IndexOptions; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.FieldInfos; @@ -963,7 +963,7 @@ } @Override - public DocsAndPositionsEnum docsAndPositions(Bits skipDocs, DocsAndPositionsEnum reuse, int flags) throws IOException { + public DocsEnum docsAndPositions(Bits skipDocs, DocsEnum reuse, int flags) throws IOException { if (fieldInfo.getIndexOptions().compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) < 0) { // Positions were not indexed: return null; @@ -2189,13 +2189,11 @@ } @Override - public DocsAndPositionsEnum docsAndPositions(Bits skipDocs, DocsAndPositionsEnum reuse, int flags) throws IOException { + public DocsEnum docsAndPositions(Bits skipDocs, DocsEnum reuse, int flags) throws IOException { if (fieldInfo.getIndexOptions().compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) < 0) { // Positions were not indexed: return null; } - - assert !eof; currentFrame.decodeMetaData(); return postingsReader.docsAndPositions(fieldInfo, currentFrame.state, skipDocs, reuse, flags); } Index: lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java (working copy) @@ -23,7 +23,7 @@ import java.util.Iterator; import org.apache.lucene.index.AtomicReader; -import org.apache.lucene.index.DocsAndPositionsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.FieldInfos; import org.apache.lucene.index.Fields; @@ -224,7 +224,7 @@ String lastFieldName = null; TermsEnum termsEnum = null; - DocsAndPositionsEnum docsAndPositionsEnum = null; + DocsEnum docsAndPositionsEnum = null; int fieldCount = 0; for(String fieldName : vectors) { @@ -281,7 +281,7 @@ final BytesRef payload = docsAndPositionsEnum.getPayload(); - assert !hasPositions || pos >= 0; + assert !hasPositions || pos >= 0 ; addPosition(pos, startOffset, endOffset, payload); } } Index: lucene/core/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java =================================================================== --- lucene/core/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java (working copy) @@ -19,7 +19,7 @@ import org.apache.lucene.index.AtomicReaderContext; import org.apache.lucene.index.Term; -import org.apache.lucene.index.DocsAndPositionsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Scorer; import org.apache.lucene.search.Weight; @@ -121,7 +121,7 @@ protected void processPayload(Similarity similarity) throws IOException { if (termSpans.isPayloadAvailable()) { - final DocsAndPositionsEnum postings = termSpans.getPostings(); + final DocsEnum postings = termSpans.getPostings(); payload = postings.getPayload(); if (payload != null) { payloadScore = function.currentScore(doc, term.field(), Index: lucene/core/src/java/org/apache/lucene/search/PhrasePositions.java =================================================================== --- lucene/core/src/java/org/apache/lucene/search/PhrasePositions.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/search/PhrasePositions.java (working copy) @@ -29,13 +29,13 @@ int count; // remaining pos in this doc int offset; // position in phrase final int ord; // unique across all PhrasePositions instances - final DocsAndPositionsEnum postings; // stream of docs & positions + final DocsEnum postings; // stream of docs & positions PhrasePositions next; // used to make lists int rptGroup = -1; // >=0 indicates that this is a repeating PP int rptInd; // index in the rptGroup final Term[] terms; // for repetitions initialization - PhrasePositions(DocsAndPositionsEnum postings, int o, int ord, Term[] terms) { + PhrasePositions(DocsEnum postings, int o, int ord, Term[] terms) { this.postings = postings; offset = o; this.ord = ord; Index: lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java =================================================================== --- lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java (working copy) @@ -35,7 +35,7 @@ boolean noDocs; private final static class ChunkState { - final DocsAndPositionsEnum posEnum; + final DocsEnum posEnum; final int offset; final boolean useAdvance; int posUpto; @@ -43,7 +43,7 @@ int pos; int lastPos; - public ChunkState(DocsAndPositionsEnum posEnum, int offset, boolean useAdvance) { + public ChunkState(DocsEnum posEnum, int offset, boolean useAdvance) { this.posEnum = posEnum; this.offset = offset; this.useAdvance = useAdvance; Index: lucene/core/src/java/org/apache/lucene/search/FuzzyTermsEnum.java =================================================================== --- lucene/core/src/java/org/apache/lucene/search/FuzzyTermsEnum.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/search/FuzzyTermsEnum.java (working copy) @@ -22,8 +22,8 @@ import java.util.Comparator; import java.util.List; -import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.DocsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.Term; import org.apache.lucene.index.TermState; import org.apache.lucene.index.Terms; @@ -277,8 +277,8 @@ } @Override - public DocsAndPositionsEnum docsAndPositions(Bits liveDocs, - DocsAndPositionsEnum reuse, int flags) throws IOException { + public DocsEnum docsAndPositions(Bits liveDocs, + DocsEnum reuse, int flags) throws IOException { return actualEnum.docsAndPositions(liveDocs, reuse, flags); } Index: lucene/core/src/java/org/apache/lucene/search/spans/TermSpans.java =================================================================== --- lucene/core/src/java/org/apache/lucene/search/spans/TermSpans.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/search/spans/TermSpans.java (working copy) @@ -17,7 +17,7 @@ import org.apache.lucene.index.Term; -import org.apache.lucene.index.DocsAndPositionsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.util.BytesRef; @@ -30,7 +30,7 @@ * Public for extension only */ public class TermSpans extends Spans { - protected final DocsAndPositionsEnum postings; + protected final DocsEnum postings; protected final Term term; protected int doc; protected int freq; @@ -38,7 +38,7 @@ protected int position; protected boolean readPayload; - public TermSpans(DocsAndPositionsEnum postings, Term term) { + public TermSpans(DocsEnum postings, Term term) { this.postings = postings; this.term = term; doc = -1; @@ -126,7 +126,7 @@ (doc == -1 ? "START" : (doc == Integer.MAX_VALUE) ? "END" : doc + "-" + position); } - public DocsAndPositionsEnum getPostings() { + public DocsEnum getPostings() { return postings; } Index: lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java =================================================================== --- lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java (working copy) @@ -20,7 +20,7 @@ import org.apache.lucene.index.AtomicReaderContext; import org.apache.lucene.index.Fields; import org.apache.lucene.index.Term; -import org.apache.lucene.index.DocsAndPositionsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.TermContext; import org.apache.lucene.index.TermState; import org.apache.lucene.index.Terms; @@ -120,7 +120,7 @@ final TermsEnum termsEnum = context.reader().terms(term.field()).iterator(null); termsEnum.seekExact(term.bytes(), state); - final DocsAndPositionsEnum postings = termsEnum.docsAndPositions(acceptDocs, null, DocsAndPositionsEnum.FLAG_PAYLOADS); + final DocsEnum postings = termsEnum.docsAndPositions(acceptDocs, null, DocsEnum.FLAG_PAYLOADS); if (postings != null) { return new TermSpans(postings, term); Index: lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java =================================================================== --- lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java (working copy) @@ -21,7 +21,7 @@ import java.util.*; import org.apache.lucene.index.AtomicReaderContext; -import org.apache.lucene.index.DocsAndPositionsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.AtomicReader; import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.IndexReader; @@ -193,7 +193,7 @@ for (int pos=0; pos 1) { @@ -409,15 +409,15 @@ */ // TODO: if ever we allow subclassing of the *PhraseScorer -class UnionDocsAndPositionsEnum extends DocsAndPositionsEnum { +class UnionDocsAndPositionsEnum extends DocsEnum { - private static final class DocsQueue extends PriorityQueue { - DocsQueue(List docsEnums) throws IOException { + private static final class DocsQueue extends PriorityQueue { + DocsQueue(List docsEnums) throws IOException { super(docsEnums.size()); - Iterator i = docsEnums.iterator(); + Iterator i = docsEnums.iterator(); while (i.hasNext()) { - DocsAndPositionsEnum postings = i.next(); + DocsEnum postings = i.next(); if (postings.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) { add(postings); } @@ -425,7 +425,7 @@ } @Override - public final boolean lessThan(DocsAndPositionsEnum a, DocsAndPositionsEnum b) { + public final boolean lessThan(DocsEnum a, DocsEnum b) { return a.docID() < b.docID(); } } @@ -474,7 +474,7 @@ private IntQueue _posList; public UnionDocsAndPositionsEnum(Bits liveDocs, AtomicReaderContext context, Term[] terms, Map termContexts, TermsEnum termsEnum) throws IOException { - List docsEnums = new LinkedList(); + List docsEnums = new LinkedList(); for (int i = 0; i < terms.length; i++) { final Term term = terms[i]; TermState termState = termContexts.get(term).get(context.ord); @@ -483,7 +483,7 @@ continue; } termsEnum.seekExact(term.bytes(), termState); - DocsAndPositionsEnum postings = termsEnum.docsAndPositions(liveDocs, null, DocsEnum.FLAG_NONE); + DocsEnum postings = termsEnum.docsAndPositions(liveDocs, null, DocsEnum.FLAG_NONE); if (postings == null) { // term does exist, but has no positions throw new IllegalStateException("field \"" + term.field() + "\" was indexed without position data; cannot run PhraseQuery (term=" + term.text() + ")"); @@ -508,7 +508,7 @@ _doc = _queue.top().docID(); // merge sort all positions together - DocsAndPositionsEnum postings; + DocsEnum postings; do { postings = _queue.top(); @@ -553,7 +553,7 @@ @Override public final int advance(int target) throws IOException { while (_queue.top() != null && target > _queue.top().docID()) { - DocsAndPositionsEnum postings = _queue.pop(); + DocsEnum postings = _queue.pop(); if (postings.advance(target) != NO_MORE_DOCS) { _queue.add(postings); } Index: lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java =================================================================== --- lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java (working copy) @@ -23,8 +23,8 @@ import java.util.Set; import org.apache.lucene.index.AtomicReaderContext; -import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.DocsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.AtomicReader; import org.apache.lucene.index.IndexReaderContext; @@ -134,13 +134,13 @@ } static class PostingsAndFreq implements Comparable { - final DocsAndPositionsEnum postings; + final DocsEnum postings; final int docFreq; final int position; final Term[] terms; final int nTerms; // for faster comparisons - public PostingsAndFreq(DocsAndPositionsEnum postings, int docFreq, int position, Term... terms) { + public PostingsAndFreq(DocsEnum postings, int docFreq, int position, Term... terms) { this.postings = postings; this.docFreq = docFreq; this.position = position; @@ -264,7 +264,7 @@ return null; } te.seekExact(t.bytes(), state); - DocsAndPositionsEnum postingsEnum = te.docsAndPositions(liveDocs, null, DocsEnum.FLAG_NONE); + DocsEnum postingsEnum = te.docsAndPositions(liveDocs, null, DocsEnum.FLAG_NONE); // PhraseQuery on a field that did not index // positions. Index: lucene/core/src/java/org/apache/lucene/search/FieldCacheImpl.java =================================================================== --- lucene/core/src/java/org/apache/lucene/search/FieldCacheImpl.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/search/FieldCacheImpl.java (working copy) @@ -27,8 +27,8 @@ import java.util.WeakHashMap; import org.apache.lucene.index.DocTermOrds; -import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.DocsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.AtomicReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.OrdTermState; @@ -1064,7 +1064,7 @@ } @Override - public DocsAndPositionsEnum docsAndPositions(Bits liveDocs, DocsAndPositionsEnum reuse, int flags) throws IOException { + public DocsEnum docsAndPositions(Bits liveDocs, DocsEnum reuse, int flags) throws IOException { throw new UnsupportedOperationException(); } Index: lucene/core/src/java/org/apache/lucene/index/DocTermOrds.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/DocTermOrds.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/index/DocTermOrds.java (working copy) @@ -707,7 +707,7 @@ } @Override - public DocsAndPositionsEnum docsAndPositions(Bits liveDocs, DocsAndPositionsEnum reuse, int flags) throws IOException { + public DocsEnum docsAndPositions(Bits liveDocs, DocsEnum reuse, int flags) throws IOException { return termsEnum.docsAndPositions(liveDocs, reuse, flags); } Index: lucene/core/src/java/org/apache/lucene/index/AtomicReader.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/AtomicReader.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/index/AtomicReader.java (working copy) @@ -137,11 +137,11 @@ return null; } - /** Returns {@link DocsAndPositionsEnum} for the specified + /** Returns {@link DocsEnum} for the specified * term. This will return null if the * field or term does not exist or positions weren't indexed. - * @see TermsEnum#docsAndPositions(Bits, DocsAndPositionsEnum) */ - public final DocsAndPositionsEnum termPositionsEnum(Term term) throws IOException { + * @see TermsEnum#docsAndPositions(Bits, DocsEnum) */ + public final DocsEnum termPositionsEnum(Term term) throws IOException { assert term.field() != null; assert term.bytes() != null; final Fields fields = fields(); Index: lucene/core/src/java/org/apache/lucene/index/FilteredTermsEnum.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/FilteredTermsEnum.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/index/FilteredTermsEnum.java (working copy) @@ -187,7 +187,7 @@ } @Override - public DocsAndPositionsEnum docsAndPositions(Bits bits, DocsAndPositionsEnum reuse, int flags) throws IOException { + public DocsEnum docsAndPositions(Bits bits, DocsEnum reuse, int flags) throws IOException { return tenum.docsAndPositions(bits, reuse, flags); } Index: lucene/core/src/java/org/apache/lucene/index/TermsEnum.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/TermsEnum.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/index/TermsEnum.java (working copy) @@ -29,7 +29,7 @@ * #seekExact(BytesRef,boolean)}) or step through ({@link * #next} terms to obtain frequency information ({@link * #docFreq}), {@link DocsEnum} or {@link - * DocsAndPositionsEnum} for the current term ({@link + * DocsEnum} for the current term ({@link * #docs}. * *

Term enumerations are always ordered by @@ -170,20 +170,20 @@ * @see #docs(Bits, DocsEnum, int) */ public abstract DocsEnum docs(Bits liveDocs, DocsEnum reuse, int flags) throws IOException; - /** Get {@link DocsAndPositionsEnum} for the current term. + /** Get {@link DocsEnum} for the current term. * Do not call this when the enum is unpositioned. This * method will return null if positions were not * indexed. * * @param liveDocs unset bits are documents that should not * be returned - * @param reuse pass a prior DocsAndPositionsEnum for possible reuse - * @see #docsAndPositions(Bits, DocsAndPositionsEnum, int) */ - public final DocsAndPositionsEnum docsAndPositions(Bits liveDocs, DocsAndPositionsEnum reuse) throws IOException { - return docsAndPositions(liveDocs, reuse, DocsAndPositionsEnum.FLAG_OFFSETS | DocsAndPositionsEnum.FLAG_PAYLOADS); + * @param reuse pass a prior DocsEnum for possible reuse + **/ + public final DocsEnum docsAndPositions(Bits liveDocs, DocsEnum reuse) throws IOException { + return docsAndPositions(liveDocs, reuse, DocsEnum.FLAG_OFFSETS | DocsEnum.FLAG_PAYLOADS); } - /** Get {@link DocsAndPositionsEnum} for the current term, + /** Get {@link DocsEnum} for the current term, * with control over whether offsets and payloads are * required. Some codecs may be able to optimize their * implementation when offsets and/or payloads are not required. @@ -192,11 +192,11 @@ * @param liveDocs unset bits are documents that should not * be returned - * @param reuse pass a prior DocsAndPositionsEnum for possible reuse + * @param reuse pass a prior DocsEnum for possible reuse * @param flags specifies which optional per-position values you - * require; see {@link DocsAndPositionsEnum#FLAG_OFFSETS} and - * {@link DocsAndPositionsEnum#FLAG_PAYLOADS}. */ - public abstract DocsAndPositionsEnum docsAndPositions(Bits liveDocs, DocsAndPositionsEnum reuse, int flags) throws IOException; + * require; see {@link DocsEnum#FLAG_OFFSETS} and + * {@link DocsEnum#FLAG_PAYLOADS}. */ + public abstract DocsEnum docsAndPositions(Bits liveDocs, DocsEnum reuse, int flags) throws IOException; /** * Expert: Returns the TermsEnums internal state to position the TermsEnum @@ -262,11 +262,6 @@ } @Override - public DocsAndPositionsEnum docsAndPositions(Bits liveDocs, DocsAndPositionsEnum reuse, int flags) { - throw new IllegalStateException("this method should never be called"); - } - - @Override public BytesRef next() { return null; } @@ -285,5 +280,11 @@ public void seekExact(BytesRef term, TermState state) { throw new IllegalStateException("this method should never be called"); } + + @Override + public DocsEnum docsAndPositions(Bits liveDocs, DocsEnum reuse, int flags) + throws IOException { + throw new IllegalStateException("this method should never be called"); + } }; } Index: lucene/core/src/java/org/apache/lucene/index/MultiFields.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/MultiFields.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/index/MultiFields.java (working copy) @@ -157,22 +157,22 @@ return null; } - /** Returns {@link DocsAndPositionsEnum} for the specified + /** Returns {@link DocsEnum} for the specified * field & term. This will return null if the field or * term does not exist or positions were not indexed. * @see #getTermPositionsEnum(IndexReader, Bits, String, BytesRef, int) */ - public static DocsAndPositionsEnum getTermPositionsEnum(IndexReader r, Bits liveDocs, String field, BytesRef term) throws IOException { - return getTermPositionsEnum(r, liveDocs, field, term, DocsAndPositionsEnum.FLAG_OFFSETS | DocsAndPositionsEnum.FLAG_PAYLOADS); + public static DocsEnum getTermPositionsEnum(IndexReader r, Bits liveDocs, String field, BytesRef term) throws IOException { + return getTermPositionsEnum(r, liveDocs, field, term, DocsEnum.FLAG_OFFSETS | DocsEnum.FLAG_PAYLOADS); } - /** Returns {@link DocsAndPositionsEnum} for the specified + /** Returns {@link DocsEnum} for the specified * field & term, with control over whether offsets and payloads are * required. Some codecs may be able to optimize * their implementation when offsets and/or payloads are not * required. This will return null if the field or term does not * exist or positions were not indexed. See {@link - * TermsEnum#docsAndPositions(Bits,DocsAndPositionsEnum,int)}. */ - public static DocsAndPositionsEnum getTermPositionsEnum(IndexReader r, Bits liveDocs, String field, BytesRef term, int flags) throws IOException { + * TermsEnum#docs(Bits,DocsEnum,int)}. */ + public static DocsEnum getTermPositionsEnum(IndexReader r, Bits liveDocs, String field, BytesRef term, int flags) throws IOException { assert field != null; assert term != null; final Terms terms = getTerms(r, field); Index: lucene/core/src/java/org/apache/lucene/index/MultiDocsEnum.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/MultiDocsEnum.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/index/MultiDocsEnum.java (working copy) @@ -21,6 +21,8 @@ import java.io.IOException; import java.util.Arrays; +import org.apache.lucene.util.BytesRef; + /** * Exposes {@link DocsEnum}, merged from {@link DocsEnum} * API of sub-segments. @@ -87,8 +89,28 @@ public int docID() { return doc; } + + @Override + public int nextPosition() throws IOException { + return current.nextPosition(); + } @Override + public int startOffset() throws IOException { + return current.startOffset(); + } + + @Override + public int endOffset() throws IOException { + return current.endOffset(); + } + + @Override + public BytesRef getPayload() throws IOException { + return current.getPayload(); + } + + @Override public int advance(int target) throws IOException { while(true) { if (current != null) { Index: lucene/core/src/java/org/apache/lucene/index/CheckIndex.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/CheckIndex.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/index/CheckIndex.java (working copy) @@ -714,7 +714,7 @@ DocsEnum docs = null; DocsEnum docsAndFreqs = null; - DocsAndPositionsEnum postings = null; + DocsEnum postings = null; String lastField = null; for (String field : fields) { @@ -1372,11 +1372,11 @@ } DocsEnum docs = null; - DocsAndPositionsEnum postings = null; + DocsEnum postings = null; // Only used if crossCheckTermVectors is true: DocsEnum postingsDocs = null; - DocsAndPositionsEnum postingsPostings = null; + DocsEnum postingsPostings = null; final Bits liveDocs = reader.getLiveDocs(); Index: lucene/core/src/java/org/apache/lucene/index/DocsAndPositionsEnum.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/DocsAndPositionsEnum.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/index/DocsAndPositionsEnum.java (working copy) @@ -1,62 +0,0 @@ -package org.apache.lucene.index; - -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.io.IOException; - -import org.apache.lucene.util.Bits; // javadocs -import org.apache.lucene.util.BytesRef; - -/** Also iterates through positions. */ -public abstract class DocsAndPositionsEnum extends DocsEnum { - - /** Flag to pass to {@link TermsEnum#docsAndPositions(Bits,DocsAndPositionsEnum,int)} - * if you require offsets in the returned enum. */ - public static final int FLAG_OFFSETS = 0x1; - - /** Flag to pass to {@link TermsEnum#docsAndPositions(Bits,DocsAndPositionsEnum,int)} - * if you require payloads in the returned enum. */ - public static final int FLAG_PAYLOADS = 0x2; - - /** Sole constructor. (For invocation by subclass - * constructors, typically implicit.) */ - protected DocsAndPositionsEnum() { - } - - /** Returns the next position. You should only call this - * up to {@link DocsEnum#freq()} times else - * the behavior is not defined. If positions were not - * indexed this will return -1; this only happens if - * offsets were indexed and you passed needsOffset=true - * when pulling the enum. */ - public abstract int nextPosition() throws IOException; - - /** Returns start offset for the current position, or -1 - * if offsets were not indexed. */ - public abstract int startOffset() throws IOException; - - /** Returns end offset for the current position, or -1 if - * offsets were not indexed. */ - public abstract int endOffset() throws IOException; - - /** Returns the payload at this position, or null if no - * payload was indexed. You should not modify anything - * (neither members of the returned BytesRef nor bytes - * in the byte[]). */ - public abstract BytesRef getPayload() throws IOException; -} Index: lucene/core/src/java/org/apache/lucene/index/DocsEnum.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/DocsEnum.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/index/DocsEnum.java (working copy) @@ -23,6 +23,7 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.util.AttributeSource; import org.apache.lucene.util.Bits; // javadocs +import org.apache.lucene.util.BytesRef; /** Iterates through the documents and term freqs. * NOTE: you must first call {@link #nextDoc} before using @@ -31,16 +32,22 @@ /** * Flag to pass to {@link TermsEnum#docs(Bits,DocsEnum,int)} if you don't - * require term frequencies in the returned enum. When passed to - * {@link TermsEnum#docsAndPositions(Bits,DocsAndPositionsEnum,int)} means - * that no offsets and payloads will be returned. + * require term frequencies in the returned enum. */ public static final int FLAG_NONE = 0x0; /** Flag to pass to {@link TermsEnum#docs(Bits,DocsEnum,int)} * if you require term frequencies in the returned enum. */ public static final int FLAG_FREQS = 0x1; + + /** Flag to pass to {@link TermsEnum#docs(Bits,DocsEnum,int)} + * if you require offsets in the returned enum. */ + public static final int FLAG_OFFSETS = 0x1; + /** Flag to pass to {@link TermsEnum#docs(Bits,DocsEnum,int)} + * if you require payloads in the returned enum. */ + public static final int FLAG_PAYLOADS = 0x2; + private AttributeSource atts = null; /** Sole constructor. (For invocation by subclass @@ -65,4 +72,34 @@ if (atts == null) atts = new AttributeSource(); return atts; } + + /** Returns the next position. You should only call this + * up to {@link DocsEnum#freq()} times else + * the behavior is not defined. If positions were not + * indexed this will return -1; this only happens if + * offsets were indexed and you passed needsOffset=true + * when pulling the enum. */ + public int nextPosition() throws IOException { + return -1; + } + + /** Returns start offset for the current position, or -1 + * if offsets were not indexed. */ + public int startOffset() throws IOException { + return -1; + } + + /** Returns end offset for the current position, or -1 if + * offsets were not indexed. */ + public int endOffset() throws IOException { + return -1; + } + + /** Returns the payload at this position, or null if no + * payload was indexed. You should not modify anything + * (neither members of the returned BytesRef nor bytes + * in the byte[]). */ + public BytesRef getPayload() throws IOException { + return null; + } } Index: lucene/core/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java (revision 1436361) +++ lucene/core/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java (working copy) @@ -1,177 +0,0 @@ -package org.apache.lucene.index; - -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.apache.lucene.util.BytesRef; - -import java.io.IOException; -import java.util.Arrays; - -/** - * Exposes flex API, merged from flex API of sub-segments. - * - * @lucene.experimental - */ - -public final class MultiDocsAndPositionsEnum extends DocsAndPositionsEnum { - private final MultiTermsEnum parent; - final DocsAndPositionsEnum[] subDocsAndPositionsEnum; - private EnumWithSlice[] subs; - int numSubs; - int upto; - DocsAndPositionsEnum current; - int currentBase; - int doc = -1; - - /** Sole constructor. */ - public MultiDocsAndPositionsEnum(MultiTermsEnum parent, int subReaderCount) { - this.parent = parent; - subDocsAndPositionsEnum = new DocsAndPositionsEnum[subReaderCount]; - } - - /** Returns {@code true} if this instance can be reused by - * the provided {@link MultiTermsEnum}. */ - public boolean canReuse(MultiTermsEnum parent) { - return this.parent == parent; - } - - /** Rre-use and reset this instance on the provided slices. */ - public MultiDocsAndPositionsEnum reset(final EnumWithSlice[] subs, final int numSubs) { - this.numSubs = numSubs; - this.subs = new EnumWithSlice[subs.length]; - for(int i=0;i unsortedTokens = null; termsEnum = tpv.iterator(null); BytesRef text; - DocsAndPositionsEnum dpEnum = null; + DocsEnum dpEnum = null; while ((text = termsEnum.next()) != null) { dpEnum = termsEnum.docsAndPositions(null, dpEnum); Index: lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java =================================================================== --- lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java (revision 1436361) +++ lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java (working copy) @@ -21,7 +21,7 @@ import java.util.LinkedList; import java.util.Set; -import org.apache.lucene.index.DocsAndPositionsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.Fields; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Term; @@ -93,7 +93,7 @@ final CharsRef spare = new CharsRef(); final TermsEnum termsEnum = vector.iterator(null); - DocsAndPositionsEnum dpEnum = null; + DocsEnum dpEnum = null; BytesRef text; int numDocs = reader.maxDoc(); Index: lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/PostingsHighlighter.java =================================================================== --- lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/PostingsHighlighter.java (revision 1436361) +++ lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/PostingsHighlighter.java (working copy) @@ -31,7 +31,7 @@ import org.apache.lucene.index.AtomicReader; import org.apache.lucene.index.AtomicReaderContext; -import org.apache.lucene.index.DocsAndPositionsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReaderContext; @@ -285,7 +285,7 @@ Map highlights = new HashMap(); // reuse in the real sense... for docs in same segment we just advance our old enum - DocsAndPositionsEnum postings[] = null; + DocsEnum postings[] = null; TermsEnum termsEnum = null; int lastLeaf = -1; @@ -305,7 +305,7 @@ } if (leaf != lastLeaf) { termsEnum = t.iterator(null); - postings = new DocsAndPositionsEnum[terms.length]; + postings = new DocsEnum[terms.length]; } Passage passages[] = highlightDoc(field, terms, content.length(), bi, doc - subContext.docBase, termsEnum, postings, maxPassages); if (passages.length > 0) { @@ -322,12 +322,12 @@ // we can intersect these with the postings lists via BreakIterator.preceding(offset),s // score each sentence as norm(sentenceStartOffset) * sum(weight * tf(freq)) private Passage[] highlightDoc(String field, Term terms[], int contentLength, BreakIterator bi, int doc, - TermsEnum termsEnum, DocsAndPositionsEnum[] postings, int n) throws IOException { + TermsEnum termsEnum, DocsEnum[] postings, int n) throws IOException { PriorityQueue pq = new PriorityQueue(); float weights[] = new float[terms.length]; // initialize postings for (int i = 0; i < terms.length; i++) { - DocsAndPositionsEnum de = postings[i]; + DocsEnum de = postings[i]; int pDoc; if (de == EMPTY) { continue; @@ -336,7 +336,7 @@ if (!termsEnum.seekExact(terms[i].bytes(), true)) { continue; // term not found } - de = postings[i] = termsEnum.docsAndPositions(null, null, DocsAndPositionsEnum.FLAG_OFFSETS); + de = postings[i] = termsEnum.docsAndPositions(null, null, DocsEnum.FLAG_OFFSETS); if (de == null) { // no positions available throw new IllegalArgumentException("field '" + field + "' was indexed without offsets, cannot highlight"); @@ -372,7 +372,7 @@ OffsetsEnum off; while ((off = pq.poll()) != null) { - final DocsAndPositionsEnum dp = off.dp; + final DocsEnum dp = off.dp; int start = dp.startOffset(); if (start == -1) { throw new IllegalArgumentException("field '" + field + "' was indexed without offsets, cannot highlight"); @@ -436,11 +436,11 @@ } private static class OffsetsEnum implements Comparable { - DocsAndPositionsEnum dp; + DocsEnum dp; int pos; int id; - OffsetsEnum(DocsAndPositionsEnum dp, int id) throws IOException { + OffsetsEnum(DocsEnum dp, int id) throws IOException { this.dp = dp; this.id = id; this.pos = 1; @@ -462,7 +462,7 @@ } } - private static final DocsAndPositionsEnum EMPTY = new DocsAndPositionsEnum() { + private static final DocsEnum EMPTY = new DocsEnum() { @Override public int nextPosition() throws IOException { return 0; } Index: lucene/codecs/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java =================================================================== --- lucene/codecs/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java (revision 1436361) +++ lucene/codecs/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java (working copy) @@ -29,8 +29,8 @@ import org.apache.lucene.index.AtomicReader; import org.apache.lucene.index.CheckIndex; import org.apache.lucene.index.DirectoryReader; -import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.DocsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.BaseDirectoryWrapper; @@ -67,7 +67,7 @@ assertEquals(2, allEnums.size()); allEnums.clear(); - DocsAndPositionsEnum posReuse = null; + DocsEnum posReuse = null; te = segment.terms("foo").iterator(null); while (te.next() != null) { posReuse = te.docsAndPositions(null, posReuse); @@ -108,7 +108,7 @@ assertEquals(4, allEnums.size()); allEnums.clear(); - DocsAndPositionsEnum posReuse = null; + DocsEnum posReuse = null; te = segment.terms("foo").iterator(null); while (te.next() != null) { posReuse = te.docsAndPositions(null, posReuse); Index: lucene/codecs/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsReader.java =================================================================== --- lucene/codecs/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsReader.java (revision 1436361) +++ lucene/codecs/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsReader.java (working copy) @@ -24,8 +24,8 @@ import org.apache.lucene.codecs.BlockTermState; import org.apache.lucene.codecs.CodecUtil; import org.apache.lucene.codecs.PostingsReaderBase; -import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.DocsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.FieldInfo.IndexOptions; import org.apache.lucene.index.TermState; @@ -212,7 +212,7 @@ } @Override - public DocsAndPositionsEnum docsAndPositions(FieldInfo field, BlockTermState _termState, Bits liveDocs, DocsAndPositionsEnum reuse, + public DocsEnum docsAndPositions(FieldInfo field, BlockTermState _termState, Bits liveDocs, DocsEnum reuse, int flags) throws IOException { final PulsingTermState termState = (PulsingTermState) _termState; @@ -239,7 +239,7 @@ return postings.reset(liveDocs, termState); } else { if (reuse instanceof PulsingDocsAndPositionsEnum) { - DocsAndPositionsEnum wrapped = wrappedPostingsReader.docsAndPositions(field, termState.wrappedTermState, liveDocs, (DocsAndPositionsEnum) getOther(reuse), + DocsEnum wrapped = wrappedPostingsReader.docsAndPositions(field, termState.wrappedTermState, liveDocs, getOther(reuse), flags); setOther(wrapped, reuse); // wrapped.other = reuse return wrapped; @@ -369,7 +369,7 @@ } } - private static class PulsingDocsAndPositionsEnum extends DocsAndPositionsEnum { + private static class PulsingDocsAndPositionsEnum extends DocsEnum { private byte[] postingsBytes; private final ByteArrayDataInput postings = new ByteArrayDataInput(); private final boolean storePayloads; Index: lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java =================================================================== --- lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java (revision 1436361) +++ lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java (working copy) @@ -28,8 +28,8 @@ import org.apache.lucene.codecs.FieldsProducer; import org.apache.lucene.codecs.PostingsReaderBase; import org.apache.lucene.index.CorruptIndexException; -import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.DocsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.FieldInfo.IndexOptions; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.FieldInfos; @@ -708,7 +708,7 @@ } @Override - public DocsAndPositionsEnum docsAndPositions(Bits liveDocs, DocsAndPositionsEnum reuse, int flags) throws IOException { + public DocsEnum docsAndPositions(Bits liveDocs, DocsEnum reuse, int flags) throws IOException { if (fieldInfo.getIndexOptions().compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) < 0) { // Positions were not indexed: return null; Index: lucene/codecs/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java =================================================================== --- lucene/codecs/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java (revision 1436361) +++ lucene/codecs/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java (working copy) @@ -22,8 +22,8 @@ import org.apache.lucene.codecs.BlockTermState; import org.apache.lucene.codecs.CodecUtil; import org.apache.lucene.codecs.PostingsReaderBase; -import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.DocsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.FieldInfo.IndexOptions; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.FieldInfos; @@ -255,8 +255,8 @@ } @Override - public DocsAndPositionsEnum docsAndPositions(FieldInfo fieldInfo, BlockTermState _termState, Bits liveDocs, - DocsAndPositionsEnum reuse, int flags) + public DocsEnum docsAndPositions(FieldInfo fieldInfo, BlockTermState _termState, Bits liveDocs, + DocsEnum reuse, int flags) throws IOException { assert fieldInfo.getIndexOptions() == IndexOptions.DOCS_AND_FREQS_AND_POSITIONS; @@ -443,7 +443,7 @@ } } - class SepDocsAndPositionsEnum extends DocsAndPositionsEnum { + class SepDocsAndPositionsEnum extends DocsEnum { int docFreq; int doc = -1; int accum; Index: lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java =================================================================== --- lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java (revision 1436361) +++ lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java (working copy) @@ -30,8 +30,8 @@ import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.TermStats; import org.apache.lucene.codecs.TermsConsumer; -import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.DocsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.FieldInfo.IndexOptions; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.FieldInfos; @@ -433,7 +433,7 @@ } } - private final static class FSTDocsAndPositionsEnum extends DocsAndPositionsEnum { + private final static class FSTDocsAndPositionsEnum extends DocsEnum { private final boolean storePayloads; private byte[] buffer = new byte[16]; private final ByteArrayDataInput in = new ByteArrayDataInput(buffer); @@ -700,7 +700,7 @@ } @Override - public DocsAndPositionsEnum docsAndPositions(Bits liveDocs, DocsAndPositionsEnum reuse, int flags) { + public DocsEnum docsAndPositions(Bits liveDocs, DocsEnum reuse, int flags) { boolean hasOffsets = field.getIndexOptions().compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS) >= 0; if (field.getIndexOptions().compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) < 0) { Index: lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java =================================================================== --- lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java (revision 1436361) +++ lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java (working copy) @@ -28,8 +28,8 @@ import org.apache.lucene.codecs.FieldsProducer; import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.lucene41.Lucene41PostingsFormat; // javadocs -import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.DocsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.FieldInfo.IndexOptions; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.Fields; @@ -252,7 +252,7 @@ BytesRef term; DocsEnum docsEnum = null; - DocsAndPositionsEnum docsAndPositionsEnum = null; + DocsEnum docsAndPositionsEnum = null; final TermsEnum termsEnum = termsIn.iterator(null); int termOffset = 0; @@ -837,7 +837,7 @@ } @Override - public DocsAndPositionsEnum docsAndPositions(Bits liveDocs, DocsAndPositionsEnum reuse, int flags) { + public DocsEnum docsAndPositions(Bits liveDocs, DocsEnum reuse, int flags) { if (!hasPos) { return null; } @@ -1393,7 +1393,7 @@ } @Override - public DocsAndPositionsEnum docsAndPositions(Bits liveDocs, DocsAndPositionsEnum reuse, int flags) { + public DocsEnum docsAndPositions(Bits liveDocs, DocsEnum reuse, int flags) { if (!hasPos) { return null; } @@ -1636,7 +1636,7 @@ } } - private final static class LowFreqDocsAndPositionsEnum extends DocsAndPositionsEnum { + private final static class LowFreqDocsAndPositionsEnum extends DocsEnum { private int[] postings; private final Bits liveDocs; private final int posMult; @@ -1671,7 +1671,7 @@ } } - public DocsAndPositionsEnum reset(int[] postings, byte[] payloadBytes) { + public DocsEnum reset(int[] postings, byte[] payloadBytes) { this.postings = postings; upto = 0; skipPositions = 0; @@ -1962,7 +1962,7 @@ } // TODO: specialize offsets and not - private final static class HighFreqDocsAndPositionsEnum extends DocsAndPositionsEnum { + private final static class HighFreqDocsAndPositionsEnum extends DocsEnum { private int[] docIDs; private int[] freqs; private int[][] positions; @@ -1997,7 +1997,7 @@ return liveDocs; } - public DocsAndPositionsEnum reset(int[] docIDs, int[] freqs, int[][] positions, byte[][][] payloads) { + public DocsEnum reset(int[] docIDs, int[] freqs, int[][] positions, byte[][][] payloads) { this.docIDs = docIDs; this.freqs = freqs; this.positions = positions; Index: lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java =================================================================== --- lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java (revision 1436361) +++ lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java (working copy) @@ -34,7 +34,6 @@ import org.apache.lucene.codecs.TermStats; import org.apache.lucene.codecs.TermsConsumer; import org.apache.lucene.codecs.bloom.FuzzySet.ContainsResult; -import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.IndexFileNames; @@ -374,11 +373,10 @@ public final long totalTermFreq() throws IOException { return delegate().totalTermFreq(); } - @Override - public DocsAndPositionsEnum docsAndPositions(Bits liveDocs, - DocsAndPositionsEnum reuse, int flags) throws IOException { + public DocsEnum docsAndPositions(Bits liveDocs, + DocsEnum reuse, int flags) throws IOException { return delegate().docsAndPositions(liveDocs, reuse, flags); } @@ -388,7 +386,6 @@ return delegate().docs(liveDocs, reuse, flags); } - } } Index: lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java =================================================================== --- lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java (revision 1436361) +++ lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java (working copy) @@ -26,8 +26,8 @@ import java.util.TreeMap; import org.apache.lucene.codecs.FieldsProducer; -import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.DocsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.FieldInfo.IndexOptions; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.FieldInfos; @@ -203,7 +203,7 @@ } @Override - public DocsAndPositionsEnum docsAndPositions(Bits liveDocs, DocsAndPositionsEnum reuse, int flags) throws IOException { + public DocsEnum docsAndPositions(Bits liveDocs, DocsEnum reuse, int flags) throws IOException { if (indexOptions.compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) < 0) { // Positions were not indexed @@ -318,7 +318,7 @@ } } - private class SimpleTextDocsAndPositionsEnum extends DocsAndPositionsEnum { + private class SimpleTextDocsAndPositionsEnum extends DocsEnum { private final IndexInput inStart; private final IndexInput in; private int docID = -1; Index: lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java =================================================================== --- lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java (revision 1436361) +++ lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java (working copy) @@ -26,8 +26,8 @@ import java.util.TreeMap; import org.apache.lucene.codecs.TermVectorsReader; -import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.DocsEnum; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.Fields; import org.apache.lucene.index.IndexFileNames; import org.apache.lucene.index.SegmentInfo; @@ -384,7 +384,7 @@ } @Override - public DocsAndPositionsEnum docsAndPositions(Bits liveDocs, DocsAndPositionsEnum reuse, int flags) throws IOException { + public DocsEnum docsAndPositions(Bits liveDocs, DocsEnum reuse, int flags) throws IOException { SimpleTVPostings postings = current.getValue(); if (postings.positions == null && postings.startOffsets == null) { return null; @@ -446,7 +446,7 @@ } } - private static class SimpleTVDocsAndPositionsEnum extends DocsAndPositionsEnum { + private static class SimpleTVDocsAndPositionsEnum extends DocsEnum { private boolean didNext; private int doc = -1; private int nextPos;