From ea9bffece7f3c2dd6ef69136f53167513600db0c Mon Sep 17 00:00:00 2001 From: Shai Erera Date: Tue, 11 Dec 2012 04:28:17 +0000 Subject: [PATCH] LUCENE-4605: Add FLAG_NONE to DocsEnum and DocsAndPositionsEnum git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1419991 13f79535-47bb-0310-9956-ffa450edef68 --- lucene/CHANGES.txt | 3 ++ .../codecs/pulsing/Test10KPulsings.java | 4 +-- .../codecs/pulsing/TestPulsingReuse.java | 4 +-- .../apache/lucene/codecs/TermsConsumer.java | 3 +- .../lucene/index/BufferedDeletesStream.java | 2 +- .../org/apache/lucene/index/CheckIndex.java | 10 +++--- .../org/apache/lucene/index/DocTermOrds.java | 2 +- .../lucene/index/DocsAndPositionsEnum.java | 1 + .../org/apache/lucene/index/DocsEnum.java | 8 +++++ .../apache/lucene/index/MultiTermsEnum.java | 2 +- .../apache/lucene/search/FieldCacheImpl.java | 18 +++++------ .../lucene/search/MultiPhraseQuery.java | 7 ++-- .../search/MultiTermQueryWrapperFilter.java | 2 +- .../org/apache/lucene/search/PhraseQuery.java | 3 +- .../codecs/lucene40/TestReuseDocsEnum.java | 14 ++++---- .../lucene41/TestBlockPostingsFormat3.java | 32 +++++++++---------- .../apache/lucene/index/TestAddIndexes.java | 2 +- .../index/TestBackwardsCompatibility.java | 6 ++-- .../org/apache/lucene/index/TestCodecs.java | 8 ++--- .../org/apache/lucene/index/TestDocCount.java | 2 +- .../lucene/index/TestDocsAndPositions.java | 4 +-- .../lucene/index/TestDuelingCodecs.java | 16 +++++----- .../apache/lucene/index/TestIndexWriter.java | 14 ++++---- .../lucene/index/TestIndexWriterReader.java | 2 +- .../apache/lucene/index/TestLongPostings.java | 2 +- .../apache/lucene/index/TestMultiFields.java | 6 ++-- .../lucene/index/TestParallelTermEnum.java | 2 +- .../lucene/index/TestPerSegmentDeletes.java | 2 +- .../lucene/index/TestStressAdvance.java | 4 +-- .../lucene/index/TestStressIndexing2.java | 6 ++-- .../lucene/index/TestTermVectorsReader.java | 2 +- .../apache/lucene/index/TestTermdocPerf.java | 2 +- .../apache/lucene/index/TestTermsEnum.java | 16 +++++----- .../directory/DirectoryTaxonomyWriter.java | 4 +-- .../apache/lucene/facet/FacetTestBase.java | 2 +- .../search/TestMultipleCategoryLists.java | 4 +-- .../search/join/TermsIncludingScoreQuery.java | 8 ++--- .../lucene/search/join/TestJoinUtil.java | 2 +- .../lucene/index/memory/MemoryIndexTest.java | 4 +-- .../apache/lucene/queries/TermsFilter.java | 2 +- .../sandbox/queries/DuplicateFilter.java | 4 +-- .../prefix/RecursivePrefixTreeFilter.java | 6 ++-- .../spatial/util/ShapeFieldCacheProvider.java | 2 +- .../index/BasePostingsFormatTestCase.java | 2 +- .../handler/admin/LukeRequestHandler.java | 2 +- .../component/QueryElevationComponent.java | 2 +- .../org/apache/solr/request/SimpleFacets.java | 2 +- .../apache/solr/search/JoinQParserPlugin.java | 4 +-- .../apache/solr/search/SolrIndexSearcher.java | 8 ++--- .../solr/search/function/FileFloatSource.java | 2 +- .../apache/solr/update/SolrIndexSplitter.java | 2 +- .../org/apache/solr/search/TestRTGBase.java | 2 +- 52 files changed, 145 insertions(+), 130 deletions(-) diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index 48117466f73..caa8f37246f 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -170,6 +170,9 @@ API Changes * LUCENE-4591: CompressingStoredFields{Writer,Reader} now accept a segment suffix as a constructor parameter. (Renaud Delbru via Adrien Grand) +* LUCENE-4605: Added DocsEnum.FLAG_NONE which can be passed instead of 0 as + the flag to .docs() and .docsAndPositions(). (Shai Erera) + Bug Fixes * LUCENE-1822: BaseFragListBuilder hard-coded 6 char margin is too naive. diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/pulsing/Test10KPulsings.java b/lucene/codecs/src/test/org/apache/lucene/codecs/pulsing/Test10KPulsings.java index 6e53a631ea3..4c07479b81b 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/pulsing/Test10KPulsings.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/pulsing/Test10KPulsings.java @@ -87,7 +87,7 @@ public class Test10KPulsings extends LuceneTestCase { for (int i = 0; i < 10050; i++) { String expected = df.format(i); assertEquals(expected, te.next().utf8ToString()); - de = _TestUtil.docs(random(), te, null, de, 0); + de = _TestUtil.docs(random(), te, null, de, DocsEnum.FLAG_NONE); assertTrue(de.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); assertEquals(DocIdSetIterator.NO_MORE_DOCS, de.nextDoc()); } @@ -145,7 +145,7 @@ public class Test10KPulsings extends LuceneTestCase { for (int i = 0; i < 10050; i++) { String expected = df.format(i); assertEquals(expected, te.next().utf8ToString()); - de = _TestUtil.docs(random(), te, null, de, 0); + de = _TestUtil.docs(random(), te, null, de, DocsEnum.FLAG_NONE); assertTrue(de.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); assertEquals(DocIdSetIterator.NO_MORE_DOCS, de.nextDoc()); } diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java b/lucene/codecs/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java index cfa520aef02..d849951bff6 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java @@ -60,7 +60,7 @@ public class TestPulsingReuse extends LuceneTestCase { Map allEnums = new IdentityHashMap(); TermsEnum te = segment.terms("foo").iterator(null); while (te.next() != null) { - reuse = te.docs(null, reuse, 0); + reuse = te.docs(null, reuse, DocsEnum.FLAG_NONE); allEnums.put(reuse, true); } @@ -101,7 +101,7 @@ public class TestPulsingReuse extends LuceneTestCase { Map allEnums = new IdentityHashMap(); TermsEnum te = segment.terms("foo").iterator(null); while (te.next() != null) { - reuse = te.docs(null, reuse, 0); + reuse = te.docs(null, reuse, DocsEnum.FLAG_NONE); allEnums.put(reuse, true); } diff --git a/lucene/core/src/java/org/apache/lucene/codecs/TermsConsumer.java b/lucene/core/src/java/org/apache/lucene/codecs/TermsConsumer.java index ebd873af70a..1a89c43879b 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/TermsConsumer.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/TermsConsumer.java @@ -23,6 +23,7 @@ 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; @@ -103,7 +104,7 @@ public abstract class TermsConsumer { while((term = termsEnum.next()) != null) { // We can pass null for liveDocs, because the // mapping enum will skip the non-live docs: - docsEnumIn = (MultiDocsEnum) termsEnum.docs(null, docsEnumIn, 0); + docsEnumIn = (MultiDocsEnum) termsEnum.docs(null, docsEnumIn, DocsEnum.FLAG_NONE); if (docsEnumIn != null) { docsEnum.reset(docsEnumIn); final PostingsConsumer postingsConsumer = startTerm(term); diff --git a/lucene/core/src/java/org/apache/lucene/index/BufferedDeletesStream.java b/lucene/core/src/java/org/apache/lucene/index/BufferedDeletesStream.java index 5c0a85630c5..3eb678338fa 100644 --- a/lucene/core/src/java/org/apache/lucene/index/BufferedDeletesStream.java +++ b/lucene/core/src/java/org/apache/lucene/index/BufferedDeletesStream.java @@ -397,7 +397,7 @@ class BufferedDeletesStream { if (termsEnum.seekExact(term.bytes(), false)) { // we don't need term frequencies for this - DocsEnum docsEnum = termsEnum.docs(rld.getLiveDocs(), docs, 0); + DocsEnum docsEnum = termsEnum.docs(rld.getLiveDocs(), docs, DocsEnum.FLAG_NONE); //System.out.println("BDS: got docsEnum=" + docsEnum); if (docsEnum != null) { diff --git a/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java b/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java index 371c48990ab..769d3d6897b 100644 --- a/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java +++ b/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java @@ -905,7 +905,7 @@ public class CheckIndex { totalTermFreq += docsNoDel.freq(); } } else { - final DocsEnum docsNoDel = termsEnum.docs(null, docs, 0); + final DocsEnum docsNoDel = termsEnum.docs(null, docs, DocsEnum.FLAG_NONE); docCount = 0; totalTermFreq = -1; while(docsNoDel.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) { @@ -991,7 +991,7 @@ public class CheckIndex { } else { for(int idx=0;idx<7;idx++) { final int skipDocID = (int) (((idx+1)*(long) maxDoc)/8); - docs = termsEnum.docs(liveDocs, docs, 0); + docs = termsEnum.docs(liveDocs, docs, DocsEnum.FLAG_NONE); final int docID = docs.advance(skipDocID); if (docID == DocIdSetIterator.NO_MORE_DOCS) { break; @@ -1057,7 +1057,7 @@ public class CheckIndex { } int expectedDocFreq = termsEnum.docFreq(); - DocsEnum d = termsEnum.docs(null, null, 0); + DocsEnum d = termsEnum.docs(null, null, DocsEnum.FLAG_NONE); int docFreq = 0; while (d.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) { docFreq++; @@ -1098,7 +1098,7 @@ public class CheckIndex { throw new RuntimeException("seek to existing term " + seekTerms[i] + " failed"); } - docs = termsEnum.docs(liveDocs, docs, 0); + docs = termsEnum.docs(liveDocs, docs, DocsEnum.FLAG_NONE); if (docs == null) { throw new RuntimeException("null DocsEnum from to existing term " + seekTerms[i]); } @@ -1116,7 +1116,7 @@ public class CheckIndex { } totDocFreq += termsEnum.docFreq(); - docs = termsEnum.docs(null, docs, 0); + docs = termsEnum.docs(null, docs, DocsEnum.FLAG_NONE); if (docs == null) { throw new RuntimeException("null DocsEnum from to existing term " + seekTerms[i]); } diff --git a/lucene/core/src/java/org/apache/lucene/index/DocTermOrds.java b/lucene/core/src/java/org/apache/lucene/index/DocTermOrds.java index 6878113c524..e3ab779bcc6 100644 --- a/lucene/core/src/java/org/apache/lucene/index/DocTermOrds.java +++ b/lucene/core/src/java/org/apache/lucene/index/DocTermOrds.java @@ -363,7 +363,7 @@ public class DocTermOrds { final int df = te.docFreq(); if (df <= maxTermDocFreq) { - docsEnum = te.docs(liveDocs, docsEnum, 0); + docsEnum = te.docs(liveDocs, docsEnum, DocsEnum.FLAG_NONE); // dF, but takes deletions into account int actualDF = 0; diff --git a/lucene/core/src/java/org/apache/lucene/index/DocsAndPositionsEnum.java b/lucene/core/src/java/org/apache/lucene/index/DocsAndPositionsEnum.java index 032a02f32f4..60ac2bbdef1 100644 --- a/lucene/core/src/java/org/apache/lucene/index/DocsAndPositionsEnum.java +++ b/lucene/core/src/java/org/apache/lucene/index/DocsAndPositionsEnum.java @@ -24,6 +24,7 @@ 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; diff --git a/lucene/core/src/java/org/apache/lucene/index/DocsEnum.java b/lucene/core/src/java/org/apache/lucene/index/DocsEnum.java index a3e7b8037b7..f900e533ded 100644 --- a/lucene/core/src/java/org/apache/lucene/index/DocsEnum.java +++ b/lucene/core/src/java/org/apache/lucene/index/DocsEnum.java @@ -27,6 +27,14 @@ import org.apache.lucene.util.Bits; // javadocs * NOTE: you must first call {@link #nextDoc} before using * any of the per-doc methods. */ public abstract class DocsEnum extends DocIdSetIterator { + + /** + * 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. + */ + 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. */ diff --git a/lucene/core/src/java/org/apache/lucene/index/MultiTermsEnum.java b/lucene/core/src/java/org/apache/lucene/index/MultiTermsEnum.java index 4a268d97bfb..1c0c5d08fe9 100644 --- a/lucene/core/src/java/org/apache/lucene/index/MultiTermsEnum.java +++ b/lucene/core/src/java/org/apache/lucene/index/MultiTermsEnum.java @@ -479,7 +479,7 @@ public final class MultiTermsEnum extends TermsEnum { subDocsAndPositions[upto].slice = entry.subSlice; upto++; } else { - if (entry.terms.docs(b, null, 0) != null) { + if (entry.terms.docs(b, null, DocsEnum.FLAG_NONE) != null) { // At least one of our subs does not store // offsets or positions -- we can't correctly // produce a MultiDocsAndPositions enum diff --git a/lucene/core/src/java/org/apache/lucene/search/FieldCacheImpl.java b/lucene/core/src/java/org/apache/lucene/search/FieldCacheImpl.java index 0c91623ee13..8c93cb82fa9 100644 --- a/lucene/core/src/java/org/apache/lucene/search/FieldCacheImpl.java +++ b/lucene/core/src/java/org/apache/lucene/search/FieldCacheImpl.java @@ -364,7 +364,7 @@ class FieldCacheImpl implements FieldCache { break; } final byte termval = parser.parseByte(term); - docs = termsEnum.docs(null, docs, 0); + docs = termsEnum.docs(null, docs, DocsEnum.FLAG_NONE); while (true) { final int docID = docs.nextDoc(); if (docID == DocIdSetIterator.NO_MORE_DOCS) { @@ -437,7 +437,7 @@ class FieldCacheImpl implements FieldCache { break; } final short termval = parser.parseShort(term); - docs = termsEnum.docs(null, docs, 0); + docs = termsEnum.docs(null, docs, DocsEnum.FLAG_NONE); while (true) { final int docID = docs.nextDoc(); if (docID == DocIdSetIterator.NO_MORE_DOCS) { @@ -541,7 +541,7 @@ class FieldCacheImpl implements FieldCache { retArray = new int[maxDoc]; } - docs = termsEnum.docs(null, docs, 0); + docs = termsEnum.docs(null, docs, DocsEnum.FLAG_NONE); while (true) { final int docID = docs.nextDoc(); if (docID == DocIdSetIterator.NO_MORE_DOCS) { @@ -608,7 +608,7 @@ class FieldCacheImpl implements FieldCache { res = new FixedBitSet(maxDoc); } - docs = termsEnum.docs(null, docs, 0); + docs = termsEnum.docs(null, docs, DocsEnum.FLAG_NONE); // TODO: use bulk API while (true) { final int docID = docs.nextDoc(); @@ -691,7 +691,7 @@ class FieldCacheImpl implements FieldCache { retArray = new float[maxDoc]; } - docs = termsEnum.docs(null, docs, 0); + docs = termsEnum.docs(null, docs, DocsEnum.FLAG_NONE); while (true) { final int docID = docs.nextDoc(); if (docID == DocIdSetIterator.NO_MORE_DOCS) { @@ -779,7 +779,7 @@ class FieldCacheImpl implements FieldCache { retArray = new long[maxDoc]; } - docs = termsEnum.docs(null, docs, 0); + docs = termsEnum.docs(null, docs, DocsEnum.FLAG_NONE); while (true) { final int docID = docs.nextDoc(); if (docID == DocIdSetIterator.NO_MORE_DOCS) { @@ -868,7 +868,7 @@ class FieldCacheImpl implements FieldCache { retArray = new double[maxDoc]; } - docs = termsEnum.docs(null, docs, 0); + docs = termsEnum.docs(null, docs, DocsEnum.FLAG_NONE); while (true) { final int docID = docs.nextDoc(); if (docID == DocIdSetIterator.NO_MORE_DOCS) { @@ -1161,7 +1161,7 @@ class FieldCacheImpl implements FieldCache { termOrdToBytesOffset = termOrdToBytesOffset.resize(ArrayUtil.oversize(1+termOrd, 1)); } termOrdToBytesOffset.set(termOrd, bytes.copyUsingLengthPrefix(term)); - docs = termsEnum.docs(null, docs, 0); + docs = termsEnum.docs(null, docs, DocsEnum.FLAG_NONE); while (true) { final int docID = docs.nextDoc(); if (docID == DocIdSetIterator.NO_MORE_DOCS) { @@ -1277,7 +1277,7 @@ class FieldCacheImpl implements FieldCache { break; } final long pointer = bytes.copyUsingLengthPrefix(term); - docs = termsEnum.docs(null, docs, 0); + docs = termsEnum.docs(null, docs, DocsEnum.FLAG_NONE); while (true) { final int docID = docs.nextDoc(); if (docID == DocIdSetIterator.NO_MORE_DOCS) { diff --git a/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java b/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java index 4faf7d2e886..ddad80b034a 100644 --- a/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java @@ -23,6 +23,7 @@ import java.util.*; import org.apache.lucene.index.AtomicReaderContext; import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.AtomicReader; +import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReaderContext; import org.apache.lucene.index.Term; @@ -224,11 +225,11 @@ public class MultiPhraseQuery extends Query { return null; } termsEnum.seekExact(term.bytes(), termState); - postingsEnum = termsEnum.docsAndPositions(liveDocs, null, 0); + postingsEnum = termsEnum.docsAndPositions(liveDocs, null, DocsEnum.FLAG_NONE); if (postingsEnum == null) { // term does exist, but has no positions - assert termsEnum.docs(liveDocs, null, 0) != null: "termstate found but no term exists in reader"; + assert termsEnum.docs(liveDocs, null, DocsEnum.FLAG_NONE) != null: "termstate found but no term exists in reader"; throw new IllegalStateException("field \"" + term.field() + "\" was indexed without position data; cannot run PhraseQuery (term=" + term.text() + ")"); } @@ -482,7 +483,7 @@ class UnionDocsAndPositionsEnum extends DocsAndPositionsEnum { continue; } termsEnum.seekExact(term.bytes(), termState); - DocsAndPositionsEnum postings = termsEnum.docsAndPositions(liveDocs, null, 0); + DocsAndPositionsEnum 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() + ")"); diff --git a/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java b/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java index 0fba7df9e50..518ee0acc5d 100644 --- a/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java +++ b/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java @@ -106,7 +106,7 @@ public class MultiTermQueryWrapperFilter extends Filte do { // System.out.println(" iter termCount=" + termCount + " term=" + // enumerator.term().toBytesString()); - docsEnum = termsEnum.docs(acceptDocs, docsEnum, 0); + docsEnum = termsEnum.docs(acceptDocs, docsEnum, DocsEnum.FLAG_NONE); int docid; while ((docid = docsEnum.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) { bitSet.set(docid); diff --git a/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java b/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java index 223c5d723ef..425451d9418 100644 --- a/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java @@ -24,6 +24,7 @@ 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.IndexReader; import org.apache.lucene.index.AtomicReader; import org.apache.lucene.index.IndexReaderContext; @@ -262,7 +263,7 @@ public class PhraseQuery extends Query { return null; } te.seekExact(t.bytes(), state); - DocsAndPositionsEnum postingsEnum = te.docsAndPositions(liveDocs, null, 0); + DocsAndPositionsEnum postingsEnum = te.docsAndPositions(liveDocs, null, DocsEnum.FLAG_NONE); // PhraseQuery on a field that did not index // positions. diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java index 98c7cb5b2f2..c5aa64477f8 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java @@ -58,7 +58,7 @@ public class TestReuseDocsEnum extends LuceneTestCase { IdentityHashMap enums = new IdentityHashMap(); MatchNoBits bits = new Bits.MatchNoBits(indexReader.maxDoc()); while ((iterator.next()) != null) { - DocsEnum docs = iterator.docs(random().nextBoolean() ? bits : new Bits.MatchNoBits(indexReader.maxDoc()), null, random().nextBoolean() ? DocsEnum.FLAG_FREQS : 0); + DocsEnum docs = iterator.docs(random().nextBoolean() ? bits : new Bits.MatchNoBits(indexReader.maxDoc()), null, random().nextBoolean() ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE); enums.put(docs, true); } @@ -85,7 +85,7 @@ public class TestReuseDocsEnum extends LuceneTestCase { MatchNoBits bits = new Bits.MatchNoBits(open.maxDoc()); DocsEnum docs = null; while ((iterator.next()) != null) { - docs = iterator.docs(bits, docs, random().nextBoolean() ? DocsEnum.FLAG_FREQS : 0); + docs = iterator.docs(bits, docs, random().nextBoolean() ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE); enums.put(docs, true); } @@ -94,7 +94,7 @@ public class TestReuseDocsEnum extends LuceneTestCase { iterator = terms.iterator(null); docs = null; while ((iterator.next()) != null) { - docs = iterator.docs(new Bits.MatchNoBits(open.maxDoc()), docs, random().nextBoolean() ? DocsEnum.FLAG_FREQS : 0); + docs = iterator.docs(new Bits.MatchNoBits(open.maxDoc()), docs, random().nextBoolean() ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE); enums.put(docs, true); } assertEquals(terms.size(), enums.size()); @@ -103,7 +103,7 @@ public class TestReuseDocsEnum extends LuceneTestCase { iterator = terms.iterator(null); docs = null; while ((iterator.next()) != null) { - docs = iterator.docs(null, docs, random().nextBoolean() ? DocsEnum.FLAG_FREQS : 0); + docs = iterator.docs(null, docs, random().nextBoolean() ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE); enums.put(docs, true); } assertEquals(1, enums.size()); @@ -135,7 +135,7 @@ public class TestReuseDocsEnum extends LuceneTestCase { DocsEnum docs = null; BytesRef term = null; while ((term = iterator.next()) != null) { - docs = iterator.docs(null, randomDocsEnum("body", term, leaves2, bits), random().nextBoolean() ? DocsEnum.FLAG_FREQS : 0); + docs = iterator.docs(null, randomDocsEnum("body", term, leaves2, bits), random().nextBoolean() ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE); enums.put(docs, true); } assertEquals(terms.size(), enums.size()); @@ -144,7 +144,7 @@ public class TestReuseDocsEnum extends LuceneTestCase { enums.clear(); docs = null; while ((term = iterator.next()) != null) { - docs = iterator.docs(bits, randomDocsEnum("body", term, leaves2, bits), random().nextBoolean() ? DocsEnum.FLAG_FREQS : 0); + docs = iterator.docs(bits, randomDocsEnum("body", term, leaves2, bits), random().nextBoolean() ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE); enums.put(docs, true); } assertEquals(terms.size(), enums.size()); @@ -163,7 +163,7 @@ public class TestReuseDocsEnum extends LuceneTestCase { } TermsEnum iterator = terms.iterator(null); if (iterator.seekExact(term, true)) { - return iterator.docs(bits, null, random().nextBoolean() ? DocsEnum.FLAG_FREQS : 0); + return iterator.docs(bits, null, random().nextBoolean() ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE); } return null; } diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat3.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat3.java index b8bdfab5886..25d21177727 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat3.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat3.java @@ -332,17 +332,17 @@ public class TestBlockPostingsFormat3 extends LuceneTestCase { rightPositions = rightTermsEnum.docsAndPositions(randomBits, rightPositions, DocsAndPositionsEnum.FLAG_OFFSETS)); // with positions only - assertDocsAndPositionsEnum(leftPositions = leftTermsEnum.docsAndPositions(null, leftPositions, 0), - rightPositions = rightTermsEnum.docsAndPositions(null, rightPositions, 0)); - assertDocsAndPositionsEnum(leftPositions = leftTermsEnum.docsAndPositions(randomBits, leftPositions, 0), - rightPositions = rightTermsEnum.docsAndPositions(randomBits, rightPositions, 0)); + assertDocsAndPositionsEnum(leftPositions = leftTermsEnum.docsAndPositions(null, leftPositions, DocsEnum.FLAG_NONE), + rightPositions = rightTermsEnum.docsAndPositions(null, rightPositions, DocsEnum.FLAG_NONE)); + assertDocsAndPositionsEnum(leftPositions = leftTermsEnum.docsAndPositions(randomBits, leftPositions, DocsEnum.FLAG_NONE), + rightPositions = rightTermsEnum.docsAndPositions(randomBits, rightPositions, DocsEnum.FLAG_NONE)); assertPositionsSkipping(leftTermsEnum.docFreq(), - leftPositions = leftTermsEnum.docsAndPositions(null, leftPositions, 0), - rightPositions = rightTermsEnum.docsAndPositions(null, rightPositions, 0)); + leftPositions = leftTermsEnum.docsAndPositions(null, leftPositions, DocsEnum.FLAG_NONE), + rightPositions = rightTermsEnum.docsAndPositions(null, rightPositions, DocsEnum.FLAG_NONE)); assertPositionsSkipping(leftTermsEnum.docFreq(), - leftPositions = leftTermsEnum.docsAndPositions(randomBits, leftPositions, 0), - rightPositions = rightTermsEnum.docsAndPositions(randomBits, rightPositions, 0)); + leftPositions = leftTermsEnum.docsAndPositions(randomBits, leftPositions, DocsEnum.FLAG_NONE), + rightPositions = rightTermsEnum.docsAndPositions(randomBits, rightPositions, DocsEnum.FLAG_NONE)); // with freqs: assertDocsEnum(leftDocs = leftTermsEnum.docs(null, leftDocs), @@ -351,10 +351,10 @@ public class TestBlockPostingsFormat3 extends LuceneTestCase { rightDocs = rightTermsEnum.docs(randomBits, rightDocs)); // w/o freqs: - assertDocsEnum(leftDocs = leftTermsEnum.docs(null, leftDocs, 0), - rightDocs = rightTermsEnum.docs(null, rightDocs, 0)); - assertDocsEnum(leftDocs = leftTermsEnum.docs(randomBits, leftDocs, 0), - rightDocs = rightTermsEnum.docs(randomBits, rightDocs, 0)); + assertDocsEnum(leftDocs = leftTermsEnum.docs(null, leftDocs, DocsEnum.FLAG_NONE), + rightDocs = rightTermsEnum.docs(null, rightDocs, DocsEnum.FLAG_NONE)); + assertDocsEnum(leftDocs = leftTermsEnum.docs(randomBits, leftDocs, DocsEnum.FLAG_NONE), + rightDocs = rightTermsEnum.docs(randomBits, rightDocs, DocsEnum.FLAG_NONE)); // with freqs: assertDocsSkipping(leftTermsEnum.docFreq(), @@ -366,11 +366,11 @@ public class TestBlockPostingsFormat3 extends LuceneTestCase { // w/o freqs: assertDocsSkipping(leftTermsEnum.docFreq(), - leftDocs = leftTermsEnum.docs(null, leftDocs, 0), - rightDocs = rightTermsEnum.docs(null, rightDocs, 0)); + leftDocs = leftTermsEnum.docs(null, leftDocs, DocsEnum.FLAG_NONE), + rightDocs = rightTermsEnum.docs(null, rightDocs, DocsEnum.FLAG_NONE)); assertDocsSkipping(leftTermsEnum.docFreq(), - leftDocs = leftTermsEnum.docs(randomBits, leftDocs, 0), - rightDocs = rightTermsEnum.docs(randomBits, rightDocs, 0)); + leftDocs = leftTermsEnum.docs(randomBits, leftDocs, DocsEnum.FLAG_NONE), + rightDocs = rightTermsEnum.docs(randomBits, rightDocs, DocsEnum.FLAG_NONE)); } } assertNull(rightTermsEnum.next()); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java b/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java index 42db793e0db..90f2de42310 100755 --- a/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java @@ -537,7 +537,7 @@ public class TestAddIndexes extends LuceneTestCase { private void verifyTermDocs(Directory dir, Term term, int numDocs) throws IOException { IndexReader reader = DirectoryReader.open(dir); - DocsEnum docsEnum = _TestUtil.docs(random(), reader, term.field, term.bytes, null, null, 0); + DocsEnum docsEnum = _TestUtil.docs(random(), reader, term.field, term.bytes, null, null, DocsEnum.FLAG_NONE); int count = 0; while (docsEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) count++; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java b/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java index 7a3065747d4..d07c77359fa 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java @@ -725,7 +725,7 @@ public class TestBackwardsCompatibility extends LuceneTestCase { // should be found exactly assertEquals(TermsEnum.SeekStatus.FOUND, terms.seekCeil(aaaTerm)); - assertEquals(35, countDocs(_TestUtil.docs(random(), terms, null, null, 0))); + assertEquals(35, countDocs(_TestUtil.docs(random(), terms, null, null, DocsEnum.FLAG_NONE))); assertNull(terms.next()); // should hit end of field @@ -737,12 +737,12 @@ public class TestBackwardsCompatibility extends LuceneTestCase { assertEquals(TermsEnum.SeekStatus.NOT_FOUND, terms.seekCeil(new BytesRef("a"))); assertTrue(terms.term().bytesEquals(aaaTerm)); - assertEquals(35, countDocs(_TestUtil.docs(random(), terms, null, null, 0))); + assertEquals(35, countDocs(_TestUtil.docs(random(), terms, null, null, DocsEnum.FLAG_NONE))); assertNull(terms.next()); assertEquals(TermsEnum.SeekStatus.FOUND, terms.seekCeil(aaaTerm)); - assertEquals(35, countDocs(_TestUtil.docs(random(), terms,null, null, 0))); + assertEquals(35, countDocs(_TestUtil.docs(random(), terms,null, null, DocsEnum.FLAG_NONE))); assertNull(terms.next()); r.close(); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java b/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java index b2f41dd03ed..b1ff1da1b7a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java @@ -277,7 +277,7 @@ public class TestCodecs extends LuceneTestCase { // make sure it properly fully resets (rewinds) its // internal state: for(int iter=0;iter<2;iter++) { - docsEnum = _TestUtil.docs(random(), termsEnum, null, docsEnum, 0); + docsEnum = _TestUtil.docs(random(), termsEnum, null, docsEnum, DocsEnum.FLAG_NONE); assertEquals(terms[i].docs[0], docsEnum.nextDoc()); assertEquals(DocIdSetIterator.NO_MORE_DOCS, docsEnum.nextDoc()); } @@ -474,7 +474,7 @@ public class TestCodecs extends LuceneTestCase { assertEquals(status, TermsEnum.SeekStatus.FOUND); assertEquals(term.docs.length, termsEnum.docFreq()); if (field.omitTF) { - this.verifyDocs(term.docs, term.positions, _TestUtil.docs(random(), termsEnum, null, null, 0), false); + this.verifyDocs(term.docs, term.positions, _TestUtil.docs(random(), termsEnum, null, null, DocsEnum.FLAG_NONE), false); } else { this.verifyDocs(term.docs, term.positions, termsEnum.docsAndPositions(null, null), true); } @@ -494,7 +494,7 @@ public class TestCodecs extends LuceneTestCase { assertTrue(termsEnum.term().bytesEquals(new BytesRef(term.text2))); assertEquals(term.docs.length, termsEnum.docFreq()); if (field.omitTF) { - this.verifyDocs(term.docs, term.positions, _TestUtil.docs(random(), termsEnum, null, null, 0), false); + this.verifyDocs(term.docs, term.positions, _TestUtil.docs(random(), termsEnum, null, null, DocsEnum.FLAG_NONE), false); } else { this.verifyDocs(term.docs, term.positions, termsEnum.docsAndPositions(null, null), true); } @@ -557,7 +557,7 @@ public class TestCodecs extends LuceneTestCase { } else { postings = null; docsAndFreqs = null; - docs = _TestUtil.docs(random(), termsEnum, null, null, 0); + docs = _TestUtil.docs(random(), termsEnum, null, null, DocsEnum.FLAG_NONE); } assertNotNull(docs); int upto2 = -1; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java b/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java index 22616a8fba6..132865c898e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java @@ -70,7 +70,7 @@ public class TestDocCount extends LuceneTestCase { FixedBitSet visited = new FixedBitSet(ir.maxDoc()); TermsEnum te = terms.iterator(null); while (te.next() != null) { - DocsEnum de = _TestUtil.docs(random(), te, null, null, 0); + DocsEnum de = _TestUtil.docs(random(), te, null, null, DocsEnum.FLAG_NONE); while (de.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) { visited.set(de.docID()); } diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java b/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java index 238d7591ca3..c0d297ab084 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java @@ -334,7 +334,7 @@ public class TestDocsAndPositions extends LuceneTestCase { writer.addDocument(doc); DirectoryReader reader = writer.getReader(); AtomicReader r = getOnlySegmentReader(reader); - DocsEnum disi = _TestUtil.docs(random(), r, "foo", new BytesRef("bar"), null, null, 0); + DocsEnum disi = _TestUtil.docs(random(), r, "foo", new BytesRef("bar"), null, null, DocsEnum.FLAG_NONE); int docid = disi.docID(); assertTrue(docid == -1 || docid == DocIdSetIterator.NO_MORE_DOCS); assertTrue(disi.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); @@ -342,7 +342,7 @@ public class TestDocsAndPositions extends LuceneTestCase { // now reuse and check again TermsEnum te = r.terms("foo").iterator(null); assertTrue(te.seekExact(new BytesRef("bar"), true)); - disi = _TestUtil.docs(random(), te, null, disi, 0); + disi = _TestUtil.docs(random(), te, null, disi, DocsEnum.FLAG_NONE); docid = disi.docID(); assertTrue(docid == -1 || docid == DocIdSetIterator.NO_MORE_DOCS); assertTrue(disi.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java b/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java index bb304c4a666..1659aeab40c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java @@ -349,11 +349,11 @@ public class TestDuelingCodecs extends LuceneTestCase { true); // w/o freqs: - assertDocsEnum(leftDocs = leftTermsEnum.docs(null, leftDocs, 0), - rightDocs = rightTermsEnum.docs(null, rightDocs, 0), + assertDocsEnum(leftDocs = leftTermsEnum.docs(null, leftDocs, DocsEnum.FLAG_NONE), + rightDocs = rightTermsEnum.docs(null, rightDocs, DocsEnum.FLAG_NONE), false); - assertDocsEnum(leftDocs = leftTermsEnum.docs(randomBits, leftDocs, 0), - rightDocs = rightTermsEnum.docs(randomBits, rightDocs, 0), + assertDocsEnum(leftDocs = leftTermsEnum.docs(randomBits, leftDocs, DocsEnum.FLAG_NONE), + rightDocs = rightTermsEnum.docs(randomBits, rightDocs, DocsEnum.FLAG_NONE), false); // with freqs: @@ -368,12 +368,12 @@ public class TestDuelingCodecs extends LuceneTestCase { // w/o freqs: assertDocsSkipping(leftTermsEnum.docFreq(), - leftDocs = leftTermsEnum.docs(null, leftDocs, 0), - rightDocs = rightTermsEnum.docs(null, rightDocs, 0), + leftDocs = leftTermsEnum.docs(null, leftDocs, DocsEnum.FLAG_NONE), + rightDocs = rightTermsEnum.docs(null, rightDocs, DocsEnum.FLAG_NONE), false); assertDocsSkipping(leftTermsEnum.docFreq(), - leftDocs = leftTermsEnum.docs(randomBits, leftDocs, 0), - rightDocs = rightTermsEnum.docs(randomBits, rightDocs, 0), + leftDocs = leftTermsEnum.docs(randomBits, leftDocs, DocsEnum.FLAG_NONE), + rightDocs = rightTermsEnum.docs(randomBits, rightDocs, DocsEnum.FLAG_NONE), false); } } diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java index 0a24a625906..fc99fb61dc9 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java @@ -1181,12 +1181,12 @@ public class TestIndexWriter extends LuceneTestCase { // test that the terms were indexed. - assertTrue(_TestUtil.docs(random(), ir, "binary", new BytesRef("doc1field1"), null, null, 0).nextDoc() != DocIdSetIterator.NO_MORE_DOCS); - assertTrue(_TestUtil.docs(random(), ir, "binary", new BytesRef("doc2field1"), null, null, 0).nextDoc() != DocIdSetIterator.NO_MORE_DOCS); - assertTrue(_TestUtil.docs(random(), ir, "binary", new BytesRef("doc3field1"), null, null, 0).nextDoc() != DocIdSetIterator.NO_MORE_DOCS); - assertTrue(_TestUtil.docs(random(), ir, "string", new BytesRef("doc1field2"), null, null, 0).nextDoc() != DocIdSetIterator.NO_MORE_DOCS); - assertTrue(_TestUtil.docs(random(), ir, "string", new BytesRef("doc2field2"), null, null, 0).nextDoc() != DocIdSetIterator.NO_MORE_DOCS); - assertTrue(_TestUtil.docs(random(), ir, "string", new BytesRef("doc3field2"), null, null, 0).nextDoc() != DocIdSetIterator.NO_MORE_DOCS); + assertTrue(_TestUtil.docs(random(), ir, "binary", new BytesRef("doc1field1"), null, null, DocsEnum.FLAG_NONE).nextDoc() != DocIdSetIterator.NO_MORE_DOCS); + assertTrue(_TestUtil.docs(random(), ir, "binary", new BytesRef("doc2field1"), null, null, DocsEnum.FLAG_NONE).nextDoc() != DocIdSetIterator.NO_MORE_DOCS); + assertTrue(_TestUtil.docs(random(), ir, "binary", new BytesRef("doc3field1"), null, null, DocsEnum.FLAG_NONE).nextDoc() != DocIdSetIterator.NO_MORE_DOCS); + assertTrue(_TestUtil.docs(random(), ir, "string", new BytesRef("doc1field2"), null, null, DocsEnum.FLAG_NONE).nextDoc() != DocIdSetIterator.NO_MORE_DOCS); + assertTrue(_TestUtil.docs(random(), ir, "string", new BytesRef("doc2field2"), null, null, DocsEnum.FLAG_NONE).nextDoc() != DocIdSetIterator.NO_MORE_DOCS); + assertTrue(_TestUtil.docs(random(), ir, "string", new BytesRef("doc3field2"), null, null, DocsEnum.FLAG_NONE).nextDoc() != DocIdSetIterator.NO_MORE_DOCS); ir.close(); dir.close(); @@ -1258,7 +1258,7 @@ public class TestIndexWriter extends LuceneTestCase { TermsEnum t = r.fields().terms("field").iterator(null); int count = 0; while(t.next() != null) { - final DocsEnum docs = _TestUtil.docs(random(), t, null, null, 0); + final DocsEnum docs = _TestUtil.docs(random(), t, null, null, DocsEnum.FLAG_NONE); assertEquals(0, docs.nextDoc()); assertEquals(DocIdSetIterator.NO_MORE_DOCS, docs.nextDoc()); count++; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java index 02897e363ed..99307334e33 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java @@ -983,7 +983,7 @@ public class TestIndexWriterReader extends LuceneTestCase { w.addDocument(doc); SegmentReader r = getOnlySegmentReader(DirectoryReader.open(w, true)); try { - _TestUtil.docs(random(), r, "f", new BytesRef("val"), null, null, 0); + _TestUtil.docs(random(), r, "f", new BytesRef("val"), null, null, DocsEnum.FLAG_NONE); fail("should have failed to seek since terms index was not loaded."); } catch (IllegalStateException e) { // expected - we didn't load the term index diff --git a/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java b/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java index 8683f4b0f66..ca9b8c3af3b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java @@ -374,7 +374,7 @@ public class TestLongPostings extends LuceneTestCase { final DocsEnum postings; if (options == IndexOptions.DOCS_ONLY) { - docs = _TestUtil.docs(random(), r, "field", new BytesRef(term), null, null, 0); + docs = _TestUtil.docs(random(), r, "field", new BytesRef(term), null, null, DocsEnum.FLAG_NONE); postings = null; } else { docs = postings = _TestUtil.docs(random(), r, "field", new BytesRef(term), null, null, DocsEnum.FLAG_FREQS); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java b/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java index bcf6efc010a..a9b14822683 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java @@ -121,7 +121,7 @@ public class TestMultiFields extends LuceneTestCase { System.out.println("TEST: seek term="+ UnicodeUtil.toHexString(term.utf8ToString()) + " " + term); } - DocsEnum docsEnum = _TestUtil.docs(random(), reader, "field", term, liveDocs, null, 0); + DocsEnum docsEnum = _TestUtil.docs(random(), reader, "field", term, liveDocs, null, DocsEnum.FLAG_NONE); assertNotNull(docsEnum); for(int docID : docs.get(term)) { @@ -162,8 +162,8 @@ public class TestMultiFields extends LuceneTestCase { w.addDocument(d); IndexReader r = w.getReader(); w.close(); - DocsEnum d1 = _TestUtil.docs(random(), r, "f", new BytesRef("j"), null, null, 0); - DocsEnum d2 = _TestUtil.docs(random(), r, "f", new BytesRef("j"), null, null, 0); + DocsEnum d1 = _TestUtil.docs(random(), r, "f", new BytesRef("j"), null, null, DocsEnum.FLAG_NONE); + DocsEnum d2 = _TestUtil.docs(random(), r, "f", new BytesRef("j"), null, null, DocsEnum.FLAG_NONE); assertEquals(0, d1.nextDoc()); assertEquals(0, d2.nextDoc()); r.close(); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java b/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java index c965ca28ee5..9d47186d5c4 100755 --- a/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java @@ -82,7 +82,7 @@ public class TestParallelTermEnum extends LuceneTestCase { BytesRef b = te.next(); assertNotNull(b); assertEquals(t, b.utf8ToString()); - DocsEnum td = _TestUtil.docs(random(), te, liveDocs, null, 0); + DocsEnum td = _TestUtil.docs(random(), te, liveDocs, null, DocsEnum.FLAG_NONE); assertTrue(td.nextDoc() != DocIdSetIterator.NO_MORE_DOCS); assertEquals(0, td.docID()); assertEquals(td.nextDoc(), DocIdSetIterator.NO_MORE_DOCS); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java b/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java index 8312cf75ef2..9718e108397 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java @@ -228,7 +228,7 @@ public class TestPerSegmentDeletes extends LuceneTestCase { Terms cterms = fields.terms(term.field); TermsEnum ctermsEnum = cterms.iterator(null); if (ctermsEnum.seekExact(new BytesRef(term.text()), false)) { - DocsEnum docsEnum = _TestUtil.docs(random(), ctermsEnum, bits, null, 0); + DocsEnum docsEnum = _TestUtil.docs(random(), ctermsEnum, bits, null, DocsEnum.FLAG_NONE); return toArray(docsEnum); } return null; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java b/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java index c30a3810967..3a1335259a9 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java @@ -82,11 +82,11 @@ public class TestStressAdvance extends LuceneTestCase { System.out.println("\nTEST: iter=" + iter + " iter2=" + iter2); } assertEquals(TermsEnum.SeekStatus.FOUND, te.seekCeil(new BytesRef("a"))); - de = _TestUtil.docs(random(), te, null, de, 0); + de = _TestUtil.docs(random(), te, null, de, DocsEnum.FLAG_NONE); testOne(de, aDocIDs); assertEquals(TermsEnum.SeekStatus.FOUND, te.seekCeil(new BytesRef("b"))); - de = _TestUtil.docs(random(), te, null, de, 0); + de = _TestUtil.docs(random(), te, null, de, DocsEnum.FLAG_NONE); testOne(de, bDocIDs); } diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java index b3cf7b4317a..7bdea572747 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java @@ -337,7 +337,7 @@ public class TestStressIndexing2 extends LuceneTestCase { Bits liveDocs = MultiFields.getLiveDocs(r1); DocsEnum docs = null; while(termsEnum.next() != null) { - docs = _TestUtil.docs(random(), termsEnum, liveDocs, docs, 0); + docs = _TestUtil.docs(random(), termsEnum, liveDocs, docs, DocsEnum.FLAG_NONE); while(docs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) { fail("r1 is not empty but r2 is"); } @@ -357,9 +357,9 @@ public class TestStressIndexing2 extends LuceneTestCase { break; } - termDocs1 = _TestUtil.docs(random(), termsEnum, liveDocs1, termDocs1, 0); + termDocs1 = _TestUtil.docs(random(), termsEnum, liveDocs1, termDocs1, DocsEnum.FLAG_NONE); if (termsEnum2.seekExact(term, false)) { - termDocs2 = _TestUtil.docs(random(), termsEnum2, liveDocs2, termDocs2, 0); + termDocs2 = _TestUtil.docs(random(), termsEnum2, liveDocs2, termDocs2, DocsEnum.FLAG_NONE); } else { termDocs2 = null; } diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java index b653b3fd04c..d3773b5cafe 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java @@ -225,7 +225,7 @@ public class TestTermVectorsReader extends LuceneTestCase { //System.out.println("Term: " + term); assertEquals(testTerms[i], term); - docsEnum = _TestUtil.docs(random(), termsEnum, null, docsEnum, 0); + docsEnum = _TestUtil.docs(random(), termsEnum, null, docsEnum, DocsEnum.FLAG_NONE); assertNotNull(docsEnum); int doc = docsEnum.docID(); assertTrue(doc == -1 || doc == DocIdSetIterator.NO_MORE_DOCS); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java b/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java index cb721d8742a..f55085d4027 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java @@ -124,7 +124,7 @@ public class TestTermdocPerf extends LuceneTestCase { final Random random = new Random(random().nextLong()); for (int i=0; i 1) { // unset potential duplicates - docs = termsEnum.docs(acceptDocs, docs, 0); + docs = termsEnum.docs(acceptDocs, docs, DocsEnum.FLAG_NONE); int doc = docs.nextDoc(); if (doc != DocIdSetIterator.NO_MORE_DOCS) { if (keepMode == KeepMode.KM_USE_FIRST_OCCURRENCE) { diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeFilter.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeFilter.java index 5e3047729ec..e5ff9a5f6d7 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeFilter.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeFilter.java @@ -117,7 +117,7 @@ RE "scan" threshold: if (!termsEnum.seekExact(cellTerm, true)) continue; if (cell.getLevel() == detailLevel || cell.isLeaf()) { - docsEnum = termsEnum.docs(acceptDocs, docsEnum, 0); + docsEnum = termsEnum.docs(acceptDocs, docsEnum, DocsEnum.FLAG_NONE); addDocs(docsEnum,bits); } else {//any other intersection assert cell.getLevel() < detailLevel; //assertions help clarify logic @@ -130,7 +130,7 @@ RE "scan" threshold: assert StringHelper.startsWith(nextCellTerm, cellTerm); scanCell = grid.getNode(nextCellTerm.bytes, nextCellTerm.offset, nextCellTerm.length, scanCell); if (scanCell.getLevel() == cell.getLevel() && scanCell.isLeaf()) { - docsEnum = termsEnum.docs(acceptDocs, docsEnum, 0); + docsEnum = termsEnum.docs(acceptDocs, docsEnum, DocsEnum.FLAG_NONE); addDocs(docsEnum,bits); //increment pointer to avoid potential redundant addDocs() below nextCellTerm = termsEnum.next(); @@ -163,7 +163,7 @@ RE "scan" threshold: if(queryShape.relate(cShape) == SpatialRelation.DISJOINT) continue; - docsEnum = termsEnum.docs(acceptDocs, docsEnum, 0); + docsEnum = termsEnum.docs(acceptDocs, docsEnum, DocsEnum.FLAG_NONE); addDocs(docsEnum,bits); } }//term loop diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java b/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java index a0317e96a0d..c78ddd925c6 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java @@ -70,7 +70,7 @@ public abstract class ShapeFieldCacheProvider { while (term != null) { T shape = readShape(term); if( shape != null ) { - docs = te.docs(null, docs, 0); + docs = te.docs(null, docs, DocsEnum.FLAG_NONE); Integer docid = docs.nextDoc(); while (docid != DocIdSetIterator.NO_MORE_DOCS) { idx.add( docid, shape ); diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java index bb1f7c17c8f..cc416398fcc 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java @@ -667,7 +667,7 @@ public abstract class BasePostingsFormatTestCase extends LuceneTestCase { if (options.contains(Option.REUSE_ENUMS) && random().nextInt(10) < 9) { prevDocsEnum = threadState.reuseDocsEnum; } - threadState.reuseDocsEnum = termsEnum.docs(liveDocs, prevDocsEnum, doCheckFreqs ? DocsEnum.FLAG_FREQS : 0); + threadState.reuseDocsEnum = termsEnum.docs(liveDocs, prevDocsEnum, doCheckFreqs ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE); docsEnum = threadState.reuseDocsEnum; docsAndPositionsEnum = null; } diff --git a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java index 4cd185448b6..d59085f87b8 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java @@ -389,7 +389,7 @@ public class LukeRequestHandler extends RequestHandlerBase if (text == null) { // Ran off the end of the terms enum without finding any live docs with that field in them. return null; } - docsEnum = termsEnum.docs(reader.getLiveDocs(), docsEnum, 0); + docsEnum = termsEnum.docs(reader.getLiveDocs(), docsEnum, DocsEnum.FLAG_NONE); if (docsEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) { return reader.document(docsEnum.docID()); } diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java index 401fe1d2183..ad669da72bf 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java @@ -540,7 +540,7 @@ public class QueryElevationComponent extends SearchComponent implements SolrCore for (String id : elevations.ids) { term.copyChars(id); if (seen.contains(id) == false && termsEnum.seekExact(term, false)) { - docsEnum = termsEnum.docs(liveDocs, docsEnum, 0); + docsEnum = termsEnum.docs(liveDocs, docsEnum, DocsEnum.FLAG_NONE); if (docsEnum != null) { int docId = docsEnum.nextDoc(); if (docId == DocIdSetIterator.NO_MORE_DOCS ) continue; // must have been deleted diff --git a/solr/core/src/java/org/apache/solr/request/SimpleFacets.java b/solr/core/src/java/org/apache/solr/request/SimpleFacets.java index f5148a028e1..49b58859f82 100644 --- a/solr/core/src/java/org/apache/solr/request/SimpleFacets.java +++ b/solr/core/src/java/org/apache/solr/request/SimpleFacets.java @@ -755,7 +755,7 @@ public class SimpleFacets { // TODO: specialize when base docset is a bitset or hash set (skipDocs)? or does it matter for this? // TODO: do this per-segment for better efficiency (MultiDocsEnum just uses base class impl) // TODO: would passing deleted docs lead to better efficiency over checking the fastForRandomSet? - docsEnum = termsEnum.docs(null, docsEnum, 0); + docsEnum = termsEnum.docs(null, docsEnum, DocsEnum.FLAG_NONE); c=0; if (docsEnum instanceof MultiDocsEnum) { diff --git a/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java index 682268ac47a..c1448ddca39 100644 --- a/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java @@ -340,7 +340,7 @@ class JoinQuery extends Query { if (freq < minDocFreqFrom) { fromTermDirectCount++; // OK to skip liveDocs, since we check for intersection with docs matching query - fromDeState.docsEnum = fromDeState.termsEnum.docs(null, fromDeState.docsEnum, 0); + fromDeState.docsEnum = fromDeState.termsEnum.docs(null, fromDeState.docsEnum, DocsEnum.FLAG_NONE); DocsEnum docsEnum = fromDeState.docsEnum; if (docsEnum instanceof MultiDocsEnum) { @@ -405,7 +405,7 @@ class JoinQuery extends Query { toTermDirectCount++; // need to use liveDocs here so we don't map to any deleted ones - toDeState.docsEnum = toDeState.termsEnum.docs(toDeState.liveDocs, toDeState.docsEnum, 0); + toDeState.docsEnum = toDeState.termsEnum.docs(toDeState.liveDocs, toDeState.docsEnum, DocsEnum.FLAG_NONE); DocsEnum docsEnum = toDeState.docsEnum; if (docsEnum instanceof MultiDocsEnum) { diff --git a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java index b986d543440..3b70250a30c 100644 --- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java +++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java @@ -594,7 +594,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable,SolrIn if (!termsEnum.seekExact(termBytes, false)) { return -1; } - DocsEnum docs = termsEnum.docs(atomicReader.getLiveDocs(), null, 0); + DocsEnum docs = termsEnum.docs(atomicReader.getLiveDocs(), null, DocsEnum.FLAG_NONE); if (docs == null) return -1; int id = docs.nextDoc(); return id == DocIdSetIterator.NO_MORE_DOCS ? -1 : id; @@ -616,7 +616,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable,SolrIn TermsEnum te = terms.iterator(null); if (te.seekExact(idBytes, true)) { - DocsEnum docs = te.docs(reader.getLiveDocs(), null, 0); + DocsEnum docs = te.docs(reader.getLiveDocs(), null, DocsEnum.FLAG_NONE); int id = docs.nextDoc(); if (id == DocIdSetIterator.NO_MORE_DOCS) continue; assert docs.nextDoc() == DocIdSetIterator.NO_MORE_DOCS; @@ -920,7 +920,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable,SolrIn int bitsSet = 0; OpenBitSet obs = null; - DocsEnum docsEnum = deState.termsEnum.docs(deState.liveDocs, deState.docsEnum, 0); + DocsEnum docsEnum = deState.termsEnum.docs(deState.liveDocs, deState.docsEnum, DocsEnum.FLAG_NONE); if (deState.docsEnum == null) { deState.docsEnum = docsEnum; } @@ -998,7 +998,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable,SolrIn if (terms != null) { final TermsEnum termsEnum = terms.iterator(null); if (termsEnum.seekExact(termBytes, false)) { - docsEnum = termsEnum.docs(liveDocs, null, 0); + docsEnum = termsEnum.docs(liveDocs, null, DocsEnum.FLAG_NONE); } } diff --git a/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java b/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java index 393a3ff839b..de508cf4bca 100755 --- a/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java +++ b/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java @@ -305,7 +305,7 @@ public class FileFloatSource extends ValueSource { continue; } - docsEnum = termsEnum.docs(null, docsEnum, 0); + docsEnum = termsEnum.docs(null, docsEnum, DocsEnum.FLAG_NONE); int doc; while ((doc = docsEnum.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) { vals[doc] = fval; diff --git a/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java b/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java index 98fcd41e0aa..fb87d940baf 100644 --- a/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java +++ b/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java @@ -151,7 +151,7 @@ public class SolrIndexSplitter { // TODO: hook in custom hashes (or store hashes) int hash = Hash.murmurhash3_x86_32(term.bytes, term.offset, term.length, 0); - docsEnum = termsEnum.docs(liveDocs, docsEnum, 0x0); + docsEnum = termsEnum.docs(liveDocs, docsEnum, DocsEnum.FLAG_NONE); for (;;) { int doc = docsEnum.nextDoc(); if (doc == DocsEnum.NO_MORE_DOCS) break; diff --git a/solr/core/src/test/org/apache/solr/search/TestRTGBase.java b/solr/core/src/test/org/apache/solr/search/TestRTGBase.java index aa50ec27bfa..f91984c6c24 100644 --- a/solr/core/src/test/org/apache/solr/search/TestRTGBase.java +++ b/solr/core/src/test/org/apache/solr/search/TestRTGBase.java @@ -134,7 +134,7 @@ public class TestRTGBase extends SolrTestCaseJ4 { if (!termsEnum.seekExact(termBytes, false)) { return -1; } - DocsEnum docs = termsEnum.docs(MultiFields.getLiveDocs(r), null, 0); + DocsEnum docs = termsEnum.docs(MultiFields.getLiveDocs(r), null, DocsEnum.FLAG_NONE); int id = docs.nextDoc(); if (id != DocIdSetIterator.NO_MORE_DOCS) { int next = docs.nextDoc();