You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2015/04/08 22:27:39 UTC
svn commit: r1672165 [3/3] - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/analysis/
lucene/analysis/common/src/java/org/apache/lucene/analysis/query/
lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/
lucene/backward-codecs/ luce...
Modified: lucene/dev/branches/branch_5x/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstRAMDir.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstRAMDir.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstRAMDir.java (original)
+++ lucene/dev/branches/branch_5x/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstRAMDir.java Wed Apr 8 20:27:35 2015
@@ -191,8 +191,8 @@ public class TestMemoryIndexAgainstRAMDi
assertEquals(iwTerms.getDocCount(), memTerms.getDocCount());
assertEquals(iwTerms.getSumDocFreq(), memTerms.getSumDocFreq());
assertEquals(iwTerms.getSumTotalTermFreq(), memTerms.getSumTotalTermFreq());
- TermsEnum iwTermsIter = iwTerms.iterator(null);
- TermsEnum memTermsIter = memTerms.iterator(null);
+ TermsEnum iwTermsIter = iwTerms.iterator();
+ TermsEnum memTermsIter = memTerms.iterator();
if (iwTerms.hasPositions()) {
final boolean offsets = iwTerms.hasOffsets() && memTerms.hasOffsets();
@@ -326,7 +326,7 @@ public class TestMemoryIndexAgainstRAMDi
assertTrue(disi.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
// now reuse and check again
- TermsEnum te = reader.terms("foo").iterator(null);
+ TermsEnum te = reader.terms("foo").iterator();
assertTrue(te.seekExact(new BytesRef("bar")));
disi = te.postings(null, disi, PostingsEnum.NONE);
docid = disi.docID();
@@ -365,7 +365,7 @@ public class TestMemoryIndexAgainstRAMDi
assertEquals(3, disi.endOffset());
// now reuse and check again
- TermsEnum te = reader.terms("foo").iterator(null);
+ TermsEnum te = reader.terms("foo").iterator();
assertTrue(te.seekExact(new BytesRef("bar")));
disi = te.postings(null, disi);
docid = disi.docID();
@@ -529,8 +529,8 @@ public class TestMemoryIndexAgainstRAMDi
protected void compareTermVectors(Terms terms, Terms memTerms, String field_name) throws IOException {
- TermsEnum termEnum = terms.iterator(null);
- TermsEnum memTermEnum = memTerms.iterator(null);
+ TermsEnum termEnum = terms.iterator();
+ TermsEnum memTermEnum = memTerms.iterator();
while (termEnum.next() != null) {
assertNotNull(memTermEnum.next());
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/SortingLeafReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/SortingLeafReader.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/SortingLeafReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/index/SortingLeafReader.java Wed Apr 8 20:27:35 2015
@@ -87,8 +87,8 @@ public class SortingLeafReader extends F
}
@Override
- public TermsEnum iterator(final TermsEnum reuse) throws IOException {
- return new SortingTermsEnum(in.iterator(reuse), docMap, indexOptions, hasPositions());
+ public TermsEnum iterator() throws IOException {
+ return new SortingTermsEnum(in.iterator(), docMap, indexOptions, hasPositions());
}
@Override
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java Wed Apr 8 20:27:35 2015
@@ -101,7 +101,7 @@ public class HighFreqTerms {
throw new RuntimeException("field " + field + " not found");
}
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
tiq = new TermStatsQueue(numTerms, comparator);
tiq.fill(field, termsEnum);
} else {
@@ -113,7 +113,7 @@ public class HighFreqTerms {
for (String fieldName : fields) {
Terms terms = fields.terms(fieldName);
if (terms != null) {
- tiq.fill(fieldName, terms.iterator(null));
+ tiq.fill(fieldName, terms.iterator());
}
}
}
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java Wed Apr 8 20:27:35 2015
@@ -243,7 +243,7 @@ public class DocTermOrds implements Acco
if (terms == null) {
return null;
} else {
- return terms.iterator(null);
+ return terms.iterator();
}
} else {
//System.out.println("GET wrapped enum ordBase=" + ordBase);
@@ -296,7 +296,7 @@ public class DocTermOrds implements Acco
return;
}
- final TermsEnum te = terms.iterator(null);
+ final TermsEnum te = terms.iterator();
final BytesRef seekStart = termPrefix != null ? termPrefix : new BytesRef();
//System.out.println("seekStart=" + seekStart.utf8ToString());
if (te.seekCeil(seekStart) == TermsEnum.SeekStatus.END) {
@@ -615,7 +615,7 @@ public class DocTermOrds implements Acco
public OrdWrappedTermsEnum(LeafReader reader) throws IOException {
assert indexedTermsArray != null;
- termsEnum = reader.fields().terms(field).iterator(null);
+ termsEnum = reader.fields().terms(field).iterator();
}
@Override
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java Wed Apr 8 20:27:35 2015
@@ -106,7 +106,7 @@ interface FieldCache {
@Override
public TermsEnum termsEnum(Terms terms) throws IOException {
- return NumericUtils.filterPrefixCodedInts(terms.iterator(null));
+ return NumericUtils.filterPrefixCodedInts(terms.iterator());
}
@Override
@@ -134,7 +134,7 @@ interface FieldCache {
@Override
public TermsEnum termsEnum(Terms terms) throws IOException {
- return NumericUtils.filterPrefixCodedInts(terms.iterator(null));
+ return NumericUtils.filterPrefixCodedInts(terms.iterator());
}
};
@@ -154,7 +154,7 @@ interface FieldCache {
@Override
public TermsEnum termsEnum(Terms terms) throws IOException {
- return NumericUtils.filterPrefixCodedLongs(terms.iterator(null));
+ return NumericUtils.filterPrefixCodedLongs(terms.iterator());
}
};
@@ -176,7 +176,7 @@ interface FieldCache {
@Override
public TermsEnum termsEnum(Terms terms) throws IOException {
- return NumericUtils.filterPrefixCodedLongs(terms.iterator(null));
+ return NumericUtils.filterPrefixCodedLongs(terms.iterator());
}
};
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java Wed Apr 8 20:27:35 2015
@@ -412,7 +412,7 @@ class FieldCacheImpl implements FieldCac
// Fast case: all docs have this field:
return new BitsEntry(new Bits.MatchAllBits(maxDoc));
}
- final TermsEnum termsEnum = terms.iterator(null);
+ final TermsEnum termsEnum = terms.iterator();
PostingsEnum docs = null;
while(true) {
final BytesRef term = termsEnum.next();
@@ -695,7 +695,7 @@ class FieldCacheImpl implements FieldCac
// TODO: use Uninvert?
if (terms != null) {
- final TermsEnum termsEnum = terms.iterator(null);
+ final TermsEnum termsEnum = terms.iterator();
PostingsEnum docs = null;
while(true) {
@@ -845,7 +845,7 @@ class FieldCacheImpl implements FieldCac
if (terms != null) {
int termCount = 0;
- final TermsEnum termsEnum = terms.iterator(null);
+ final TermsEnum termsEnum = terms.iterator();
PostingsEnum docs = null;
while(true) {
if (termCount++ == termCountHardLimit) {
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/SorterTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/SorterTestBase.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/SorterTestBase.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/SorterTestBase.java Wed Apr 8 20:27:35 2015
@@ -233,7 +233,7 @@ public abstract class SorterTestBase ext
@Test
public void testDocsAndPositionsEnum() throws Exception {
- TermsEnum termsEnum = sortedReader.terms(DOC_POSITIONS_FIELD).iterator(null);
+ TermsEnum termsEnum = sortedReader.terms(DOC_POSITIONS_FIELD).iterator();
assertEquals(SeekStatus.FOUND, termsEnum.seekCeil(new BytesRef(DOC_POSITIONS_TERM)));
PostingsEnum sortedPositions = termsEnum.postings(null, null, PostingsEnum.ALL);
int doc;
@@ -294,7 +294,7 @@ public abstract class SorterTestBase ext
@Test
public void testDocsEnum() throws Exception {
Bits mappedLiveDocs = randomLiveDocs(sortedReader.maxDoc());
- TermsEnum termsEnum = sortedReader.terms(DOCS_ENUM_FIELD).iterator(null);
+ TermsEnum termsEnum = sortedReader.terms(DOCS_ENUM_FIELD).iterator();
assertEquals(SeekStatus.FOUND, termsEnum.seekCeil(new BytesRef(DOCS_ENUM_TERM)));
PostingsEnum docs = termsEnum.postings(mappedLiveDocs, null);
@@ -392,7 +392,7 @@ public abstract class SorterTestBase ext
for (int i = 0; i < maxDoc; i++) {
Terms terms = sortedReader.getTermVector(i, TERM_VECTORS_FIELD);
assertNotNull("term vectors not found for doc " + i + " field [" + TERM_VECTORS_FIELD + "]", terms);
- assertEquals("incorrect term vector for doc " + i, sortedValues[i].toString(), terms.iterator(null).next().utf8ToString());
+ assertEquals("incorrect term vector for doc " + i, sortedValues[i].toString(), terms.iterator().next().utf8ToString());
}
}
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java Wed Apr 8 20:27:35 2015
@@ -72,7 +72,7 @@ public class TestMultiPassIndexSplitter
assertTrue(ir.numDocs() - NUM_DOCS / 3 <= 1); // rounding error
Document doc = ir.document(0);
assertEquals("0", doc.get("id"));
- TermsEnum te = MultiFields.getTerms(ir, "id").iterator(null);
+ TermsEnum te = MultiFields.getTerms(ir, "id").iterator();
assertEquals(TermsEnum.SeekStatus.NOT_FOUND, te.seekCeil(new BytesRef("1")));
assertNotSame("1", te.term().utf8ToString());
ir.close();
@@ -80,7 +80,7 @@ public class TestMultiPassIndexSplitter
assertTrue(ir.numDocs() - NUM_DOCS / 3 <= 1);
doc = ir.document(0);
assertEquals("1", doc.get("id"));
- te = MultiFields.getTerms(ir, "id").iterator(null);
+ te = MultiFields.getTerms(ir, "id").iterator();
assertEquals(TermsEnum.SeekStatus.NOT_FOUND, te.seekCeil(new BytesRef("0")));
assertNotSame("0", te.term().utf8ToString());
@@ -90,7 +90,7 @@ public class TestMultiPassIndexSplitter
doc = ir.document(0);
assertEquals("2", doc.get("id"));
- te = MultiFields.getTerms(ir, "id").iterator(null);
+ te = MultiFields.getTerms(ir, "id").iterator();
assertEquals(TermsEnum.SeekStatus.NOT_FOUND, te.seekCeil(new BytesRef("1")));
assertNotSame("1", te.term());
@@ -130,7 +130,7 @@ public class TestMultiPassIndexSplitter
doc = ir.document(0);
assertEquals(start + "", doc.get("id"));
// make sure the deleted doc is not here
- TermsEnum te = MultiFields.getTerms(ir, "id").iterator(null);
+ TermsEnum te = MultiFields.getTerms(ir, "id").iterator();
Term t = new Term("id", (NUM_DOCS - 1) + "");
assertEquals(TermsEnum.SeekStatus.NOT_FOUND, te.seekCeil(new BytesRef(t.text())));
assertNotSame(t.text(), te.term().utf8ToString());
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestDocTermOrds.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestDocTermOrds.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestDocTermOrds.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestDocTermOrds.java Wed Apr 8 20:27:35 2015
@@ -331,7 +331,7 @@ public class TestDocTermOrds extends Luc
if (VERBOSE) {
System.out.println("TEST: verify prefix=" + (prefixRef==null ? "null" : prefixRef.utf8ToString()));
System.out.println("TEST: all TERMS:");
- TermsEnum allTE = MultiFields.getTerms(r, "field").iterator(null);
+ TermsEnum allTE = MultiFields.getTerms(r, "field").iterator();
int ord = 0;
while(allTE.next() != null) {
System.out.println(" ord=" + (ord++) + " term=" + allTE.term().utf8ToString());
@@ -346,7 +346,7 @@ public class TestDocTermOrds extends Luc
} else {
Terms terms = MultiFields.getTerms(r, "field");
if (terms != null) {
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
TermsEnum.SeekStatus result = termsEnum.seekCeil(prefixRef);
if (result != TermsEnum.SeekStatus.END) {
assertFalse("term=" + termsEnum.term().utf8ToString() + " matches prefix=" + prefixRef.utf8ToString(), StringHelper.startsWith(termsEnum.term(), prefixRef));
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java Wed Apr 8 20:27:35 2015
@@ -141,7 +141,7 @@ public class TestFieldCache extends Luce
cache.getNumerics(reader, "theDouble", new FieldCache.Parser() {
@Override
public TermsEnum termsEnum(Terms terms) throws IOException {
- return NumericUtils.filterPrefixCodedLongs(terms.iterator(null));
+ return NumericUtils.filterPrefixCodedLongs(terms.iterator());
}
@Override
public long parseValue(BytesRef term) {
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/CommonTermsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/CommonTermsQuery.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/CommonTermsQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/CommonTermsQuery.java Wed Apr 8 20:27:35 2015
@@ -247,7 +247,7 @@ public class CommonTermsQuery extends Qu
// field does not exist
continue;
}
- termsEnum = terms.iterator(termsEnum);
+ termsEnum = terms.iterator();
assert termsEnum != null;
if (termsEnum == TermsEnum.EMPTY) continue;
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java Wed Apr 8 20:27:35 2015
@@ -211,7 +211,7 @@ public final class TermsFilter extends F
PostingsEnum docs = null;
for (TermsAndField termsAndField : this.termsAndFields) {
if ((terms = fields.terms(termsAndField.field)) != null) {
- termsEnum = terms.iterator(termsEnum); // this won't return null
+ termsEnum = terms.iterator(); // this won't return null
for (int i = termsAndField.start; i < termsAndField.end; i++) {
spare.offset = offsets[i];
spare.length = offsets[i+1] - offsets[i];
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java Wed Apr 8 20:27:35 2015
@@ -382,7 +382,7 @@ public class TermsQuery extends Query im
PostingsEnum docs = null;
for (TermsAndField termsAndField : termsAndFields) {
if ((terms = fields.terms(termsAndField.field)) != null) {
- termsEnum = terms.iterator(termsEnum); // this won't return null
+ termsEnum = terms.iterator(); // this won't return null
for (int i = termsAndField.start; i < termsAndField.end; i++) {
spare.offset = offsets[i];
spare.length = offsets[i+1] - offsets[i];
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java Wed Apr 8 20:27:35 2015
@@ -59,7 +59,7 @@ public class JoinDocFreqValueSource exte
final BinaryDocValues terms = DocValues.getBinary(readerContext.reader(), field);
final IndexReader top = ReaderUtil.getTopLevelContext(readerContext).reader();
Terms t = MultiFields.getTerms(top, qfield);
- final TermsEnum termsEnum = t == null ? TermsEnum.EMPTY : t.iterator(null);
+ final TermsEnum termsEnum = t == null ? TermsEnum.EMPTY : t.iterator();
return new IntDocValues(this) {
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java Wed Apr 8 20:27:35 2015
@@ -70,7 +70,7 @@ public class TFValueSource extends TermF
// no one should call us for deleted docs?
if (terms != null) {
- final TermsEnum termsEnum = terms.iterator(null);
+ final TermsEnum termsEnum = terms.iterator();
if (termsEnum.seekExact(indexedBytes)) {
docs = termsEnum.postings(null, null);
} else {
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java Wed Apr 8 20:27:35 2015
@@ -63,7 +63,7 @@ public class TermFreqValueSource extends
// no one should call us for deleted docs?
if (terms != null) {
- final TermsEnum termsEnum = terms.iterator(null);
+ final TermsEnum termsEnum = terms.iterator();
if (termsEnum.seekExact(indexedBytes)) {
docs = termsEnum.postings(null, null);
} else {
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java Wed Apr 8 20:27:35 2015
@@ -773,7 +773,7 @@ public final class MoreLikeThis {
* @param vector List of terms and their frequencies for a doc/field
*/
private void addTermFrequencies(Map<String, Int> termFreqMap, Terms vector) throws IOException {
- final TermsEnum termsEnum = vector.iterator(null);
+ final TermsEnum termsEnum = vector.iterator();
final CharsRefBuilder spare = new CharsRefBuilder();
BytesRef text;
while((text = termsEnum.next()) != null) {
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java Wed Apr 8 20:27:35 2015
@@ -424,7 +424,7 @@ public class CommonTermsQueryTest extend
};
try {
- TermsEnum iterator = terms.iterator(null);
+ TermsEnum iterator = terms.iterator();
while (iterator.next() != null) {
if (highFreqQueue.size() < 5) {
highFreqQueue.add(new TermAndFreq(
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndPrefixQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndPrefixQuery.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndPrefixQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndPrefixQuery.java Wed Apr 8 20:27:35 2015
@@ -64,7 +64,7 @@ public class SrndPrefixQuery extends Sim
/* inspired by PrefixQuery.rewrite(): */
Terms terms = MultiFields.getTerms(reader, fieldName);
if (terms != null) {
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
boolean skip = false;
TermsEnum.SeekStatus status = termsEnum.seekCeil(new BytesRef(getPrefix()));
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTermQuery.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTermQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTermQuery.java Wed Apr 8 20:27:35 2015
@@ -54,7 +54,7 @@ public class SrndTermQuery extends Simpl
/* check term presence in index here for symmetry with other SimpleTerm's */
Terms terms = MultiFields.getTerms(reader, fieldName);
if (terms != null) {
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
TermsEnum.SeekStatus status = termsEnum.seekCeil(new BytesRef(getTermText()));
if (status == TermsEnum.SeekStatus.FOUND) {
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTruncQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTruncQuery.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTruncQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTruncQuery.java Wed Apr 8 20:27:35 2015
@@ -96,7 +96,7 @@ public class SrndTruncQuery extends Simp
if (terms != null) {
Matcher matcher = pattern.matcher("");
try {
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
TermsEnum.SeekStatus status = termsEnum.seekCeil(prefixRef);
BytesRef text;
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsWriter.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsWriter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsWriter.java Wed Apr 8 20:27:35 2015
@@ -234,7 +234,7 @@ public final class VersionBlockTreeTerms
continue;
}
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
TermsWriter termsWriter = new TermsWriter(fieldInfos.fieldInfo(field));
while (true) {
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java Wed Apr 8 20:27:35 2015
@@ -134,7 +134,7 @@ final class VersionFieldReader extends T
}
@Override
- public TermsEnum iterator(TermsEnum reuse) throws IOException {
+ public TermsEnum iterator() throws IOException {
return new IDVersionSegmentTermsEnum(this);
}
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java Wed Apr 8 20:27:35 2015
@@ -99,7 +99,7 @@ public class DuplicateFilter extends Fil
Terms terms = reader.fields().terms(fieldName);
if (terms != null) {
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
PostingsEnum docs = null;
while (true) {
BytesRef currTerm = termsEnum.next();
@@ -135,7 +135,7 @@ public class DuplicateFilter extends Fil
Terms terms = reader.fields().terms(fieldName);
if (terms != null) {
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
PostingsEnum docs = null;
while (true) {
BytesRef currTerm = termsEnum.next();
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowFuzzyQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowFuzzyQuery.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowFuzzyQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowFuzzyQuery.java Wed Apr 8 20:27:35 2015
@@ -144,7 +144,7 @@ public class SlowFuzzyQuery extends Mult
@Override
protected TermsEnum getTermsEnum(Terms terms, AttributeSource atts) throws IOException {
if (!termLongEnough) { // can only match if it's exact
- return new SingleTermsEnum(terms.iterator(null), term.bytes());
+ return new SingleTermsEnum(terms.iterator(), term.bytes());
}
return new SlowFuzzyTermsEnum(terms, atts, getTerm(), minimumSimilarity, prefixLength);
}
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowFuzzyTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowFuzzyTermsEnum.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowFuzzyTermsEnum.java (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowFuzzyTermsEnum.java Wed Apr 8 20:27:35 2015
@@ -90,7 +90,7 @@ public final class SlowFuzzyTermsEnum ex
* @throws IOException If there is a low-level I/O error.
*/
public LinearFuzzyTermsEnum() throws IOException {
- super(terms.iterator(null));
+ super(terms.iterator());
this.text = new int[termLength - realPrefixLength];
System.arraycopy(termText, realPrefixLength, text, 0, text.length);
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexQuery.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexQuery.java Wed Apr 8 20:27:35 2015
@@ -63,7 +63,7 @@ public class RegexQuery extends MultiTer
@Override
protected FilteredTermsEnum getTermsEnum(Terms terms, AttributeSource atts) throws IOException {
- return new RegexTermsEnum(terms.iterator(null), term, regexImpl);
+ return new RegexTermsEnum(terms.iterator(), term, regexImpl);
}
@Override
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonQuery.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonQuery.java Wed Apr 8 20:27:35 2015
@@ -393,7 +393,7 @@ public class TermAutomatonQuery extends
TermState state = termContext.get(context.ord);
if (state != null) {
- TermsEnum termsEnum = context.reader().terms(field).iterator(null);
+ TermsEnum termsEnum = context.reader().terms(field).iterator();
termsEnum.seekExact(term, state);
enums[ent.getKey()] = new EnumAndScorer(ent.getKey(), termsEnum.postings(acceptDocs, null, PostingsEnum.POSITIONS));
}
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/TestIDVersionPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/TestIDVersionPostingsFormat.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/TestIDVersionPostingsFormat.java (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/TestIDVersionPostingsFormat.java Wed Apr 8 20:27:35 2015
@@ -76,7 +76,7 @@ public class TestIDVersionPostingsFormat
doc.add(makeIDField("id1", 110));
w.addDocument(doc);
IndexReader r = w.getReader();
- IDVersionSegmentTermsEnum termsEnum = (IDVersionSegmentTermsEnum) r.leaves().get(0).reader().fields().terms("id").iterator(null);
+ IDVersionSegmentTermsEnum termsEnum = (IDVersionSegmentTermsEnum) r.leaves().get(0).reader().fields().terms("id").iterator();
assertTrue(termsEnum.seekExact(new BytesRef("id0"), 50));
assertTrue(termsEnum.seekExact(new BytesRef("id0"), 100));
assertFalse(termsEnum.seekExact(new BytesRef("id0"), 101));
Modified: lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractPrefixTreeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractPrefixTreeFilter.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractPrefixTreeFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractPrefixTreeFilter.java Wed Apr 8 20:27:35 2015
@@ -89,7 +89,7 @@ public abstract class AbstractPrefixTree
this.maxDoc = reader.maxDoc();
Terms terms = reader.terms(fieldName);
if (terms != null)
- this.termsEnum = terms.iterator(null);
+ this.termsEnum = terms.iterator();
}
protected void collectDocs(BitSet bitSet) throws IOException {
Modified: lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java (original)
+++ lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java Wed Apr 8 20:27:35 2015
@@ -63,9 +63,8 @@ public abstract class ShapeFieldCachePro
int count = 0;
PostingsEnum docs = null;
Terms terms = reader.terms(shapeField);
- TermsEnum te = null;
if (terms != null) {
- te = terms.iterator(te);
+ TermsEnum te = terms.iterator();
BytesRef term = te.next();
while (term != null) {
T shape = readShape(term);
Modified: lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/spell/HighFrequencyDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/spell/HighFrequencyDictionary.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/spell/HighFrequencyDictionary.java (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/spell/HighFrequencyDictionary.java Wed Apr 8 20:27:35 2015
@@ -70,7 +70,7 @@ public class HighFrequencyDictionary imp
HighFrequencyIterator() throws IOException {
Terms terms = MultiFields.getTerms(reader, field);
if (terms != null) {
- termsEnum = terms.iterator(null);
+ termsEnum = terms.iterator();
} else {
termsEnum = null;
}
Modified: lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/spell/LuceneDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/spell/LuceneDictionary.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/spell/LuceneDictionary.java (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/spell/LuceneDictionary.java Wed Apr 8 20:27:35 2015
@@ -46,7 +46,7 @@ public class LuceneDictionary implements
public final InputIterator getEntryIterator() throws IOException {
final Terms terms = MultiFields.getTerms(reader, field);
if (terms != null) {
- return new InputIterator.InputIteratorWrapper(terms.iterator(null));
+ return new InputIterator.InputIteratorWrapper(terms.iterator());
} else {
return InputIterator.EMPTY;
}
Modified: lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java Wed Apr 8 20:27:35 2015
@@ -499,7 +499,7 @@ public class SpellChecker implements jav
for (final LeafReaderContext ctx : reader.leaves()) {
Terms terms = ctx.reader().terms(F_WORD);
if (terms != null)
- termsEnums.add(terms.iterator(null));
+ termsEnums.add(terms.iterator());
}
}
Modified: lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java Wed Apr 8 20:27:35 2015
@@ -270,7 +270,7 @@ public class BlendedInfixSuggester exten
private double createCoefficient(IndexSearcher searcher, int doc, Set<String> matchedTokens, String prefixToken) throws IOException {
Terms tv = searcher.getIndexReader().getTermVector(doc, TEXT_FIELD_NAME);
- TermsEnum it = tv.iterator(TermsEnum.EMPTY);
+ TermsEnum it = tv.iterator();
Integer position = Integer.MAX_VALUE;
BytesRef term;
Modified: lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java Wed Apr 8 20:27:35 2015
@@ -346,7 +346,7 @@ public class FreeTextSuggester extends L
}
// Move all ngrams into an FST:
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
Outputs<Long> outputs = PositiveIntOutputs.getSingleton();
Builder<Long> builder = new Builder<>(FST.INPUT_TYPE.BYTE1, outputs);
Modified: lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionFieldsConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionFieldsConsumer.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionFieldsConsumer.java (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionFieldsConsumer.java Wed Apr 8 20:27:35 2015
@@ -87,7 +87,7 @@ final class CompletionFieldsConsumer ext
for (String field : fields) {
CompletionTermWriter termWriter = new CompletionTermWriter();
Terms terms = fields.terms(field);
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
// write terms
BytesRef term;
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java Wed Apr 8 20:27:35 2015
@@ -142,7 +142,6 @@ public final class AssertingPostingsForm
// incoming Fields here?
String lastField = null;
- TermsEnum termsEnum = null;
for(String field : fields) {
@@ -157,7 +156,7 @@ public final class AssertingPostingsForm
}
assert terms != null;
- termsEnum = terms.iterator(termsEnum);
+ TermsEnum termsEnum = terms.iterator();
BytesRefBuilder lastTerm = null;
PostingsEnum postingsEnum = null;
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java Wed Apr 8 20:27:35 2015
@@ -154,7 +154,7 @@ public final class RAMOnlyPostingsFormat
}
@Override
- public TermsEnum iterator(TermsEnum reuse) {
+ public TermsEnum iterator() {
return new RAMTermsEnum(RAMOnlyPostingsFormat.RAMField.this);
}
@@ -252,7 +252,7 @@ public final class RAMOnlyPostingsFormat
continue;
}
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
FieldInfo fieldInfo = state.fieldInfos.fieldInfo(field);
if (fieldInfo.getIndexOptions().compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS) >= 0) {
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java Wed Apr 8 20:27:35 2015
@@ -113,23 +113,10 @@ public class AssertingLeafReader extends
}
@Override
- public TermsEnum iterator(TermsEnum reuse) throws IOException {
- // reuse, if the codec reused
- final TermsEnum actualReuse;
- if (reuse instanceof AssertingTermsEnum) {
- actualReuse = ((AssertingTermsEnum) reuse).in;
- } else {
- actualReuse = null;
- }
- TermsEnum termsEnum = super.iterator(actualReuse);
+ public TermsEnum iterator() throws IOException {
+ TermsEnum termsEnum = super.iterator();
assert termsEnum != null;
- if (termsEnum == actualReuse) {
- // codec reused, reset asserting state
- ((AssertingTermsEnum)reuse).reset();
- return reuse;
- } else {
- return new AssertingTermsEnum(termsEnum);
- }
+ return new AssertingTermsEnum(termsEnum);
}
}
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java Wed Apr 8 20:27:35 2015
@@ -163,7 +163,7 @@ public abstract class BasePostingsFormat
RandomPostingsTester.FieldAndTerm fieldAndTerm = postingsTester.allTerms.get(0);
Terms terms = fieldsProducer.terms(fieldAndTerm.field);
- TermsEnum te = terms.iterator(null);
+ TermsEnum te = terms.iterator();
te.seekExact(fieldAndTerm.term);
checkReuse(te, PostingsEnum.FREQS, PostingsEnum.ALL, false);
@@ -200,7 +200,7 @@ public abstract class BasePostingsFormat
assertTrue(fieldCount == 1 || fieldCount == -1);
Terms terms = ar.terms("");
assertNotNull(terms);
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
assertNotNull(termsEnum.next());
assertEquals(termsEnum.term(), new BytesRef("something"));
assertNull(termsEnum.next());
@@ -225,7 +225,7 @@ public abstract class BasePostingsFormat
assertTrue(fieldCount == 1 || fieldCount == -1);
Terms terms = ar.terms("");
assertNotNull(terms);
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
assertNotNull(termsEnum.next());
assertEquals(termsEnum.term(), new BytesRef(""));
assertNull(termsEnum.next());
@@ -245,7 +245,7 @@ public abstract class BasePostingsFormat
iw.addDocument(doc);
DirectoryReader ir = iw.getReader();
LeafReader ar = getOnlySegmentReader(ir);
- TermsEnum termsEnum = ar.terms("field").iterator(null);
+ TermsEnum termsEnum = ar.terms("field").iterator();
assertTrue(termsEnum.seekExact(new BytesRef("value")));
PostingsEnum docsEnum = termsEnum.postings(null, null, PostingsEnum.NONE);
assertEquals(0, docsEnum.nextDoc());
@@ -268,7 +268,7 @@ public abstract class BasePostingsFormat
iw.addDocument(doc);
DirectoryReader ir = iw.getReader();
LeafReader ar = getOnlySegmentReader(ir);
- TermsEnum termsEnum = ar.terms("field").iterator(null);
+ TermsEnum termsEnum = ar.terms("field").iterator();
assertTrue(termsEnum.seekExact(new BytesRef("value")));
PostingsEnum docsEnum = termsEnum.postings(null, null, PostingsEnum.POSITIONS);
assertEquals(0, docsEnum.nextDoc());
@@ -303,7 +303,7 @@ public abstract class BasePostingsFormat
assertTrue(fields.size() <= 1);
Terms terms = fields.terms("ghostField");
if (terms != null) {
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
BytesRef term = termsEnum.next();
if (term != null) {
PostingsEnum postingsEnum = termsEnum.postings(null, null);
@@ -391,7 +391,7 @@ public abstract class BasePostingsFormat
Terms terms = fields.terms("body");
assert terms != null;
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
PostingsEnum docs = null;
while(termsEnum.next() != null) {
BytesRef term = termsEnum.term();
@@ -526,7 +526,7 @@ public abstract class BasePostingsFormat
assertEquals(sumDocFreq.get(), terms.getSumDocFreq());
assertEquals(sumTotalTermFreq.get(), terms.getSumTotalTermFreq());
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
long termCount = 0;
boolean supportsOrds = true;
while(termsEnum.next() != null) {
@@ -577,7 +577,7 @@ public abstract class BasePostingsFormat
assertEquals(DocIdSetIterator.NO_MORE_DOCS, postings.nextDoc());
// termsenum reuse (FREQS)
- TermsEnum termsEnum = getOnlySegmentReader(reader).terms("foo").iterator(null);
+ TermsEnum termsEnum = getOnlySegmentReader(reader).terms("foo").iterator();
termsEnum.seekExact(new BytesRef("bar"));
PostingsEnum postings2 = termsEnum.postings(null, postings);
assertNotNull(postings2);
@@ -635,7 +635,7 @@ public abstract class BasePostingsFormat
assertEquals(DocIdSetIterator.NO_MORE_DOCS, postings.nextDoc());
// termsenum reuse (FREQS)
- TermsEnum termsEnum = getOnlySegmentReader(reader).terms("foo").iterator(null);
+ TermsEnum termsEnum = getOnlySegmentReader(reader).terms("foo").iterator();
termsEnum.seekExact(new BytesRef("bar"));
PostingsEnum postings2 = termsEnum.postings(null, postings);
assertNotNull(postings2);
@@ -713,7 +713,7 @@ public abstract class BasePostingsFormat
assertEquals(DocIdSetIterator.NO_MORE_DOCS, postings.nextDoc());
// termsenum reuse (FREQS)
- TermsEnum termsEnum = getOnlySegmentReader(reader).terms("foo").iterator(null);
+ TermsEnum termsEnum = getOnlySegmentReader(reader).terms("foo").iterator();
termsEnum.seekExact(new BytesRef("bar"));
PostingsEnum postings2 = termsEnum.postings(null, postings);
assertNotNull(postings2);
@@ -893,7 +893,7 @@ public abstract class BasePostingsFormat
assertEquals(DocIdSetIterator.NO_MORE_DOCS, postings.nextDoc());
// termsenum reuse (FREQS)
- TermsEnum termsEnum = getOnlySegmentReader(reader).terms("foo").iterator(null);
+ TermsEnum termsEnum = getOnlySegmentReader(reader).terms("foo").iterator();
termsEnum.seekExact(new BytesRef("bar"));
PostingsEnum postings2 = termsEnum.postings(null, postings);
assertNotNull(postings2);
@@ -1078,7 +1078,7 @@ public abstract class BasePostingsFormat
assertEquals(DocIdSetIterator.NO_MORE_DOCS, postings.nextDoc());
// termsenum reuse (FREQS)
- TermsEnum termsEnum = getOnlySegmentReader(reader).terms("foo").iterator(null);
+ TermsEnum termsEnum = getOnlySegmentReader(reader).terms("foo").iterator();
termsEnum.seekExact(new BytesRef("bar"));
PostingsEnum postings2 = termsEnum.postings(null, postings);
assertNotNull(postings2);
@@ -1264,7 +1264,7 @@ public abstract class BasePostingsFormat
assertEquals(DocIdSetIterator.NO_MORE_DOCS, postings.nextDoc());
// termsenum reuse (FREQS)
- TermsEnum termsEnum = getOnlySegmentReader(reader).terms("foo").iterator(null);
+ TermsEnum termsEnum = getOnlySegmentReader(reader).terms("foo").iterator();
termsEnum.seekExact(new BytesRef("bar"));
PostingsEnum postings2 = termsEnum.postings(null, postings);
assertNotNull(postings2);
@@ -1457,7 +1457,7 @@ public abstract class BasePostingsFormat
assertEquals(DocIdSetIterator.NO_MORE_DOCS, postings.nextDoc());
// termsenum reuse (FREQS)
- TermsEnum termsEnum = getOnlySegmentReader(reader).terms("foo").iterator(null);
+ TermsEnum termsEnum = getOnlySegmentReader(reader).terms("foo").iterator();
termsEnum.seekExact(new BytesRef("bar"));
DocsEnum postings2 = termsEnum.docs(null, postings);
assertNotNull(postings2);
@@ -1538,7 +1538,7 @@ public abstract class BasePostingsFormat
assertEquals(DocIdSetIterator.NO_MORE_DOCS, postings.nextDoc());
// termsenum reuse (FREQS)
- TermsEnum termsEnum = getOnlySegmentReader(reader).terms("foo").iterator(null);
+ TermsEnum termsEnum = getOnlySegmentReader(reader).terms("foo").iterator();
termsEnum.seekExact(new BytesRef("bar"));
DocsEnum postings2 = termsEnum.docs(null, postings);
assertNotNull(postings2);
@@ -1619,7 +1619,7 @@ public abstract class BasePostingsFormat
assertEquals(DocIdSetIterator.NO_MORE_DOCS, postings.nextDoc());
// termsenum reuse (FREQS)
- TermsEnum termsEnum = getOnlySegmentReader(reader).terms("foo").iterator(null);
+ TermsEnum termsEnum = getOnlySegmentReader(reader).terms("foo").iterator();
termsEnum.seekExact(new BytesRef("bar"));
DocsEnum postings2 = termsEnum.docs(null, postings);
assertNotNull(postings2);
@@ -1804,7 +1804,7 @@ public abstract class BasePostingsFormat
assertEquals(DocIdSetIterator.NO_MORE_DOCS, postings.nextDoc());
// termsenum reuse (FREQS)
- TermsEnum termsEnum = getOnlySegmentReader(reader).terms("foo").iterator(null);
+ TermsEnum termsEnum = getOnlySegmentReader(reader).terms("foo").iterator();
termsEnum.seekExact(new BytesRef("bar"));
DocsEnum postings2 = termsEnum.docs(null, postings);
assertNotNull(postings2);
@@ -1994,7 +1994,7 @@ public abstract class BasePostingsFormat
assertEquals(DocIdSetIterator.NO_MORE_DOCS, postings.nextDoc());
// termsenum reuse (FREQS)
- TermsEnum termsEnum = getOnlySegmentReader(reader).terms("foo").iterator(null);
+ TermsEnum termsEnum = getOnlySegmentReader(reader).terms("foo").iterator();
termsEnum.seekExact(new BytesRef("bar"));
DocsEnum postings2 = termsEnum.docs(null, postings);
assertNotNull(postings2);
@@ -2185,7 +2185,7 @@ public abstract class BasePostingsFormat
assertEquals(DocIdSetIterator.NO_MORE_DOCS, postings.nextDoc());
// termsenum reuse (FREQS)
- TermsEnum termsEnum = getOnlySegmentReader(reader).terms("foo").iterator(null);
+ TermsEnum termsEnum = getOnlySegmentReader(reader).terms("foo").iterator();
termsEnum.seekExact(new BytesRef("bar"));
DocsEnum postings2 = termsEnum.docs(null, postings);
assertNotNull(postings2);
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java Wed Apr 8 20:27:35 2015
@@ -426,7 +426,6 @@ public abstract class BaseTermVectorsFor
}
// to test reuse
- private final ThreadLocal<TermsEnum> termsEnum = new ThreadLocal<>();
private final ThreadLocal<PostingsEnum> docsEnum = new ThreadLocal<>();
private final ThreadLocal<PostingsEnum> docsAndPositionsEnum = new ThreadLocal<>();
@@ -444,8 +443,7 @@ public abstract class BaseTermVectorsFor
}
final BytesRef[] sortedTerms = uniqueTerms.toArray(new BytesRef[0]);
Arrays.sort(sortedTerms);
- final TermsEnum termsEnum = terms.iterator(random().nextBoolean() ? null : this.termsEnum.get());
- this.termsEnum.set(termsEnum);
+ final TermsEnum termsEnum = terms.iterator();
for (int i = 0; i < sortedTerms.length; ++i) {
final BytesRef nextTerm = termsEnum.next();
assertEquals(sortedTerms[i], nextTerm);
@@ -775,7 +773,7 @@ public abstract class BaseTermVectorsFor
DirectoryReader reader = DirectoryReader.open(iw, false);
Terms terms = getOnlySegmentReader(reader).getTermVector(0, "foo");
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
assertNotNull(termsEnum);
assertEquals(new BytesRef("bar"), termsEnum.next());
@@ -856,7 +854,7 @@ public abstract class BaseTermVectorsFor
DirectoryReader reader = DirectoryReader.open(iw, false);
Terms terms = getOnlySegmentReader(reader).getTermVector(0, "foo");
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
assertNotNull(termsEnum);
assertEquals(new BytesRef("bar"), termsEnum.next());
@@ -1035,7 +1033,7 @@ public abstract class BaseTermVectorsFor
DirectoryReader reader = DirectoryReader.open(iw, false);
Terms terms = getOnlySegmentReader(reader).getTermVector(0, "foo");
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
assertNotNull(termsEnum);
assertEquals(new BytesRef("bar"), termsEnum.next());
@@ -1221,7 +1219,7 @@ public abstract class BaseTermVectorsFor
DirectoryReader reader = DirectoryReader.open(iw, false);
Terms terms = getOnlySegmentReader(reader).getTermVector(0, "foo");
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
assertNotNull(termsEnum);
assertEquals(new BytesRef("bar"), termsEnum.next());
@@ -1407,7 +1405,7 @@ public abstract class BaseTermVectorsFor
DirectoryReader reader = DirectoryReader.open(iw, false);
Terms terms = getOnlySegmentReader(reader).getTermVector(0, "foo");
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
assertNotNull(termsEnum);
assertEquals(new BytesRef("bar"), termsEnum.next());
@@ -1593,7 +1591,7 @@ public abstract class BaseTermVectorsFor
DirectoryReader reader = DirectoryReader.open(iw, false);
Terms terms = getOnlySegmentReader(reader).getTermVector(0, "foo");
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
assertNotNull(termsEnum);
assertEquals(new BytesRef("bar"), termsEnum.next());
@@ -1790,7 +1788,7 @@ public abstract class BaseTermVectorsFor
DirectoryReader reader = DirectoryReader.open(iw, false);
Terms terms = getOnlySegmentReader(reader).getTermVector(0, "foo");
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
assertNotNull(termsEnum);
assertEquals(new BytesRef("bar"), termsEnum.next());
@@ -1875,7 +1873,7 @@ public abstract class BaseTermVectorsFor
DirectoryReader reader = DirectoryReader.open(iw, false);
Terms terms = getOnlySegmentReader(reader).getTermVector(0, "foo");
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
assertNotNull(termsEnum);
assertEquals(new BytesRef("bar"), termsEnum.next());
@@ -2059,7 +2057,7 @@ public abstract class BaseTermVectorsFor
DirectoryReader reader = DirectoryReader.open(iw, false);
Terms terms = getOnlySegmentReader(reader).getTermVector(0, "foo");
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
assertNotNull(termsEnum);
assertEquals(new BytesRef("bar"), termsEnum.next());
@@ -2250,7 +2248,7 @@ public abstract class BaseTermVectorsFor
DirectoryReader reader = DirectoryReader.open(iw, false);
Terms terms = getOnlySegmentReader(reader).getTermVector(0, "foo");
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
assertNotNull(termsEnum);
assertEquals(new BytesRef("bar"), termsEnum.next());
@@ -2441,7 +2439,7 @@ public abstract class BaseTermVectorsFor
DirectoryReader reader = DirectoryReader.open(iw, false);
Terms terms = getOnlySegmentReader(reader).getTermVector(0, "foo");
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
assertNotNull(termsEnum);
assertEquals(new BytesRef("bar"), termsEnum.next());
@@ -2632,7 +2630,7 @@ public abstract class BaseTermVectorsFor
DirectoryReader reader = DirectoryReader.open(iw, false);
Terms terms = getOnlySegmentReader(reader).getTermVector(0, "foo");
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
assertNotNull(termsEnum);
assertEquals(new BytesRef("bar"), termsEnum.next());
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/PerThreadPKLookup.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/PerThreadPKLookup.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/PerThreadPKLookup.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/PerThreadPKLookup.java Wed Apr 8 20:27:35 2015
@@ -62,7 +62,7 @@ public class PerThreadPKLookup {
for(int i=0;i<leaves.size();i++) {
Terms terms = leaves.get(i).reader().terms(idFieldName);
if (terms != null) {
- termsEnums[numSegs] = terms.iterator(null);
+ termsEnums[numSegs] = terms.iterator();
assert termsEnums[numSegs] != null;
docBases[numSegs] = leaves.get(i).docBase;
liveDocs[numSegs] = leaves.get(i).reader().getLiveDocs();
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/RandomPostingsTester.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/RandomPostingsTester.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/RandomPostingsTester.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/RandomPostingsTester.java Wed Apr 8 20:27:35 2015
@@ -482,16 +482,8 @@ public class RandomPostingsTester {
}
@Override
- public TermsEnum iterator(TermsEnum reuse) {
- SeedTermsEnum termsEnum;
- if (reuse != null && reuse instanceof SeedTermsEnum) {
- termsEnum = (SeedTermsEnum) reuse;
- if (termsEnum.terms != terms) {
- termsEnum = new SeedTermsEnum(terms, maxAllowed, allowPayloads);
- }
- } else {
- termsEnum = new SeedTermsEnum(terms, maxAllowed, allowPayloads);
- }
+ public TermsEnum iterator() {
+ SeedTermsEnum termsEnum = new SeedTermsEnum(terms, maxAllowed, allowPayloads);
termsEnum.reset();
return termsEnum;
@@ -1124,7 +1116,7 @@ public class RandomPostingsTester {
Terms terms = fieldsSource.terms(fieldAndTerm.field);
assertNotNull(terms);
- termsEnum = terms.iterator(null);
+ termsEnum = terms.iterator();
if (!useTermState) {
if (useTermOrd) {
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java Wed Apr 8 20:27:35 2015
@@ -356,7 +356,7 @@ public abstract class ThreadedIndexingAn
if (terms == null) {
continue;
}
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
int seenTermCount = 0;
int shift;
int trigger;
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Wed Apr 8 20:27:35 2015
@@ -1860,8 +1860,8 @@ public abstract class LuceneTestCase ext
assertEquals(leftTerms.hasPositions(), rightTerms.hasPositions());
assertEquals(leftTerms.hasPayloads(), rightTerms.hasPayloads());
- TermsEnum leftTermsEnum = leftTerms.iterator(null);
- TermsEnum rightTermsEnum = rightTerms.iterator(null);
+ TermsEnum leftTermsEnum = leftTerms.iterator();
+ TermsEnum rightTermsEnum = rightTerms.iterator();
assertTermsEnumEquals(info, leftReader, leftTermsEnum, rightTermsEnum, true);
assertTermsSeekingEquals(info, leftTerms, rightTerms);
@@ -2107,18 +2107,18 @@ public abstract class LuceneTestCase ext
private void assertTermsSeekingEquals(String info, Terms leftTerms, Terms rightTerms) throws IOException {
- TermsEnum leftEnum = null;
- TermsEnum rightEnum = null;
// just an upper bound
int numTests = atLeast(20);
Random random = random();
+ TermsEnum leftEnum = null;
+
// collect this number of terms from the left side
HashSet<BytesRef> tests = new HashSet<>();
int numPasses = 0;
while (numPasses < 10 && tests.size() < numTests) {
- leftEnum = leftTerms.iterator(leftEnum);
+ leftEnum = leftTerms.iterator();
BytesRef term = null;
while ((term = leftEnum.next()) != null) {
int code = random.nextInt(10);
@@ -2156,16 +2156,16 @@ public abstract class LuceneTestCase ext
numPasses++;
}
- rightEnum = rightTerms.iterator(rightEnum);
+ TermsEnum rightEnum = rightTerms.iterator();
ArrayList<BytesRef> shuffledTests = new ArrayList<>(tests);
Collections.shuffle(shuffledTests, random);
for (BytesRef b : shuffledTests) {
if (rarely()) {
- // reuse the enums
- leftEnum = leftTerms.iterator(leftEnum);
- rightEnum = rightTerms.iterator(rightEnum);
+ // make new enums
+ leftEnum = leftTerms.iterator();
+ rightEnum = rightTerms.iterator();
}
final boolean seekExact = random().nextBoolean();
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java Wed Apr 8 20:27:35 2015
@@ -1088,7 +1088,7 @@ public final class TestUtil {
if (terms == null) {
return null;
}
- final TermsEnum termsEnum = terms.iterator(null);
+ final TermsEnum termsEnum = terms.iterator();
if (!termsEnum.seekExact(term)) {
return null;
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java Wed Apr 8 20:27:35 2015
@@ -305,7 +305,7 @@ public class LukeRequestHandler extends
Terms v = reader.getTermVector( docId, field.name() );
if( v != null ) {
SimpleOrderedMap<Integer> tfv = new SimpleOrderedMap<>();
- final TermsEnum termsEnum = v.iterator(null);
+ final TermsEnum termsEnum = v.iterator();
BytesRef text;
while((text = termsEnum.next()) != null) {
final int freq = (int) termsEnum.totalTermFreq();
@@ -409,7 +409,7 @@ public class LukeRequestHandler extends
// to do it this way.
private static Document getFirstLiveDoc(Terms terms, LeafReader reader) throws IOException {
PostingsEnum postingsEnum = null;
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
BytesRef text;
// Deal with the chance that the first bunch of terms are in deleted documents. Is there a better way?
for (int idx = 0; idx < 1000 && postingsEnum == null; ++idx) {
@@ -623,7 +623,7 @@ public class LukeRequestHandler extends
if (terms == null) { // field does not exist
return;
}
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
BytesRef text;
int[] buckets = new int[HIST_ARRAY_SIZE];
while ((text = termsEnum.next()) != null) {
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java Wed Apr 8 20:27:35 2015
@@ -562,14 +562,13 @@ public class QueryElevationComponent ext
boostDocs = new IntIntOpenHashMap(boosted.size()*2);
List<LeafReaderContext>leaves = indexSearcher.getTopReaderContext().leaves();
- TermsEnum termsEnum = null;
PostingsEnum postingsEnum = null;
for(LeafReaderContext leaf : leaves) {
LeafReader reader = leaf.reader();
int docBase = leaf.docBase;
Bits liveDocs = reader.getLiveDocs();
Terms terms = reader.terms(fieldName);
- termsEnum = terms.iterator(termsEnum);
+ TermsEnum termsEnum = terms.iterator();
Iterator<BytesRef> it = localBoosts.iterator();
while(it.hasNext()) {
BytesRef ref = it.next();
@@ -636,7 +635,6 @@ public class QueryElevationComponent ext
private final int[] values = new int[numHits];
private int bottomVal;
private int topVal;
- private TermsEnum termsEnum;
private PostingsEnum postingsEnum;
Set<String> seen = new HashSet<>(elevations.ids.size());
@@ -685,7 +683,7 @@ public class QueryElevationComponent ext
if (fields == null) return;
Terms terms = fields.terms(idField);
if (terms == null) return;
- termsEnum = terms.iterator(termsEnum);
+ TermsEnum termsEnum = terms.iterator();
BytesRefBuilder term = new BytesRefBuilder();
Bits liveDocs = context.reader().getLiveDocs();
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java Wed Apr 8 20:27:35 2015
@@ -295,8 +295,6 @@ public class TermVectorComponent extends
}
};
- TermsEnum termsEnum = null;
-
while (iter.hasNext()) {
Integer docId = iter.next();
NamedList<Object> docNL = new NamedList<>();
@@ -320,8 +318,8 @@ public class TermVectorComponent extends
final String field = entry.getKey();
final Terms vector = reader.getTermVector(docId, field);
if (vector != null) {
- termsEnum = vector.iterator(termsEnum);
- mapOneVector(docNL, entry.getValue(), reader, docId, vector.iterator(termsEnum), field);
+ TermsEnum termsEnum = vector.iterator();
+ mapOneVector(docNL, entry.getValue(), reader, docId, termsEnum, field);
}
}
} else {
@@ -330,7 +328,7 @@ public class TermVectorComponent extends
for (String field : vectors) {
Terms terms = vectors.terms(field);
if (terms != null) {
- termsEnum = terms.iterator(termsEnum);
+ TermsEnum termsEnum = terms.iterator();
mapOneVector(docNL, allFields, reader, docId, termsEnum, field);
}
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java Wed Apr 8 20:27:35 2015
@@ -161,7 +161,7 @@ public class TermsComponent extends Sear
}
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
BytesRef term = null;
if (lowerBytes != null) {
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/request/NumericFacets.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/request/NumericFacets.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/request/NumericFacets.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/request/NumericFacets.java Wed Apr 8 20:27:35 2015
@@ -277,7 +277,7 @@ final class NumericFacets {
} else {
prefix = new BytesRef();
}
- final TermsEnum termsEnum = terms.iterator(null);
+ final TermsEnum termsEnum = terms.iterator();
BytesRef term;
switch (termsEnum.seekCeil(prefix)) {
case FOUND:
@@ -330,7 +330,7 @@ final class NumericFacets {
} else {
prefix = new BytesRef();
}
- final TermsEnum termsEnum = terms.iterator(null);
+ final TermsEnum termsEnum = terms.iterator();
BytesRef term;
switch (termsEnum.seekCeil(prefix)) {
case FOUND:
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/request/SimpleFacets.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/request/SimpleFacets.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/request/SimpleFacets.java Wed Apr 8 20:27:35 2015
@@ -756,7 +756,7 @@ public class SimpleFacets {
SolrIndexSearcher.DocsEnumState deState = null;
BytesRef term = null;
if (terms != null) {
- termsEnum = terms.iterator(null);
+ termsEnum = terms.iterator();
// TODO: OPT: if seek(ord) is supported for this termsEnum, then we could use it for
// facet.offset when sorting by index order.
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java Wed Apr 8 20:27:35 2015
@@ -379,8 +379,8 @@ class JoinQuery extends Query {
BytesRef prefix = prefixStr == null ? null : new BytesRef(prefixStr);
BytesRef term = null;
- TermsEnum termsEnum = terms.iterator(null);
- TermsEnum toTermsEnum = toTerms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
+ TermsEnum toTermsEnum = toTerms.iterator();
SolrIndexSearcher.DocsEnumState fromDeState = null;
SolrIndexSearcher.DocsEnumState toDeState = null;
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java Wed Apr 8 20:27:35 2015
@@ -795,7 +795,7 @@ public class SolrIndexSearcher extends I
Terms terms = leafReader.terms(t.field());
if (terms == null) return -1;
BytesRef termBytes = t.bytes();
- final TermsEnum termsEnum = terms.iterator(null);
+ final TermsEnum termsEnum = terms.iterator();
if (!termsEnum.seekExact(termBytes)) {
return -1;
}
@@ -818,7 +818,7 @@ public class SolrIndexSearcher extends I
final Terms terms = reader.terms(field);
if (terms == null) continue;
- TermsEnum te = terms.iterator(null);
+ TermsEnum te = terms.iterator();
if (te.seekExact(idBytes)) {
PostingsEnum docs = te.postings(reader.getLiveDocs(), null, PostingsEnum.NONE);
int id = docs.nextDoc();
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/FacetField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/FacetField.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/FacetField.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/FacetField.java Wed Apr 8 20:27:35 2015
@@ -625,7 +625,7 @@ class FacetFieldProcessorStream extends
if (terms != null) {
- termsEnum = terms.iterator(null);
+ termsEnum = terms.iterator();
// TODO: OPT: if seek(ord) is supported for this termsEnum, then we could use it for
// facet.offset when sorting by index order.
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java Wed Apr 8 20:27:35 2015
@@ -270,7 +270,7 @@ public class FileFloatSource extends Val
BytesRefBuilder internalKey = new BytesRefBuilder();
try {
- TermsEnum termsEnum = MultiFields.getTerms(reader, idName).iterator(null);
+ TermsEnum termsEnum = MultiFields.getTerms(reader, idName).iterator();
PostingsEnum postingsEnum = null;
// removing deleted docs shouldn't matter
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java Wed Apr 8 20:27:35 2015
@@ -162,7 +162,7 @@ public class SolrIndexSplitter {
Fields fields = reader.fields();
Terms terms = fields==null ? null : fields.terms(field.getName());
- TermsEnum termsEnum = terms==null ? null : terms.iterator(null);
+ TermsEnum termsEnum = terms==null ? null : terms.iterator();
if (termsEnum == null) return docSets;
BytesRef term = null;
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestRTGBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestRTGBase.java?rev=1672165&r1=1672164&r2=1672165&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestRTGBase.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestRTGBase.java Wed Apr 8 20:27:35 2015
@@ -128,7 +128,7 @@ public class TestRTGBase extends SolrTes
Terms terms = MultiFields.getTerms(r, t.field());
if (terms == null) return -1;
BytesRef termBytes = t.bytes();
- final TermsEnum termsEnum = terms.iterator(null);
+ final TermsEnum termsEnum = terms.iterator();
if (!termsEnum.seekExact(termBytes)) {
return -1;
}