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 21:48:09 UTC
svn commit: r1672155 [2/3] - in /lucene/dev/trunk: lucene/
lucene/analysis/common/src/java/org/apache/lucene/analysis/query/
lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/
lucene/backward-codecs/src/test/org/apache/lucene/index/ luce...
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java Wed Apr 8 19:48:07 2015
@@ -137,7 +137,7 @@ public class TestBagOfPositions extends
Terms terms = air.terms("field");
// numTerms-1 because there cannot be a term 0 with 0 postings:
assertEquals(numTerms-1, terms.size());
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
BytesRef term;
while ((term = termsEnum.next()) != null) {
int value = Integer.parseInt(term.utf8ToString());
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java Wed Apr 8 19:48:07 2015
@@ -129,7 +129,7 @@ public class TestBagOfPostings extends L
Terms terms = air.terms("field");
// numTerms-1 because there cannot be a term 0 with 0 postings:
assertEquals(numTerms-1, terms.size());
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
BytesRef term;
while ((term = termsEnum.next()) != null) {
int value = Integer.parseInt(term.utf8ToString());
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java Wed Apr 8 19:48:07 2015
@@ -233,7 +233,7 @@ public class TestCodecs extends LuceneTe
final Terms terms2 = reader.terms(fieldName);
assertNotNull(terms2);
- final TermsEnum termsEnum = terms2.iterator(null);
+ final TermsEnum termsEnum = terms2.iterator();
PostingsEnum postingsEnum = null;
for(int i=0;i<NUM_TERMS;i++) {
@@ -362,7 +362,7 @@ public class TestCodecs extends LuceneTe
for(int iter=0;iter<NUM_TEST_ITER;iter++) {
final FieldData field = fields[random().nextInt(fields.length)];
- final TermsEnum termsEnum = termsDict.terms(field.fieldInfo.name).iterator(null);
+ final TermsEnum termsEnum = termsDict.terms(field.fieldInfo.name).iterator();
int upto = 0;
// Test straight enum of the terms:
@@ -571,7 +571,7 @@ public class TestCodecs extends LuceneTe
}
@Override
- public TermsEnum iterator(TermsEnum reuse) {
+ public TermsEnum iterator() {
return new DataTermsEnum(fieldData);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java Wed Apr 8 19:48:07 2015
@@ -91,7 +91,7 @@ public class TestDirectoryReader extends
MultiReader mr3 = new MultiReader(readers2);
// test mixing up TermDocs and TermEnums from different readers.
- TermsEnum te2 = MultiFields.getTerms(mr2, "body").iterator(null);
+ TermsEnum te2 = MultiFields.getTerms(mr2, "body").iterator();
te2.seekCeil(new BytesRef("wow"));
PostingsEnum td = TestUtil.docs(random(), mr2,
"body",
@@ -100,7 +100,7 @@ public class TestDirectoryReader extends
null,
0);
- TermsEnum te3 = MultiFields.getTerms(mr3, "body").iterator(null);
+ TermsEnum te3 = MultiFields.getTerms(mr3, "body").iterator();
te3.seekCeil(new BytesRef("wow"));
td = TestUtil.docs(random(), te3, MultiFields.getLiveDocs(mr3),
td,
@@ -625,11 +625,11 @@ public void testFilesOpenClose() throws
assertNull(fields2.terms(field1));
continue;
}
- TermsEnum enum1 = terms1.iterator(null);
+ TermsEnum enum1 = terms1.iterator();
Terms terms2 = fields2.terms(field1);
assertNotNull(terms2);
- TermsEnum enum2 = terms2.iterator(null);
+ TermsEnum enum2 = terms2.iterator();
while(enum1.next() != null) {
assertEquals("Different terms", enum1.term(), enum2.next());
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDoc.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDoc.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDoc.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDoc.java Wed Apr 8 19:48:07 2015
@@ -256,7 +256,7 @@ public class TestDoc extends LuceneTestC
for (String field : fields) {
Terms terms = fields.terms(field);
assertNotNull(terms);
- TermsEnum tis = terms.iterator(null);
+ TermsEnum tis = terms.iterator();
while(tis.next() != null) {
out.print(" term=" + field + ":" + tis.term());
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java Wed Apr 8 19:48:07 2015
@@ -65,7 +65,7 @@ public class TestDocCount extends Lucene
}
int docCount = terms.getDocCount();
FixedBitSet visited = new FixedBitSet(ir.maxDoc());
- TermsEnum te = terms.iterator(null);
+ TermsEnum te = terms.iterator();
while (te.next() != null) {
PostingsEnum de = TestUtil.docs(random(), te, null, null, PostingsEnum.NONE);
while (de.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java Wed Apr 8 19:48:07 2015
@@ -94,7 +94,7 @@ public class TestDocsAndPositions extend
BytesRef bytes, Bits liveDocs) throws IOException {
Terms terms = reader.terms(fieldName);
if (terms != null) {
- TermsEnum te = terms.iterator(null);
+ TermsEnum te = terms.iterator();
if (te.seekExact(bytes)) {
return te.postings(liveDocs, null, PostingsEnum.ALL);
}
@@ -342,7 +342,7 @@ public class TestDocsAndPositions extend
assertTrue(disi.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
// now reuse and check again
- TermsEnum te = r.terms("foo").iterator(null);
+ TermsEnum te = r.terms("foo").iterator();
assertTrue(te.seekExact(new BytesRef("bar")));
disi = TestUtil.docs(random(), te, null, disi, PostingsEnum.NONE);
docid = disi.docID();
@@ -367,7 +367,7 @@ public class TestDocsAndPositions extend
assertTrue(disi.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
// now reuse and check again
- TermsEnum te = r.terms("foo").iterator(null);
+ TermsEnum te = r.terms("foo").iterator();
assertTrue(te.seekExact(new BytesRef("bar")));
disi = te.postings(null, disi, PostingsEnum.ALL);
docid = disi.docID();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestExitableDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestExitableDirectoryReader.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestExitableDirectoryReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestExitableDirectoryReader.java Wed Apr 8 19:48:07 2015
@@ -54,8 +54,8 @@ public class TestExitableDirectoryReader
}
@Override
- public TermsEnum iterator(TermsEnum reuse) throws IOException {
- return new TestTermsEnum(super.iterator(reuse));
+ public TermsEnum iterator() throws IOException {
+ return new TestTermsEnum(super.iterator());
}
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java Wed Apr 8 19:48:07 2015
@@ -54,8 +54,8 @@ public class TestFilterLeafReader extend
}
@Override
- public TermsEnum iterator(TermsEnum reuse) throws IOException {
- return new TestTermsEnum(super.iterator(reuse));
+ public TermsEnum iterator() throws IOException {
+ return new TestTermsEnum(super.iterator());
}
}
@@ -144,7 +144,7 @@ public class TestFilterLeafReader extend
writer.close();
IndexReader reader = DirectoryReader.open(target);
- TermsEnum terms = MultiFields.getTerms(reader, "default").iterator(null);
+ TermsEnum terms = MultiFields.getTerms(reader, "default").iterator();
while (terms.next() != null) {
assertTrue(terms.term().utf8ToString().indexOf('e') != -1);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestFlex.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestFlex.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestFlex.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestFlex.java Wed Apr 8 19:48:07 2015
@@ -52,7 +52,7 @@ public class TestFlex extends LuceneTest
IndexReader r = w.getReader();
- TermsEnum terms = MultiFields.getTerms(r, "field3").iterator(null);
+ TermsEnum terms = MultiFields.getTerms(r, "field3").iterator();
assertEquals(TermsEnum.SeekStatus.END, terms.seekCeil(new BytesRef("abc")));
r.close();
}
@@ -70,7 +70,7 @@ public class TestFlex extends LuceneTest
w.addDocument(doc);
w.forceMerge(1);
DirectoryReader r = w.getReader();
- TermsEnum terms = getOnlySegmentReader(r).fields().terms("f").iterator(null);
+ TermsEnum terms = getOnlySegmentReader(r).fields().terms("f").iterator();
assertTrue(terms.next() != null);
try {
assertEquals(0, terms.ord());
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java Wed Apr 8 19:48:07 2015
@@ -698,7 +698,7 @@ public class TestIndexWriter extends Luc
writer.close();
DirectoryReader reader = DirectoryReader.open(dir);
LeafReader subreader = getOnlySegmentReader(reader);
- TermsEnum te = subreader.fields().terms("").iterator(null);
+ TermsEnum te = subreader.fields().terms("").iterator();
assertEquals(new BytesRef("a"), te.next());
assertEquals(new BytesRef("b"), te.next());
assertEquals(new BytesRef("c"), te.next());
@@ -719,7 +719,7 @@ public class TestIndexWriter extends Luc
writer.close();
DirectoryReader reader = DirectoryReader.open(dir);
LeafReader subreader = getOnlySegmentReader(reader);
- TermsEnum te = subreader.fields().terms("").iterator(null);
+ TermsEnum te = subreader.fields().terms("").iterator();
assertEquals(new BytesRef(""), te.next());
assertEquals(new BytesRef("a"), te.next());
assertEquals(new BytesRef("b"), te.next());
@@ -831,7 +831,7 @@ public class TestIndexWriter extends Luc
IndexReader r = DirectoryReader.open(dir);
Terms tpv = r.getTermVectors(0).terms("field");
- TermsEnum termsEnum = tpv.iterator(null);
+ TermsEnum termsEnum = tpv.iterator();
assertNotNull(termsEnum.next());
PostingsEnum dpEnum = termsEnum.postings(null, null, PostingsEnum.ALL);
assertNotNull(dpEnum);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java Wed Apr 8 19:48:07 2015
@@ -136,7 +136,7 @@ public class TestIndexWriterUnicode exte
}
private void checkTermsOrder(IndexReader r, Set<String> allTerms, boolean isTop) throws IOException {
- TermsEnum terms = MultiFields.getFields(r).terms("f").iterator(null);
+ TermsEnum terms = MultiFields.getFields(r).terms("f").iterator();
BytesRefBuilder last = new BytesRefBuilder();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java Wed Apr 8 19:48:07 2015
@@ -329,7 +329,7 @@ public class TestIndexableField extends
if (tv) {
final Terms tfv = r.getTermVectors(docID).terms(name);
assertNotNull(tfv);
- TermsEnum termsEnum = tfv.iterator(null);
+ TermsEnum termsEnum = tfv.iterator();
assertEquals(new BytesRef(""+counter), termsEnum.next());
assertEquals(1, termsEnum.totalTermFreq());
PostingsEnum dpEnum = termsEnum.postings(null, null, PostingsEnum.ALL);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java Wed Apr 8 19:48:07 2015
@@ -74,7 +74,7 @@ public class TestParallelTermEnum extend
private void checkTerms(Terms terms, Bits liveDocs, String... termsList) throws IOException {
assertNotNull(terms);
- final TermsEnum te = terms.iterator(null);
+ final TermsEnum te = terms.iterator();
for (String t : termsList) {
BytesRef b = te.next();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java Wed Apr 8 19:48:07 2015
@@ -484,7 +484,7 @@ public class TestPayloads extends Lucene
}
writer.close();
IndexReader reader = DirectoryReader.open(dir);
- TermsEnum terms = MultiFields.getFields(reader).terms(field).iterator(null);
+ TermsEnum terms = MultiFields.getFields(reader).terms(field).iterator();
Bits liveDocs = MultiFields.getLiveDocs(reader);
PostingsEnum tp = null;
while (terms.next() != null) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java Wed Apr 8 19:48:07 2015
@@ -70,7 +70,7 @@ public class TestPayloadsOnVectors exten
DirectoryReader reader = writer.getReader();
Terms terms = reader.getTermVector(1, "field");
assert terms != null;
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
assertTrue(termsEnum.seekExact(new BytesRef("withPayload")));
PostingsEnum de = termsEnum.postings(null, null, PostingsEnum.ALL);
assertEquals(0, de.nextDoc());
@@ -112,7 +112,7 @@ public class TestPayloadsOnVectors exten
DirectoryReader reader = writer.getReader();
Terms terms = reader.getTermVector(0, "field");
assert terms != null;
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
assertTrue(termsEnum.seekExact(new BytesRef("withPayload")));
PostingsEnum de = termsEnum.postings(null, null, PostingsEnum.ALL);
assertEquals(0, de.nextDoc());
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java Wed Apr 8 19:48:07 2015
@@ -224,7 +224,7 @@ public class TestPerSegmentDeletes exten
throws IOException {
Fields fields = MultiFields.getFields(reader);
Terms cterms = fields.terms(term.field);
- TermsEnum ctermsEnum = cterms.iterator(null);
+ TermsEnum ctermsEnum = cterms.iterator();
if (ctermsEnum.seekExact(new BytesRef(term.text()))) {
PostingsEnum postingsEnum = TestUtil.docs(random(), ctermsEnum, bits, null, PostingsEnum.NONE);
return toArray(postingsEnum);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java Wed Apr 8 19:48:07 2015
@@ -293,7 +293,7 @@ public class TestPostingsOffsets extends
// TODO: improve this
LeafReader sub = ctx.reader();
//System.out.println("\nsub=" + sub);
- final TermsEnum termsEnum = sub.fields().terms("content").iterator(null);
+ final TermsEnum termsEnum = sub.fields().terms("content").iterator();
PostingsEnum docs = null;
PostingsEnum docsAndPositions = null;
PostingsEnum docsAndPositionsAndOffsets = null;
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java Wed Apr 8 19:48:07 2015
@@ -129,7 +129,7 @@ public class TestSegmentMerger extends L
Terms vector = mergedReader.getTermVectors(0).terms(DocHelper.TEXT_FIELD_2_KEY);
assertNotNull(vector);
assertEquals(3, vector.size());
- TermsEnum termsEnum = vector.iterator(null);
+ TermsEnum termsEnum = vector.iterator();
int i = 0;
while (termsEnum.next() != null) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java Wed Apr 8 19:48:07 2015
@@ -118,7 +118,7 @@ public class TestSegmentReader extends L
for (String field : fields) {
Terms terms = fields.terms(field);
assertNotNull(terms);
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
while(termsEnum.next() != null) {
BytesRef term = termsEnum.term();
assertTrue(term != null);
@@ -192,7 +192,7 @@ public class TestSegmentReader extends L
Terms result = reader.getTermVectors(0).terms(DocHelper.TEXT_FIELD_2_KEY);
assertNotNull(result);
assertEquals(3, result.size());
- TermsEnum termsEnum = result.iterator(null);
+ TermsEnum termsEnum = result.iterator();
while(termsEnum.next() != null) {
String term = termsEnum.term().utf8ToString();
int freq = (int) termsEnum.totalTermFreq();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java Wed Apr 8 19:48:07 2015
@@ -56,7 +56,7 @@ public class TestSegmentTermDocs extends
SegmentReader reader = new SegmentReader(info, newIOContext(random()));
assertTrue(reader != null);
- TermsEnum terms = reader.fields().terms(DocHelper.TEXT_FIELD_2_KEY).iterator(null);
+ TermsEnum terms = reader.fields().terms(DocHelper.TEXT_FIELD_2_KEY).iterator();
terms.seekCeil(new BytesRef("field"));
PostingsEnum termDocs = TestUtil.docs(random(), terms, reader.getLiveDocs(), null, PostingsEnum.FREQS);
if (termDocs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java Wed Apr 8 19:48:07 2015
@@ -80,7 +80,7 @@ public class TestSegmentTermEnum extends
addDoc(writer, "aaa bbb");
writer.close();
SegmentReader reader = getOnlySegmentReader(DirectoryReader.open(dir));
- TermsEnum terms = reader.fields().terms("content").iterator(null);
+ TermsEnum terms = reader.fields().terms("content").iterator();
assertNotNull(terms.next());
assertEquals("aaa", terms.term().utf8ToString());
assertNotNull(terms.next());
@@ -104,7 +104,7 @@ public class TestSegmentTermEnum extends
throws IOException
{
IndexReader reader = DirectoryReader.open(dir);
- TermsEnum termEnum = MultiFields.getTerms(reader, "content").iterator(null);
+ TermsEnum termEnum = MultiFields.getTerms(reader, "content").iterator();
// create enumeration of all terms
// go to the first term (aaa)
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java Wed Apr 8 19:48:07 2015
@@ -74,7 +74,7 @@ public class TestStressAdvance extends L
bDocIDs.add(docID);
}
}
- final TermsEnum te = getOnlySegmentReader(r).fields().terms("field").iterator(null);
+ final TermsEnum te = getOnlySegmentReader(r).fields().terms("field").iterator();
PostingsEnum de = null;
for(int iter2=0;iter2<10;iter2++) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java Wed Apr 8 19:48:07 2015
@@ -313,7 +313,7 @@ public class TestStressIndexing2 extends
MultiFields.getFields(r2).terms(idField) == null);
return;
}
- final TermsEnum termsEnum = terms1.iterator(null);
+ final TermsEnum termsEnum = terms1.iterator();
final Bits liveDocs1 = MultiFields.getLiveDocs(r1);
final Bits liveDocs2 = MultiFields.getLiveDocs(r2);
@@ -333,7 +333,7 @@ public class TestStressIndexing2 extends
}
return;
}
- TermsEnum termsEnum2 = terms2.iterator(null);
+ TermsEnum termsEnum2 = terms2.iterator();
PostingsEnum termDocs1 = null;
PostingsEnum termDocs2 = null;
@@ -391,7 +391,7 @@ public class TestStressIndexing2 extends
System.out.println(" " + field + ":");
Terms terms3 = tv1.terms(field);
assertNotNull(terms3);
- TermsEnum termsEnum3 = terms3.iterator(null);
+ TermsEnum termsEnum3 = terms3.iterator();
BytesRef term2;
while((term2 = termsEnum3.next()) != null) {
System.out.println(" " + term2.utf8ToString() + ": freq=" + termsEnum3.totalTermFreq());
@@ -423,7 +423,7 @@ public class TestStressIndexing2 extends
System.out.println(" " + field + ":");
Terms terms3 = tv2.terms(field);
assertNotNull(terms3);
- TermsEnum termsEnum3 = terms3.iterator(null);
+ TermsEnum termsEnum3 = terms3.iterator();
BytesRef term2;
while((term2 = termsEnum3.next()) != null) {
System.out.println(" " + term2.utf8ToString() + ": freq=" + termsEnum3.totalTermFreq());
@@ -485,7 +485,7 @@ public class TestStressIndexing2 extends
if (terms == null) {
continue;
}
- termsEnum1 = terms.iterator(null);
+ termsEnum1 = terms.iterator();
}
term1 = termsEnum1.next();
if (term1 == null) {
@@ -518,7 +518,7 @@ public class TestStressIndexing2 extends
if (terms == null) {
continue;
}
- termsEnum2 = terms.iterator(null);
+ termsEnum2 = terms.iterator();
}
term2 = termsEnum2.next();
if (term2 == null) {
@@ -599,11 +599,11 @@ public class TestStressIndexing2 extends
Terms terms1 = d1.terms(field1);
assertNotNull(terms1);
- TermsEnum termsEnum1 = terms1.iterator(null);
+ TermsEnum termsEnum1 = terms1.iterator();
Terms terms2 = d2.terms(field2);
assertNotNull(terms2);
- TermsEnum termsEnum2 = terms2.iterator(null);
+ TermsEnum termsEnum2 = terms2.iterator();
PostingsEnum dpEnum1 = null;
PostingsEnum dpEnum2 = null;
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java Wed Apr 8 19:48:07 2015
@@ -86,7 +86,7 @@ public class TestSumDocFreq extends Luce
}
long computedSumDocFreq = 0;
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
while (termsEnum.next() != null) {
computedSumDocFreq += termsEnum.docFreq();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java Wed Apr 8 19:48:07 2015
@@ -200,7 +200,7 @@ public class TestTermVectorsReader exten
Terms vector = reader.get(j).terms(testFields[0]);
assertNotNull(vector);
assertEquals(testTerms.length, vector.size());
- TermsEnum termsEnum = vector.iterator(null);
+ TermsEnum termsEnum = vector.iterator();
for (int i = 0; i < testTerms.length; i++) {
final BytesRef text = termsEnum.next();
assertNotNull(text);
@@ -219,7 +219,7 @@ public class TestTermVectorsReader exten
Terms vector = reader.get(j).terms(testFields[0]);
assertNotNull(vector);
assertEquals(testTerms.length, vector.size());
- TermsEnum termsEnum = vector.iterator(null);
+ TermsEnum termsEnum = vector.iterator();
PostingsEnum postingsEnum = null;
for (int i = 0; i < testTerms.length; i++) {
final BytesRef text = termsEnum.next();
@@ -246,7 +246,7 @@ public class TestTermVectorsReader exten
Terms vector = reader.get(0).terms(testFields[0]);
assertNotNull(vector);
assertEquals(testTerms.length, vector.size());
- TermsEnum termsEnum = vector.iterator(null);
+ TermsEnum termsEnum = vector.iterator();
PostingsEnum dpEnum = null;
for (int i = 0; i < testTerms.length; i++) {
final BytesRef text = termsEnum.next();
@@ -283,7 +283,7 @@ public class TestTermVectorsReader exten
Terms freqVector = reader.get(0).terms(testFields[1]); //no pos, no offset
assertNotNull(freqVector);
assertEquals(testTerms.length, freqVector.size());
- termsEnum = freqVector.iterator(null);
+ termsEnum = freqVector.iterator();
assertNotNull(termsEnum);
for (int i = 0; i < testTerms.length; i++) {
final BytesRef text = termsEnum.next();
@@ -301,7 +301,7 @@ public class TestTermVectorsReader exten
TermVectorsReader reader = Codec.getDefault().termVectorsFormat().vectorsReader(dir, seg.info, fieldInfos, newIOContext(random()));
Terms vector = reader.get(0).terms(testFields[0]);
assertNotNull(vector);
- TermsEnum termsEnum = vector.iterator(null);
+ TermsEnum termsEnum = vector.iterator();
assertNotNull(termsEnum);
assertEquals(testTerms.length, vector.size());
PostingsEnum dpEnum = null;
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java Wed Apr 8 19:48:07 2015
@@ -61,7 +61,7 @@ public class TestTermVectorsWriter exten
IndexReader r = DirectoryReader.open(dir);
Terms vector = r.getTermVectors(0).terms("field");
assertNotNull(vector);
- TermsEnum termsEnum = vector.iterator(null);
+ TermsEnum termsEnum = vector.iterator();
assertNotNull(termsEnum.next());
assertEquals("", termsEnum.term().utf8ToString());
@@ -115,7 +115,7 @@ public class TestTermVectorsWriter exten
w.close();
IndexReader r = DirectoryReader.open(dir);
- TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null);
+ TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator();
assertNotNull(termsEnum.next());
PostingsEnum dpEnum = termsEnum.postings(null, null, PostingsEnum.ALL);
assertEquals(2, termsEnum.totalTermFreq());
@@ -150,7 +150,7 @@ public class TestTermVectorsWriter exten
w.close();
IndexReader r = DirectoryReader.open(dir);
- TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null);
+ TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator();
assertNotNull(termsEnum.next());
PostingsEnum dpEnum = termsEnum.postings(null, null, PostingsEnum.ALL);
assertEquals(2, termsEnum.totalTermFreq());
@@ -188,7 +188,7 @@ public class TestTermVectorsWriter exten
w.close();
IndexReader r = DirectoryReader.open(dir);
- TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null);
+ TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator();
assertNotNull(termsEnum.next());
PostingsEnum dpEnum = termsEnum.postings(null, null, PostingsEnum.ALL);
assertEquals(2, termsEnum.totalTermFreq());
@@ -223,7 +223,7 @@ public class TestTermVectorsWriter exten
w.close();
IndexReader r = DirectoryReader.open(dir);
- TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null);
+ TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator();
assertNotNull(termsEnum.next());
PostingsEnum dpEnum = termsEnum.postings(null, null, PostingsEnum.ALL);
assertEquals(2, termsEnum.totalTermFreq());
@@ -259,7 +259,7 @@ public class TestTermVectorsWriter exten
w.close();
IndexReader r = DirectoryReader.open(dir);
- TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null);
+ TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator();
assertNotNull(termsEnum.next());
PostingsEnum dpEnum = termsEnum.postings(null, null, PostingsEnum.ALL);
@@ -303,7 +303,7 @@ public class TestTermVectorsWriter exten
w.close();
IndexReader r = DirectoryReader.open(dir);
- TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null);
+ TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator();
assertNotNull(termsEnum.next());
PostingsEnum dpEnum = termsEnum.postings(null, null, PostingsEnum.ALL);
@@ -345,7 +345,7 @@ public class TestTermVectorsWriter exten
w.close();
IndexReader r = DirectoryReader.open(dir);
- TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null);
+ TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator();
assertNotNull(termsEnum.next());
PostingsEnum dpEnum = termsEnum.postings(null, null, PostingsEnum.ALL);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java Wed Apr 8 19:48:07 2015
@@ -114,7 +114,7 @@ public class TestTermdocPerf extends Luc
IndexReader reader = DirectoryReader.open(dir);
- TermsEnum tenum = MultiFields.getTerms(reader, "foo").iterator(null);
+ TermsEnum tenum = MultiFields.getTerms(reader, "foo").iterator();
start = System.currentTimeMillis();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java Wed Apr 8 19:48:07 2015
@@ -55,7 +55,7 @@ public class TestTermsEnum extends Lucen
w.close();
final List<BytesRef> terms = new ArrayList<>();
- final TermsEnum termsEnum = MultiFields.getTerms(r, "body").iterator(null);
+ final TermsEnum termsEnum = MultiFields.getTerms(r, "body").iterator();
BytesRef term;
while((term = termsEnum.next()) != null) {
terms.add(BytesRef.deepCopyOf(term));
@@ -478,7 +478,7 @@ public class TestTermsEnum extends Lucen
assertEquals(1, docFreq(r, "xx"));
assertEquals(1, docFreq(r, "aa4"));
- final TermsEnum te = MultiFields.getTerms(r, FIELD).iterator(null);
+ final TermsEnum te = MultiFields.getTerms(r, FIELD).iterator();
while(te.next() != null) {
//System.out.println("TEST: next term=" + te.term().utf8ToString());
}
@@ -510,7 +510,7 @@ public class TestTermsEnum extends Lucen
assertEquals(1, r.maxDoc());
Terms terms = MultiFields.getTerms(r, "field");
if (terms != null) {
- assertNull(terms.iterator(null).next());
+ assertNull(terms.iterator().next());
}
r.close();
d.close();
@@ -610,7 +610,7 @@ public class TestTermsEnum extends Lucen
System.out.println(" " + t.utf8ToString() + " " + t);
}
}
- final TermsEnum te = MultiFields.getTerms(r, FIELD).iterator(null);
+ final TermsEnum te = MultiFields.getTerms(r, FIELD).iterator();
final int END_LOC = -validTerms.length-1;
@@ -902,7 +902,7 @@ public class TestTermsEnum extends Lucen
System.out.println("\nTEST: reader=" + r);
}
- TermsEnum termsEnum = MultiFields.getTerms(r, "id").iterator(null);
+ TermsEnum termsEnum = MultiFields.getTerms(r, "id").iterator();
PostingsEnum postingsEnum = null;
PerThreadPKLookup pkLookup = new PerThreadPKLookup(r, "id");
@@ -983,7 +983,7 @@ public class TestTermsEnum extends Lucen
w.addDocument(doc);
IndexReader r = w.getReader();
assertEquals(1, r.leaves().size());
- TermsEnum te = r.leaves().get(0).reader().fields().terms("field").iterator(null);
+ TermsEnum te = r.leaves().get(0).reader().fields().terms("field").iterator();
for(int i=0;i<=termCount;i++) {
assertTrue("term '" + termsList.get(i).utf8ToString() + "' should exist but doesn't", te.seekExact(termsList.get(i)));
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java Wed Apr 8 19:48:07 2015
@@ -116,7 +116,7 @@ public class TestTermsEnum2 extends Luce
String reg = AutomatonTestUtil.randomRegexp(random());
Automaton automaton = Operations.determinize(new RegExp(reg, RegExp.NONE).toAutomaton(),
DEFAULT_MAX_DETERMINIZED_STATES);
- TermsEnum te = MultiFields.getTerms(reader, "field").iterator(null);
+ TermsEnum te = MultiFields.getTerms(reader, "field").iterator();
ArrayList<BytesRef> unsortedTerms = new ArrayList<>(terms);
Collections.shuffle(unsortedTerms, random());
@@ -139,7 +139,7 @@ public class TestTermsEnum2 extends Luce
/** mixes up seek and next for all terms */
public void testSeekingAndNexting() throws Exception {
for (int i = 0; i < numIterations; i++) {
- TermsEnum te = MultiFields.getTerms(reader, "field").iterator(null);
+ TermsEnum te = MultiFields.getTerms(reader, "field").iterator();
for (BytesRef term : terms) {
int c = random().nextInt(3);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java Wed Apr 8 19:48:07 2015
@@ -72,7 +72,7 @@ public class TestMultiPhraseQuery extend
// this TermEnum gives "piccadilly", "pie" and "pizza".
String prefix = "pi";
- TermsEnum te = MultiFields.getFields(reader).terms("body").iterator(null);
+ TermsEnum te = MultiFields.getFields(reader).terms("body").iterator();
te.seekCeil(new BytesRef(prefix));
do {
String s = te.term().utf8ToString();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java Wed Apr 8 19:48:07 2015
@@ -153,7 +153,7 @@ public class TestMultiTermQueryRewrites
final MultiTermQuery mtq = new MultiTermQuery("data") {
@Override
protected TermsEnum getTermsEnum(Terms terms, AttributeSource atts) throws IOException {
- return new FilteredTermsEnum(terms.iterator(null)) {
+ return new FilteredTermsEnum(terms.iterator()) {
final BoostAttribute boostAtt =
attributes().addAttribute(BoostAttribute.class);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java Wed Apr 8 19:48:07 2015
@@ -174,7 +174,7 @@ class MultiThreadTermVectorsReader imple
Terms vector = reader.getTermVectors(docId).terms("field");
timeElapsed += System.currentTimeMillis()-start;
- verifyVector(vector.iterator(null), docId);
+ verifyVector(vector.iterator(), docId);
}
}
@@ -182,7 +182,7 @@ class MultiThreadTermVectorsReader imple
for (String field : vectors) {
Terms terms = vectors.terms(field);
assert terms != null;
- verifyVector(terms.iterator(null), num);
+ verifyVector(terms.iterator(), num);
}
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java Wed Apr 8 19:48:07 2015
@@ -73,7 +73,7 @@ public class TestPhrasePrefixQuery exten
// this TermEnum gives "piccadilly", "pie" and "pizza".
String prefix = "pi";
- TermsEnum te = MultiFields.getFields(reader).terms("body").iterator(null);
+ TermsEnum te = MultiFields.getFields(reader).terms("body").iterator();
te.seekCeil(new BytesRef(prefix));
do {
String s = te.term().utf8ToString();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java Wed Apr 8 19:48:07 2015
@@ -85,7 +85,7 @@ public class TestPrefixRandom extends Lu
@Override
protected TermsEnum getTermsEnum(Terms terms, AttributeSource atts) throws IOException {
- return new SimplePrefixTermsEnum(terms.iterator(null), prefix);
+ return new SimplePrefixTermsEnum(terms.iterator(), prefix);
}
private class SimplePrefixTermsEnum extends FilteredTermsEnum {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java Wed Apr 8 19:48:07 2015
@@ -114,7 +114,7 @@ public class TestRegexpRandom2 extends L
@Override
protected TermsEnum getTermsEnum(Terms terms, AttributeSource atts) throws IOException {
- return new SimpleAutomatonTermsEnum(terms.iterator(null));
+ return new SimpleAutomatonTermsEnum(terms.iterator());
}
private class SimpleAutomatonTermsEnum extends FilteredTermsEnum {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java Wed Apr 8 19:48:07 2015
@@ -63,7 +63,7 @@ public class TestSameScoresWithThreads e
final IndexSearcher s = newSearcher(r);
Terms terms = MultiFields.getFields(r).terms("body");
int termCount = 0;
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
while(termsEnum.next() != null) {
termCount++;
}
@@ -71,7 +71,7 @@ public class TestSameScoresWithThreads e
// Target ~10 terms to search:
double chance = 10.0 / termCount;
- termsEnum = terms.iterator(termsEnum);
+ termsEnum = terms.iterator();
final Map<BytesRef,TopDocs> answers = new HashMap<>();
while(termsEnum.next() != null) {
if (random().nextDouble() <= chance) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java Wed Apr 8 19:48:07 2015
@@ -174,7 +174,7 @@ public class TestShardSearching extends
if (terms == null && docCount > minDocsToMakeTerms) {
// TODO: try to "focus" on high freq terms sometimes too
// TODO: maybe also periodically reset the terms...?
- final TermsEnum termsEnum = MultiFields.getTerms(mockReader, "body").iterator(null);
+ final TermsEnum termsEnum = MultiFields.getTerms(mockReader, "body").iterator();
terms = new ArrayList<>();
while(termsEnum.next() != null) {
terms.add(BytesRef.deepCopyOf(termsEnum.term()));
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java Wed Apr 8 19:48:07 2015
@@ -340,7 +340,7 @@ public class TestFSTs extends LuceneTest
Terms terms = MultiFields.getTerms(r, "body");
if (terms != null) {
final IntsRefBuilder scratchIntsRef = new IntsRefBuilder();
- final TermsEnum termsEnum = terms.iterator(null);
+ final TermsEnum termsEnum = terms.iterator();
if (VERBOSE) {
System.out.println("TEST: got termsEnum=" + termsEnum);
}
@@ -922,7 +922,7 @@ public class TestFSTs extends LuceneTest
}
// Verify w/ MultiTermsEnum
- final TermsEnum termsEnum = MultiFields.getTerms(r, "id").iterator(null);
+ final TermsEnum termsEnum = MultiFields.getTerms(r, "id").iterator();
for(int iter=0;iter<2*NUM_IDS;iter++) {
final String id;
final String nextID;
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java Wed Apr 8 19:48:07 2015
@@ -381,12 +381,12 @@ public class DirectoryTaxonomyWriter imp
DirectoryReader reader = readerManager.acquire();
try {
final BytesRef catTerm = new BytesRef(FacetsConfig.pathToString(categoryPath.components, categoryPath.length));
- TermsEnum termsEnum = null; // reuse
PostingsEnum docs = null; // reuse
for (LeafReaderContext ctx : reader.leaves()) {
Terms terms = ctx.reader().terms(Consts.FULL);
if (terms != null) {
- termsEnum = terms.iterator(termsEnum);
+ // TODO: share per-segment TermsEnum here!
+ TermsEnum termsEnum = terms.iterator();
if (termsEnum.seekExact(catTerm)) {
// liveDocs=null because the taxonomy has no deletes
docs = termsEnum.postings(null, docs, 0 /* freqs not required */);
@@ -674,12 +674,12 @@ public class DirectoryTaxonomyWriter imp
boolean aborted = false;
DirectoryReader reader = readerManager.acquire();
try {
- TermsEnum termsEnum = null;
PostingsEnum postingsEnum = null;
for (LeafReaderContext ctx : reader.leaves()) {
Terms terms = ctx.reader().terms(Consts.FULL);
if (terms != null) { // cannot really happen, but be on the safe side
- termsEnum = terms.iterator(termsEnum);
+ // TODO: share per-segment TermsEnum here!
+ TermsEnum termsEnum = terms.iterator();
while (termsEnum.next() != null) {
if (!cache.isFull()) {
BytesRef t = termsEnum.term();
@@ -770,12 +770,12 @@ public class DirectoryTaxonomyWriter imp
final OrdinalMap ordinalMap = map;
ordinalMap.setSize(size);
int base = 0;
- TermsEnum te = null;
PostingsEnum docs = null;
for (final LeafReaderContext ctx : r.leaves()) {
final LeafReader ar = ctx.reader();
final Terms terms = ar.terms(Consts.FULL);
- te = terms.iterator(te);
+ // TODO: share per-segment TermsEnum here!
+ TermsEnum te = terms.iterator();
while (te.next() != null) {
FacetLabel cp = new FacetLabel(FacetsConfig.stringToPath(te.term().utf8ToString()));
final int ordinal = addCategory(cp);
Modified: lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenStreamFromTermVector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenStreamFromTermVector.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenStreamFromTermVector.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenStreamFromTermVector.java Wed Apr 8 19:48:07 2015
@@ -121,7 +121,7 @@ public final class TokenStreamFromTermVe
int lastPosition = -1;
- final TermsEnum termsEnum = vector.iterator(null);
+ final TermsEnum termsEnum = vector.iterator();
BytesRef termBytesRef;
PostingsEnum dpEnum = null;
//int sumFreq = 0;
Modified: lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/PostingsHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/PostingsHighlighter.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/PostingsHighlighter.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/PostingsHighlighter.java Wed Apr 8 19:48:07 2015
@@ -509,7 +509,7 @@ public class PostingsHighlighter {
throw new IllegalArgumentException("field '" + field + "' was indexed without offsets, cannot highlight");
}
if (t != null) {
- termsEnum = t.iterator(null);
+ termsEnum = t.iterator();
postings = new PostingsEnum[terms.length];
}
}
Modified: lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java Wed Apr 8 19:48:07 2015
@@ -92,7 +92,7 @@ public class FieldTermStack {
}
final CharsRefBuilder spare = new CharsRefBuilder();
- final TermsEnum termsEnum = vector.iterator(null);
+ final TermsEnum termsEnum = vector.iterator();
PostingsEnum dpEnum = null;
BytesRef text;
Modified: lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java (original)
+++ lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java Wed Apr 8 19:48:07 2015
@@ -127,13 +127,11 @@ class TermsIncludingScoreQuery extends Q
final Weight originalWeight = originalQuery.createWeight(searcher, needsScores);
return new Weight(TermsIncludingScoreQuery.this) {
- private TermsEnum segmentTermsEnum;
-
@Override
public Explanation explain(LeafReaderContext context, int doc) throws IOException {
Terms terms = context.reader().terms(field);
if (terms != null) {
- segmentTermsEnum = terms.iterator(segmentTermsEnum);
+ TermsEnum segmentTermsEnum = terms.iterator();
BytesRef spare = new BytesRef();
PostingsEnum postingsEnum = null;
for (int i = 0; i < TermsIncludingScoreQuery.this.terms.size(); i++) {
@@ -169,7 +167,7 @@ class TermsIncludingScoreQuery extends Q
// what is the runtime...seems ok?
final long cost = context.reader().maxDoc() * terms.size();
- segmentTermsEnum = terms.iterator(segmentTermsEnum);
+ TermsEnum segmentTermsEnum = terms.iterator();
if (multipleValuesPerDocument) {
return new MVInOrderScorer(this, acceptDocs, segmentTermsEnum, context.reader().maxDoc(), cost);
} else {
Modified: lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/TermsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/TermsQuery.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/TermsQuery.java (original)
+++ lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/TermsQuery.java Wed Apr 8 19:48:07 2015
@@ -58,7 +58,7 @@ class TermsQuery extends MultiTermQuery
return TermsEnum.EMPTY;
}
- return new SeekingTermSetTermsEnum(terms.iterator(null), this.terms, ords);
+ return new SeekingTermSetTermsEnum(terms.iterator(), this.terms, ords);
}
@Override
Modified: lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java (original)
+++ lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java Wed Apr 8 19:48:07 2015
@@ -894,11 +894,10 @@ public class TestJoinUtil extends Lucene
Terms terms = slowCompositeReader.terms(toField);
if (terms != null) {
PostingsEnum postingsEnum = null;
- TermsEnum termsEnum = null;
SortedSet<BytesRef> joinValues = new TreeSet<>(BytesRef.getUTF8SortedAsUnicodeComparator());
joinValues.addAll(joinValueToJoinScores.keySet());
for (BytesRef joinValue : joinValues) {
- termsEnum = terms.iterator(termsEnum);
+ TermsEnum termsEnum = terms.iterator();
if (termsEnum.seekExact(joinValue)) {
postingsEnum = termsEnum.postings(slowCompositeReader.getLiveDocs(), postingsEnum, PostingsEnum.NONE);
JoinScore joinScore = joinValueToJoinScores.get(joinValue);
Modified: lucene/dev/trunk/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (original)
+++ lucene/dev/trunk/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java Wed Apr 8 19:48:07 2015
@@ -840,7 +840,7 @@ public class MemoryIndex {
return new Terms() {
@Override
- public TermsEnum iterator(TermsEnum reuse) {
+ public TermsEnum iterator() {
return new MemoryTermsEnum(info);
}
Modified: lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java (original)
+++ lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java Wed Apr 8 19:48:07 2015
@@ -99,7 +99,7 @@ public class TestMemoryIndex extends Luc
mi.addField("field", "some terms be here", analyzer);
IndexSearcher searcher = mi.createSearcher();
LeafReader reader = (LeafReader) searcher.getIndexReader();
- TermsEnum terms = reader.fields().terms("field").iterator(null);
+ TermsEnum terms = reader.fields().terms("field").iterator();
terms.seekExact(0);
assertEquals("be", terms.term().utf8ToString());
TestUtil.checkReader(reader);
Modified: lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstRAMDir.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstRAMDir.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstRAMDir.java (original)
+++ lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstRAMDir.java Wed Apr 8 19:48:07 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/trunk/lucene/misc/src/java/org/apache/lucene/index/SortingLeafReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/SortingLeafReader.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/SortingLeafReader.java (original)
+++ lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/SortingLeafReader.java Wed Apr 8 19:48:07 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/trunk/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java (original)
+++ lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java Wed Apr 8 19:48:07 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/trunk/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java (original)
+++ lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java Wed Apr 8 19:48:07 2015
@@ -236,7 +236,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);
@@ -289,7 +289,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) {
@@ -608,7 +608,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/trunk/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java (original)
+++ lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java Wed Apr 8 19:48:07 2015
@@ -99,7 +99,7 @@ interface FieldCache {
@Override
public TermsEnum termsEnum(Terms terms) throws IOException {
- return NumericUtils.filterPrefixCodedInts(terms.iterator(null));
+ return NumericUtils.filterPrefixCodedInts(terms.iterator());
}
@Override
@@ -127,7 +127,7 @@ interface FieldCache {
@Override
public TermsEnum termsEnum(Terms terms) throws IOException {
- return NumericUtils.filterPrefixCodedInts(terms.iterator(null));
+ return NumericUtils.filterPrefixCodedInts(terms.iterator());
}
};
@@ -147,7 +147,7 @@ interface FieldCache {
@Override
public TermsEnum termsEnum(Terms terms) throws IOException {
- return NumericUtils.filterPrefixCodedLongs(terms.iterator(null));
+ return NumericUtils.filterPrefixCodedLongs(terms.iterator());
}
};
@@ -169,7 +169,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/trunk/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java (original)
+++ lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java Wed Apr 8 19:48:07 2015
@@ -407,7 +407,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();
@@ -685,7 +685,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) {
@@ -835,7 +835,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/trunk/lucene/misc/src/test/org/apache/lucene/index/SorterTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/SorterTestBase.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/SorterTestBase.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/SorterTestBase.java Wed Apr 8 19:48:07 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/trunk/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java Wed Apr 8 19:48:07 2015
@@ -72,7 +72,7 @@ public class TestMultiPassIndexSplitter
assertTrue(ir.numDocs() - NUM_DOCS / 3 <= 1); // rounding error
StoredDocument 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/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestDocTermOrds.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestDocTermOrds.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestDocTermOrds.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestDocTermOrds.java Wed Apr 8 19:48:07 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/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java Wed Apr 8 19:48:07 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/trunk/lucene/queries/src/java/org/apache/lucene/queries/CommonTermsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/CommonTermsQuery.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/CommonTermsQuery.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/CommonTermsQuery.java Wed Apr 8 19:48:07 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/trunk/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java Wed Apr 8 19:48:07 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/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java Wed Apr 8 19:48:07 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/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java Wed Apr 8 19:48:07 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/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java Wed Apr 8 19:48:07 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/trunk/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java Wed Apr 8 19:48:07 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/trunk/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java Wed Apr 8 19:48:07 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/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndPrefixQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndPrefixQuery.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndPrefixQuery.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndPrefixQuery.java Wed Apr 8 19:48:07 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()));