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 [1/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...
Author: mikemccand
Date: Wed Apr 8 19:48:07 2015
New Revision: 1672155
URL: http://svn.apache.org/r1672155
Log:
LUCENE-6410: remove unused 'reuse' parameter to Terms.iterator
Modified:
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/QualityQueriesFinder.java
lucene/dev/trunk/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/BooleanPerceptronClassifier.java
lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/CachingNaiveBayesClassifier.java
lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java
lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/utils/DocToDoubleVectorUtils.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsWriter.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsWriter.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsFieldReader.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsWriter.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsWriter.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsWriter.java
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/blocktreeords/TestOrdsBlockTree.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/AutoPrefixTermsWriter.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsWriter.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/FieldReader.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/ExitableDirectoryReader.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/FreqProxFields.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriter.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/LeafReader.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MappedMultiFields.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MultiFields.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MultiTerms.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/TermContext.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/Terms.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesRewriteMethod.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FuzzyQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TermQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/NumericUtils.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/automaton/CompiledAutomaton.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingTermVectorsFormat.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat3.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50DocValuesFormat.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDoc.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestExitableDirectoryReader.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestFlex.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenStreamFromTermVector.java
lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/PostingsHighlighter.java
lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java
lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java
lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/TermsQuery.java
lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
lucene/dev/trunk/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java
lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstRAMDir.java
lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/SortingLeafReader.java
lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java
lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java
lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java
lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java
lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/SorterTestBase.java
lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java
lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestDocTermOrds.java
lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java
lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/CommonTermsQuery.java
lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java
lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java
lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java
lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java
lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java
lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java
lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndPrefixQuery.java
lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTermQuery.java
lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTruncQuery.java
lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsWriter.java
lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java
lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java
lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowFuzzyQuery.java
lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowFuzzyTermsEnum.java
lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/regex/RegexQuery.java
lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonQuery.java
lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/TestIDVersionPostingsFormat.java
lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractPrefixTreeFilter.java
lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java
lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/HighFrequencyDictionary.java
lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/LuceneDictionary.java
lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java
lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java
lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java
lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionFieldsConsumer.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/PerThreadPKLookup.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/RandomPostingsTester.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/NumericFacets.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/facet/FacetField.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRTGBase.java
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Wed Apr 8 19:48:07 2015
@@ -74,6 +74,9 @@ API Changes
* LUCENE-6377: SearcherFactory#newSearcher now accepts the previous reader
to simplify warming logic during opening new searchers. (Simon Willnauer)
+* LUCENE-6410: Removed unused "reuse" parameter to
+ Terms.iterator. (Robert Muir, Mike McCandless)
+
======================= Lucene 5.1.0 =======================
New Features
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java Wed Apr 8 19:48:07 2015
@@ -144,7 +144,7 @@ public final class QueryAutoStopWordAnal
Terms terms = MultiFields.getTerms(indexReader, field);
CharsRefBuilder spare = new CharsRefBuilder();
if (terms != null) {
- TermsEnum te = terms.iterator(null);
+ TermsEnum te = terms.iterator();
BytesRef text;
while ((text = te.next()) != null) {
if (te.docFreq() > maxDocFreq) {
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java Wed Apr 8 19:48:07 2015
@@ -108,7 +108,7 @@ public class TestTeeSinkTokenFilter exte
IndexReader r = DirectoryReader.open(dir);
Terms vector = r.getTermVectors(0).terms("field");
assertEquals(1, vector.size());
- TermsEnum termsEnum = vector.iterator(null);
+ TermsEnum termsEnum = vector.iterator();
termsEnum.next();
assertEquals(2, termsEnum.totalTermFreq());
PostingsEnum positions = termsEnum.postings(null, null, PostingsEnum.ALL);
Modified: lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (original)
+++ lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java Wed Apr 8 19:48:07 2015
@@ -948,7 +948,7 @@ public class TestBackwardsCompatibility
for (String name : oldNames) {
Directory dir = oldIndexDirs.get(name);
IndexReader r = DirectoryReader.open(dir);
- TermsEnum terms = MultiFields.getFields(r).terms("content").iterator(null);
+ TermsEnum terms = MultiFields.getFields(r).terms("content").iterator();
BytesRef t = terms.next();
assertNotNull(t);
@@ -1063,14 +1063,14 @@ public class TestBackwardsCompatibility
// check decoding of terms
Terms terms = MultiFields.getTerms(searcher.getIndexReader(), "trieInt");
- TermsEnum termsEnum = NumericUtils.filterPrefixCodedInts(terms.iterator(null));
+ TermsEnum termsEnum = NumericUtils.filterPrefixCodedInts(terms.iterator());
while (termsEnum.next() != null) {
int val = NumericUtils.prefixCodedToInt(termsEnum.term());
assertTrue("value in id bounds", val >= 0 && val < 35);
}
terms = MultiFields.getTerms(searcher.getIndexReader(), "trieLong");
- termsEnum = NumericUtils.filterPrefixCodedLongs(terms.iterator(null));
+ termsEnum = NumericUtils.filterPrefixCodedLongs(terms.iterator());
while (termsEnum.next() != null) {
long val = NumericUtils.prefixCodedToLong(termsEnum.term());
assertTrue("value in id bounds", val >= 0L && val < 35L);
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/QualityQueriesFinder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/QualityQueriesFinder.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/QualityQueriesFinder.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/QualityQueriesFinder.java Wed Apr 8 19:48:07 2015
@@ -92,7 +92,7 @@ public class QualityQueriesFinder {
int threshold = ir.maxDoc() / 10; // ignore words too common.
Terms terms = MultiFields.getTerms(ir, field);
if (terms != null) {
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
while (termsEnum.next() != null) {
int df = termsEnum.docFreq();
if (df<threshold) {
Modified: lucene/dev/trunk/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java Wed Apr 8 19:48:07 2015
@@ -496,7 +496,7 @@ public class TestPerfTasksLogic extends
if (terms == null) {
continue;
}
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
PostingsEnum docs = null;
while(termsEnum.next() != null) {
docs = TestUtil.docs(random(), termsEnum, MultiFields.getLiveDocs(reader), docs, PostingsEnum.FREQS);
Modified: lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/BooleanPerceptronClassifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/BooleanPerceptronClassifier.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/BooleanPerceptronClassifier.java (original)
+++ lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/BooleanPerceptronClassifier.java Wed Apr 8 19:48:07 2015
@@ -152,10 +152,10 @@ public class BooleanPerceptronClassifier
// TODO : remove this map as soon as we have a writable FST
SortedMap<String, Double> weights = new ConcurrentSkipListMap<>();
- TermsEnum reuse = textTerms.iterator(null);
+ TermsEnum termsEnum = textTerms.iterator();
BytesRef textTerm;
- while ((textTerm = reuse.next()) != null) {
- weights.put(textTerm.utf8ToString(), (double) reuse.totalTermFreq());
+ while ((textTerm = termsEnum.next()) != null) {
+ weights.put(textTerm.utf8ToString(), (double) termsEnum.totalTermFreq());
}
updateFST(weights);
@@ -184,7 +184,7 @@ public class BooleanPerceptronClassifier
Boolean correctClass = Boolean.valueOf(field.stringValue());
long modifier = correctClass.compareTo(assignedClass);
if (modifier != 0) {
- reuse = updateWeights(leafReader, reuse, scoreDoc.doc, assignedClass,
+ updateWeights(leafReader, scoreDoc.doc, assignedClass,
weights, modifier, batchCount % batchSize == 0);
}
batchCount++;
@@ -197,10 +197,10 @@ public class BooleanPerceptronClassifier
throw new IOException("training with multiple fields not supported by boolean perceptron classifier");
}
- private TermsEnum updateWeights(LeafReader leafReader, TermsEnum reuse,
- int docId, Boolean assignedClass, SortedMap<String, Double> weights,
- double modifier, boolean updateFST) throws IOException {
- TermsEnum cte = textTerms.iterator(reuse);
+ private void updateWeights(LeafReader leafReader,
+ int docId, Boolean assignedClass, SortedMap<String, Double> weights,
+ double modifier, boolean updateFST) throws IOException {
+ TermsEnum cte = textTerms.iterator();
// get the doc term vectors
Terms terms = leafReader.getTermVector(docId, textFieldName);
@@ -210,7 +210,7 @@ public class BooleanPerceptronClassifier
+ textFieldName);
}
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
BytesRef term;
@@ -227,8 +227,6 @@ public class BooleanPerceptronClassifier
if (updateFST) {
updateFST(weights);
}
- reuse = cte;
- return reuse;
}
private void updateFST(SortedMap<String, Double> weights) throws IOException {
@@ -262,4 +260,4 @@ public class BooleanPerceptronClassifier
return null;
}
-}
\ No newline at end of file
+}
Modified: lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/CachingNaiveBayesClassifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/CachingNaiveBayesClassifier.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/CachingNaiveBayesClassifier.java (original)
+++ lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/CachingNaiveBayesClassifier.java Wed Apr 8 19:48:07 2015
@@ -241,7 +241,7 @@ public class CachingNaiveBayesClassifier
// build the cache for the word
Map<String, Long> frequencyMap = new HashMap<>();
for (String textFieldName : textFieldNames) {
- TermsEnum termsEnum = leafReader.terms(textFieldName).iterator(null);
+ TermsEnum termsEnum = leafReader.terms(textFieldName).iterator();
while (termsEnum.next() != null) {
BytesRef term = termsEnum.term();
String termText = term.utf8ToString();
@@ -259,7 +259,7 @@ public class CachingNaiveBayesClassifier
// fill the class list
Terms terms = MultiFields.getTerms(leafReader, classFieldName);
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
while ((termsEnum.next()) != null) {
cclasses.add(BytesRef.deepCopyOf(termsEnum.term()));
}
Modified: lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java (original)
+++ lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java Wed Apr 8 19:48:07 2015
@@ -161,7 +161,7 @@ public class SimpleNaiveBayesClassifier
List<ClassificationResult<BytesRef>> dataList = new ArrayList<>();
Terms terms = MultiFields.getTerms(leafReader, classFieldName);
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
BytesRef next;
String[] tokenizedDoc = tokenizeDoc(inputDocument);
int docsWithClassSize = countDocsWithClass();
Modified: lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/utils/DocToDoubleVectorUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/utils/DocToDoubleVectorUtils.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/utils/DocToDoubleVectorUtils.java (original)
+++ lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/utils/DocToDoubleVectorUtils.java Wed Apr 8 19:48:07 2015
@@ -39,17 +39,17 @@ public class DocToDoubleVectorUtils {
* @throws IOException in case accessing the underlying index fails
*/
public static Double[] toSparseLocalFreqDoubleArray(Terms docTerms, Terms fieldTerms) throws IOException {
- TermsEnum fieldTermsEnum = fieldTerms.iterator(null);
+ TermsEnum fieldTermsEnum = fieldTerms.iterator();
Double[] freqVector = null;
if (docTerms != null && fieldTerms.size() > -1) {
freqVector = new Double[(int) fieldTerms.size()];
int i = 0;
- TermsEnum docTermsEnum = docTerms.iterator(null);
+ TermsEnum docTermsEnum = docTerms.iterator();
BytesRef term;
while ((term = fieldTermsEnum.next()) != null) {
TermsEnum.SeekStatus seekStatus = docTermsEnum.seekCeil(term);
if (seekStatus.equals(TermsEnum.SeekStatus.END)) {
- docTermsEnum = docTerms.iterator(null);
+ docTermsEnum = docTerms.iterator();
}
if (seekStatus.equals(TermsEnum.SeekStatus.FOUND)) {
long termFreqLocal = docTermsEnum.totalTermFreq(); // the total number of occurrences of this term in the given document
@@ -75,7 +75,7 @@ public class DocToDoubleVectorUtils {
if (docTerms != null) {
freqVector = new Double[(int) docTerms.size()];
int i = 0;
- TermsEnum docTermsEnum = docTerms.iterator(null);
+ TermsEnum docTermsEnum = docTerms.iterator();
while (docTermsEnum.next() != null) {
long termFreqLocal = docTermsEnum.totalTermFreq(); // the total number of occurrences of this term in the given document
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java Wed Apr 8 19:48:07 2015
@@ -240,7 +240,7 @@ public class BlockTermsReader extends Fi
}
@Override
- public TermsEnum iterator(TermsEnum reuse) throws IOException {
+ public TermsEnum iterator() throws IOException {
return new SegmentTermsEnum();
}
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsWriter.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsWriter.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsWriter.java Wed Apr 8 19:48:07 2015
@@ -136,7 +136,7 @@ public class BlockTermsWriter extends Fi
continue;
}
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
TermsWriter termsWriter = addField(fieldInfos.fieldInfo(field));
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsWriter.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsWriter.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsWriter.java Wed Apr 8 19:48:07 2015
@@ -226,7 +226,7 @@ public final class OrdsBlockTreeTermsWri
continue;
}
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
TermsWriter termsWriter = new TermsWriter(fieldInfos.fieldInfo(field));
while (true) {
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsFieldReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsFieldReader.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsFieldReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsFieldReader.java Wed Apr 8 19:48:07 2015
@@ -137,7 +137,7 @@ final class OrdsFieldReader extends Term
}
@Override
- public TermsEnum iterator(TermsEnum reuse) throws IOException {
+ public TermsEnum iterator() throws IOException {
return new OrdsSegmentTermsEnum(this);
}
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java Wed Apr 8 19:48:07 2015
@@ -237,19 +237,8 @@ public final class BloomFilteringPosting
}
@Override
- public TermsEnum iterator(TermsEnum reuse) throws IOException {
- if ((reuse != null) && (reuse instanceof BloomFilteredTermsEnum)) {
- // recycle the existing BloomFilteredTermsEnum by asking the delegate
- // to recycle its contained TermsEnum
- BloomFilteredTermsEnum bfte = (BloomFilteredTermsEnum) reuse;
- if (bfte.filter == filter) {
- bfte.reset(delegateTerms, bfte.delegateTermsEnum);
- return bfte;
- }
- }
- // We have been handed something we cannot reuse (either null, wrong
- // class or wrong filter) so allocate a new object
- return new BloomFilteredTermsEnum(delegateTerms, reuse, filter);
+ public TermsEnum iterator() throws IOException {
+ return new BloomFilteredTermsEnum(delegateTerms, filter);
}
@Override
@@ -306,18 +295,15 @@ public final class BloomFilteringPosting
final class BloomFilteredTermsEnum extends TermsEnum {
private Terms delegateTerms;
private TermsEnum delegateTermsEnum;
- private TermsEnum reuseDelegate;
private final FuzzySet filter;
- public BloomFilteredTermsEnum(Terms delegateTerms, TermsEnum reuseDelegate, FuzzySet filter) throws IOException {
+ public BloomFilteredTermsEnum(Terms delegateTerms, FuzzySet filter) throws IOException {
this.delegateTerms = delegateTerms;
- this.reuseDelegate = reuseDelegate;
this.filter = filter;
}
- void reset(Terms delegateTerms, TermsEnum reuseDelegate) throws IOException {
+ void reset(Terms delegateTerms) throws IOException {
this.delegateTerms = delegateTerms;
- this.reuseDelegate = reuseDelegate;
this.delegateTermsEnum = null;
}
@@ -327,7 +313,7 @@ public final class BloomFilteringPosting
* this can be a relativly heavy operation depending on the
* delegate postings format and they underlying directory
* (clone IndexInput) */
- delegateTermsEnum = delegateTerms.iterator(reuseDelegate);
+ delegateTermsEnum = delegateTerms.iterator();
}
return delegateTermsEnum;
}
@@ -449,7 +435,7 @@ public final class BloomFilteringPosting
continue;
}
FieldInfo fieldInfo = state.fieldInfos.fieldInfo(field);
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
FuzzySet bloomFilter = null;
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java Wed Apr 8 19:48:07 2015
@@ -327,7 +327,7 @@ public final class DirectPostingsFormat
BytesRef term;
PostingsEnum postingsEnum = null;
PostingsEnum docsAndPositionsEnum = null;
- final TermsEnum termsEnum = termsIn.iterator(null);
+ final TermsEnum termsEnum = termsIn.iterator();
int termOffset = 0;
final IntArrayWriter scratch = new IntArrayWriter();
@@ -655,16 +655,8 @@ public final class DirectPostingsFormat
}
@Override
- public TermsEnum iterator(TermsEnum reuse) {
- DirectTermsEnum termsEnum;
- if (reuse != null && reuse instanceof DirectTermsEnum) {
- termsEnum = (DirectTermsEnum) reuse;
- if (!termsEnum.canReuse(terms)) {
- termsEnum = new DirectTermsEnum();
- }
- } else {
- termsEnum = new DirectTermsEnum();
- }
+ public TermsEnum iterator() {
+ DirectTermsEnum termsEnum = new DirectTermsEnum();
termsEnum.reset();
return termsEnum;
}
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java Wed Apr 8 19:48:07 2015
@@ -265,7 +265,7 @@ public class FSTOrdTermsReader extends F
}
@Override
- public TermsEnum iterator(TermsEnum reuse) throws IOException {
+ public TermsEnum iterator() throws IOException {
return new SegmentTermsEnum();
}
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsWriter.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsWriter.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsWriter.java Wed Apr 8 19:48:07 2015
@@ -194,7 +194,7 @@ public class FSTOrdTermsWriter extends F
}
FieldInfo fieldInfo = fieldInfos.fieldInfo(field);
boolean hasFreq = fieldInfo.getIndexOptions().compareTo(IndexOptions.DOCS_AND_FREQS) >= 0;
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
TermsWriter termsWriter = new TermsWriter(fieldInfo);
long sumTotalTermFreq = 0;
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java Wed Apr 8 19:48:07 2015
@@ -245,7 +245,7 @@ public class FSTTermsReader extends Fiel
}
@Override
- public TermsEnum iterator(TermsEnum reuse) throws IOException {
+ public TermsEnum iterator() throws IOException {
return new SegmentTermsEnum();
}
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsWriter.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsWriter.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsWriter.java Wed Apr 8 19:48:07 2015
@@ -166,7 +166,7 @@ public class FSTTermsWriter extends Fiel
}
FieldInfo fieldInfo = fieldInfos.fieldInfo(field);
boolean hasFreq = fieldInfo.getIndexOptions().compareTo(IndexOptions.DOCS_AND_FREQS) >= 0;
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
TermsWriter termsWriter = termsWriter = new TermsWriter(fieldInfo);
long sumTotalTermFreq = 0;
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java Wed Apr 8 19:48:07 2015
@@ -307,7 +307,7 @@ public final class MemoryPostingsFormat
continue;
}
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
FieldInfo fieldInfo = state.fieldInfos.fieldInfo(field);
TermsWriter termsWriter = new TermsWriter(out, fieldInfo,
@@ -952,7 +952,7 @@ public final class MemoryPostingsFormat
}
@Override
- public TermsEnum iterator(TermsEnum reuse) {
+ public TermsEnum iterator() {
return new FSTTermsEnum(field, fst);
}
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java Wed Apr 8 19:48:07 2015
@@ -627,7 +627,7 @@ class SimpleTextFieldsReader extends Fie
}
@Override
- public TermsEnum iterator(TermsEnum reuse) throws IOException {
+ public TermsEnum iterator() throws IOException {
if (fst != null) {
return new SimpleTextTermsEnum(fst, fieldInfo.getIndexOptions());
} else {
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsWriter.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsWriter.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsWriter.java Wed Apr 8 19:48:07 2015
@@ -91,7 +91,7 @@ class SimpleTextFieldsWriter extends Fie
}
}
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
PostingsEnum postingsEnum = null;
// for each term in field
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java Wed Apr 8 19:48:07 2015
@@ -277,7 +277,7 @@ public class SimpleTextTermVectorsReader
}
@Override
- public TermsEnum iterator(TermsEnum reuse) throws IOException {
+ public TermsEnum iterator() throws IOException {
// TODO: reuse
return new SimpleTVTermsEnum(terms);
}
Modified: lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/blocktreeords/TestOrdsBlockTree.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/blocktreeords/TestOrdsBlockTree.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/blocktreeords/TestOrdsBlockTree.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/blocktreeords/TestOrdsBlockTree.java Wed Apr 8 19:48:07 2015
@@ -53,7 +53,7 @@ public class TestOrdsBlockTree extends B
doc.add(newTextField("field", "a b c", Field.Store.NO));
w.addDocument(doc);
IndexReader r = w.getReader();
- TermsEnum te = MultiFields.getTerms(r, "field").iterator(null);
+ TermsEnum te = MultiFields.getTerms(r, "field").iterator();
// Test next()
assertEquals(new BytesRef("a"), te.next());
@@ -114,7 +114,7 @@ public class TestOrdsBlockTree extends B
}
w.forceMerge(1);
IndexReader r = w.getReader();
- TermsEnum te = MultiFields.getTerms(r, "field").iterator(null);
+ TermsEnum te = MultiFields.getTerms(r, "field").iterator();
assertTrue(te.seekExact(new BytesRef("mo")));
assertEquals(27, te.ord());
@@ -190,7 +190,7 @@ public class TestOrdsBlockTree extends B
}
w.forceMerge(1);
IndexReader r = w.getReader();
- TermsEnum te = MultiFields.getTerms(r, "field").iterator(null);
+ TermsEnum te = MultiFields.getTerms(r, "field").iterator();
if (VERBOSE) {
while (te.next() != null) {
@@ -250,7 +250,7 @@ public class TestOrdsBlockTree extends B
}
w.forceMerge(1);
IndexReader r = DirectoryReader.open(w, true);
- TermsEnum te = MultiFields.getTerms(r, "field").iterator(null);
+ TermsEnum te = MultiFields.getTerms(r, "field").iterator();
if (VERBOSE) {
BytesRef term;
@@ -300,7 +300,7 @@ public class TestOrdsBlockTree extends B
}
w.forceMerge(1);
IndexReader r = DirectoryReader.open(w, true);
- TermsEnum te = MultiFields.getTerms(r, "field").iterator(null);
+ TermsEnum te = MultiFields.getTerms(r, "field").iterator();
BytesRef term;
int ord = 0;
@@ -338,7 +338,7 @@ public class TestOrdsBlockTree extends B
}
w.forceMerge(1);
IndexReader r = DirectoryReader.open(w, true);
- TermsEnum te = MultiFields.getTerms(r, "body").iterator(null);
+ TermsEnum te = MultiFields.getTerms(r, "body").iterator();
for(int i=0;i<30;i++) {
for(int j=0;j<30;j++) {
@@ -379,7 +379,7 @@ public class TestOrdsBlockTree extends B
w.forceMerge(1);
IndexReader r = w.getReader();
- TermsEnum te = MultiFields.getTerms(r, "field").iterator(null);
+ TermsEnum te = MultiFields.getTerms(r, "field").iterator();
assertEquals(TermsEnum.SeekStatus.NOT_FOUND, te.seekCeil(new BytesRef(new byte[] {0x22})));
assertEquals("a", te.term().utf8ToString());
assertEquals(1L, te.ord());
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java Wed Apr 8 19:48:07 2015
@@ -249,14 +249,14 @@ public abstract class TermVectorsWriter
if (numTerms == -1) {
// count manually. It is stupid, but needed, as Terms.size() is not a mandatory statistics function
numTerms = 0;
- termsEnum = terms.iterator(termsEnum);
+ termsEnum = terms.iterator();
while(termsEnum.next() != null) {
numTerms++;
}
}
startField(fieldInfo, numTerms, hasPositions, hasOffsets, hasPayloads);
- termsEnum = terms.iterator(termsEnum);
+ termsEnum = terms.iterator();
int termCount = 0;
while(termsEnum.next() != null) {
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/AutoPrefixTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/AutoPrefixTermsWriter.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/AutoPrefixTermsWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/AutoPrefixTermsWriter.java Wed Apr 8 19:48:07 2015
@@ -186,7 +186,7 @@ class AutoPrefixTermsWriter {
this.maxItemsInPrefix = maxItemsInPrefix;
//this.segment = segment;
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
while (true) {
BytesRef term = termsEnum.next();
if (term == null) {
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsWriter.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsWriter.java Wed Apr 8 19:48:07 2015
@@ -423,7 +423,7 @@ public final class BlockTreeTermsWriter
prefixTerms = null;
}
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
TermsWriter termsWriter = new TermsWriter(fieldInfos.fieldInfo(field));
int prefixTermUpto = 0;
while (true) {
@@ -460,7 +460,7 @@ public final class BlockTreeTermsWriter
assert prefixDocs != null;
prefixDocs.clear(0, prefixDocs.length());
- prefixTermsEnum = prefix.getTermsEnum(terms.iterator(prefixTermsEnum));
+ prefixTermsEnum = prefix.getTermsEnum(terms.iterator());
//System.out.println("BTTW.getAutoPrefixTE: prefix=" + prefix);
while (prefixTermsEnum.next() != null) {
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/FieldReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/FieldReader.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/FieldReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/blocktree/FieldReader.java Wed Apr 8 19:48:07 2015
@@ -152,7 +152,7 @@ public final class FieldReader extends T
}
@Override
- public TermsEnum iterator(TermsEnum reuse) throws IOException {
+ public TermsEnum iterator() throws IOException {
return new SegmentTermsEnum(this);
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java Wed Apr 8 19:48:07 2015
@@ -773,13 +773,8 @@ public final class CompressingTermVector
}
@Override
- public TermsEnum iterator(TermsEnum reuse) throws IOException {
- final TVTermsEnum termsEnum;
- if (reuse != null && reuse instanceof TVTermsEnum) {
- termsEnum = (TVTermsEnum) reuse;
- } else {
- termsEnum = new TVTermsEnum();
- }
+ public TermsEnum iterator() throws IOException {
+ TVTermsEnum termsEnum = new TVTermsEnum();
termsEnum.reset(numTerms, flags, prefixLengths, suffixLengths, termFreqs, positionIndex, positions, startOffsets, lengths,
payloadIndex, payloadBytes,
new ByteArrayDataInput(termBytes.bytes, termBytes.offset, termBytes.length));
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java Wed Apr 8 19:48:07 2015
@@ -510,7 +510,7 @@ class BufferedUpdatesStream implements A
Terms terms = state.reader.fields().terms(field);
if (terms != null) {
segTermCount += terms.size();
- state.termsEnum = terms.iterator(state.termsEnum);
+ state.termsEnum = terms.iterator();
state.term = state.termsEnum.next();
if (state.term != null) {
queue.add(state);
@@ -645,7 +645,7 @@ class BufferedUpdatesStream implements A
currentField = term.field();
Terms terms = fields.terms(currentField);
if (terms != null) {
- termsEnum = terms.iterator(termsEnum);
+ termsEnum = terms.iterator();
} else {
termsEnum = null;
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java Wed Apr 8 19:48:07 2015
@@ -993,7 +993,7 @@ public class CheckIndex implements Close
//System.out.println(" check minTerm=" + minTerm.utf8ToString() + " maxTerm=" + maxTerm.utf8ToString());
assert minTerm.compareTo(maxTerm) <= 0;
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
TermsEnum.SeekStatus status = termsEnum.seekCeil(minTerm);
if (status != TermsEnum.SeekStatus.FOUND) {
throw new RuntimeException("failed to seek to existing term field=" + field + " term=" + minTerm);
@@ -1029,14 +1029,13 @@ public class CheckIndex implements Close
FixedBitSet normalDocs = new FixedBitSet(maxDoc);
FixedBitSet intersectDocs = new FixedBitSet(maxDoc);
- TermsEnum termsEnum = null;
//System.out.println("CI.checkTermRanges field=" + field + " numTerms=" + numTerms);
while (currentInterval >= 10.0) {
//System.out.println(" cycle interval=" + currentInterval);
// We iterate this terms enum to locate min/max term for each sliding/overlapping interval we test at the current level:
- termsEnum = terms.iterator(termsEnum);
+ TermsEnum termsEnum = terms.iterator();
long termCount = 0;
@@ -1198,7 +1197,7 @@ public class CheckIndex implements Close
}
}
- final TermsEnum termsEnum = terms.iterator(null);
+ final TermsEnum termsEnum = terms.iterator();
boolean hasOrd = true;
final long termCountStart = status.delTermCount + status.termCount;
@@ -2035,9 +2034,6 @@ public class CheckIndex implements Close
postingsFields = null;
}
- TermsEnum termsEnum = null;
- TermsEnum postingsTermsEnum = null;
-
TermVectorsReader vectorsReader = reader.getTermVectorsReader();
if (vectorsReader != null) {
@@ -2081,7 +2077,7 @@ public class CheckIndex implements Close
if (crossCheckTermVectors) {
Terms terms = tfv.terms(field);
- termsEnum = terms.iterator(termsEnum);
+ TermsEnum termsEnum = terms.iterator();
final boolean postingsHasFreq = fieldInfo.getIndexOptions().compareTo(IndexOptions.DOCS_AND_FREQS) >= 0;
final boolean postingsHasPayload = fieldInfo.hasPayloads();
final boolean vectorsHasPayload = terms.hasPayloads();
@@ -2090,7 +2086,7 @@ public class CheckIndex implements Close
if (postingsTerms == null) {
throw new RuntimeException("vector field=" + field + " does not exist in postings; doc=" + j);
}
- postingsTermsEnum = postingsTerms.iterator(postingsTermsEnum);
+ TermsEnum postingsTermsEnum = postingsTerms.iterator();
final boolean hasProx = terms.hasOffsets() || terms.hasPositions();
BytesRef term = null;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/ExitableDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/ExitableDirectoryReader.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/ExitableDirectoryReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/ExitableDirectoryReader.java Wed Apr 8 19:48:07 2015
@@ -137,8 +137,8 @@ public class ExitableDirectoryReader ext
}
@Override
- public TermsEnum iterator(TermsEnum reuse) throws IOException {
- return new ExitableTermsEnum(in.iterator(reuse), queryTimeout);
+ public TermsEnum iterator() throws IOException {
+ return new ExitableTermsEnum(in.iterator(), queryTimeout);
}
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java Wed Apr 8 19:48:07 2015
@@ -108,8 +108,8 @@ public class FilterLeafReader extends Le
}
@Override
- public TermsEnum iterator(TermsEnum reuse) throws IOException {
- return in.iterator(reuse);
+ public TermsEnum iterator() throws IOException {
+ return in.iterator();
}
@Override
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/FreqProxFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/FreqProxFields.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/FreqProxFields.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/FreqProxFields.java Wed Apr 8 19:48:07 2015
@@ -68,13 +68,8 @@ class FreqProxFields extends Fields {
}
@Override
- public TermsEnum iterator(TermsEnum reuse) {
- FreqProxTermsEnum termsEnum;
- if (reuse instanceof FreqProxTermsEnum && ((FreqProxTermsEnum) reuse).terms == this.terms) {
- termsEnum = (FreqProxTermsEnum) reuse;
- } else {
- termsEnum = new FreqProxTermsEnum(terms);
- }
+ public TermsEnum iterator() {
+ FreqProxTermsEnum termsEnum = new FreqProxTermsEnum(terms);
termsEnum.reset();
return termsEnum;
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriter.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriter.java Wed Apr 8 19:48:07 2015
@@ -49,7 +49,7 @@ final class FreqProxTermsWriter extends
lastField = deleteTerm.field();
Terms terms = fields.terms(lastField);
if (terms != null) {
- termsEnum = terms.iterator(termsEnum);
+ termsEnum = terms.iterator();
} else {
termsEnum = null;
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/LeafReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/LeafReader.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/LeafReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/LeafReader.java Wed Apr 8 19:48:07 2015
@@ -146,7 +146,7 @@ public abstract class LeafReader extends
if (terms == null) {
return 0;
}
- final TermsEnum termsEnum = terms.iterator(null);
+ final TermsEnum termsEnum = terms.iterator();
if (termsEnum.seekExact(term.bytes())) {
return termsEnum.docFreq();
} else {
@@ -165,7 +165,7 @@ public abstract class LeafReader extends
if (terms == null) {
return 0;
}
- final TermsEnum termsEnum = terms.iterator(null);
+ final TermsEnum termsEnum = terms.iterator();
if (termsEnum.seekExact(term.bytes())) {
return termsEnum.totalTermFreq();
} else {
@@ -214,7 +214,7 @@ public abstract class LeafReader extends
assert term.bytes() != null;
final Terms terms = terms(term.field());
if (terms != null) {
- final TermsEnum termsEnum = terms.iterator(null);
+ final TermsEnum termsEnum = terms.iterator();
if (termsEnum.seekExact(term.bytes())) {
return termsEnum.postings(getLiveDocs(), null, flags);
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MappedMultiFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MappedMultiFields.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MappedMultiFields.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MappedMultiFields.java Wed Apr 8 19:48:07 2015
@@ -59,8 +59,8 @@ public class MappedMultiFields extends F
}
@Override
- public TermsEnum iterator(TermsEnum reuse) throws IOException {
- return new MappedMultiTermsEnum(mergeState, (MultiTermsEnum) in.iterator(reuse));
+ public TermsEnum iterator() throws IOException {
+ return new MappedMultiTermsEnum(mergeState, (MultiTermsEnum) in.iterator());
}
@Override
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MultiFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MultiFields.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MultiFields.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MultiFields.java Wed Apr 8 19:48:07 2015
@@ -138,7 +138,7 @@ public final class MultiFields extends F
assert term != null;
final Terms terms = getTerms(r, field);
if (terms != null) {
- final TermsEnum termsEnum = terms.iterator(null);
+ final TermsEnum termsEnum = terms.iterator();
if (termsEnum.seekExact(term)) {
return termsEnum.postings(liveDocs, null, flags);
}
@@ -165,7 +165,7 @@ public final class MultiFields extends F
assert term != null;
final Terms terms = getTerms(r, field);
if (terms != null) {
- final TermsEnum termsEnum = terms.iterator(null);
+ final TermsEnum termsEnum = terms.iterator();
if (termsEnum.seekExact(term)) {
return termsEnum.postings(liveDocs, null, flags);
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MultiTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MultiTerms.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MultiTerms.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MultiTerms.java Wed Apr 8 19:48:07 2015
@@ -122,11 +122,11 @@ public final class MultiTerms extends Te
}
@Override
- public TermsEnum iterator(TermsEnum reuse) throws IOException {
+ public TermsEnum iterator() throws IOException {
final List<MultiTermsEnum.TermsEnumIndex> termsEnums = new ArrayList<>();
for(int i=0;i<subs.length;i++) {
- final TermsEnum termsEnum = subs[i].iterator(null);
+ final TermsEnum termsEnum = subs[i].iterator();
if (termsEnum != null) {
termsEnums.add(new MultiTermsEnum.TermsEnumIndex(termsEnum, i));
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/TermContext.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/TermContext.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/TermContext.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/TermContext.java Wed Apr 8 19:48:07 2015
@@ -90,7 +90,7 @@ public final class TermContext {
//if (DEBUG) System.out.println(" r=" + leaves[i].reader);
final Terms terms = ctx.reader().terms(field);
if (terms != null) {
- final TermsEnum termsEnum = terms.iterator(null);
+ final TermsEnum termsEnum = terms.iterator();
if (termsEnum.seekExact(bytes)) {
final TermState termState = termsEnum.termState();
//if (DEBUG) System.out.println(" found");
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/Terms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/Terms.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/Terms.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/Terms.java Wed Apr 8 19:48:07 2015
@@ -41,7 +41,7 @@ public abstract class Terms {
* a previous TermsEnum, for example from a different
* field, you can pass it for possible reuse if the
* implementation can do so. */
- public abstract TermsEnum iterator(TermsEnum reuse) throws IOException;
+ public abstract TermsEnum iterator() throws IOException;
/** Returns a TermsEnum that iterates over all terms and
* documents that are accepted by the provided {@link
@@ -72,7 +72,7 @@ public abstract class Terms {
// the returned enum, instead of only being able to seek
// at the start
- TermsEnum termsEnum = iterator(null);
+ TermsEnum termsEnum = iterator();
if (compiled.type != CompiledAutomaton.AUTOMATON_TYPE.NORMAL) {
throw new IllegalArgumentException("please use CompiledAutomaton.getTermsEnum instead");
@@ -142,7 +142,7 @@ public abstract class Terms {
* take deleted documents into account. This returns
* null when there are no terms. */
public BytesRef getMin() throws IOException {
- return iterator(null).next();
+ return iterator().next();
}
/** Returns the largest term (in lexicographic order) in the field.
@@ -159,7 +159,7 @@ public abstract class Terms {
} else if (size >= 0) {
// try to seek-by-ord
try {
- TermsEnum iterator = iterator(null);
+ TermsEnum iterator = iterator();
iterator.seekExact(size - 1);
return iterator.term();
} catch (UnsupportedOperationException e) {
@@ -168,7 +168,7 @@ public abstract class Terms {
}
// otherwise: binary search
- TermsEnum iterator = iterator(null);
+ TermsEnum iterator = iterator();
BytesRef v = iterator.next();
if (v == null) {
// empty: only possible from a FilteredTermsEnum...
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesRewriteMethod.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesRewriteMethod.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesRewriteMethod.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesRewriteMethod.java Wed Apr 8 19:48:07 2015
@@ -89,7 +89,7 @@ public final class DocValuesRewriteMetho
TermsEnum termsEnum = query.getTermsEnum(new Terms() {
@Override
- public TermsEnum iterator(TermsEnum reuse) {
+ public TermsEnum iterator() {
return fcsi.termsEnum();
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FuzzyQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FuzzyQuery.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FuzzyQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FuzzyQuery.java Wed Apr 8 19:48:07 2015
@@ -150,7 +150,7 @@ public class FuzzyQuery extends MultiTer
@Override
protected TermsEnum getTermsEnum(Terms terms, AttributeSource atts) throws IOException {
if (maxEdits == 0 || prefixLength >= term.text().length()) { // can only match if it's exact
- return new SingleTermsEnum(terms.iterator(null), term.bytes());
+ return new SingleTermsEnum(terms.iterator(), term.bytes());
}
return new FuzzyTermsEnum(terms, atts, getTerm(), maxEdits, prefixLength, transpositions);
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java Wed Apr 8 19:48:07 2015
@@ -196,7 +196,7 @@ public class MultiPhraseQuery extends Qu
}
// Reuse single TermsEnum below:
- final TermsEnum termsEnum = fieldTerms.iterator(null);
+ final TermsEnum termsEnum = fieldTerms.iterator();
for (int pos=0; pos<postingsFreqs.length; pos++) {
Term[] terms = termArrays.get(pos);
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java Wed Apr 8 19:48:07 2015
@@ -297,7 +297,7 @@ public final class NumericRangeQuery<T e
if (min != null && max != null && ((Comparable<T>) min).compareTo(max) > 0) {
return TermsEnum.EMPTY;
}
- return new NumericRangeTermsEnum(terms.iterator(null));
+ return new NumericRangeTermsEnum(terms.iterator());
}
/** Returns <code>true</code> if the lower endpoint is inclusive */
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java Wed Apr 8 19:48:07 2015
@@ -302,7 +302,7 @@ public class PhraseQuery extends Query {
}
// Reuse single TermsEnum below:
- final TermsEnum te = fieldTerms.iterator(null);
+ final TermsEnum te = fieldTerms.iterator();
for (int i = 0; i < terms.size(); i++) {
final Term t = terms.get(i);
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TermQuery.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TermQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TermQuery.java Wed Apr 8 19:48:07 2015
@@ -101,7 +101,7 @@ public class TermQuery extends Query {
// System.out.println("LD=" + reader.getLiveDocs() + " set?=" +
// (reader.getLiveDocs() != null ? reader.getLiveDocs().get(0) : "null"));
final TermsEnum termsEnum = context.reader().terms(term.field())
- .iterator(null);
+ .iterator();
termsEnum.seekExact(term.bytes(), state);
return termsEnum;
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java Wed Apr 8 19:48:07 2015
@@ -98,7 +98,7 @@ public class SpanTermQuery extends SpanQ
throw new IllegalStateException("field \"" + term.field() + "\" was indexed without position data; cannot run SpanTermQuery (term=" + term.text() + ")");
}
- final TermsEnum termsEnum = terms.iterator(null);
+ final TermsEnum termsEnum = terms.iterator();
if (termsEnum.seekExact(term.bytes())) {
state = termsEnum.termState();
} else {
@@ -115,7 +115,7 @@ public class SpanTermQuery extends SpanQ
return null;
}
- final TermsEnum termsEnum = context.reader().terms(term.field()).iterator(null);
+ final TermsEnum termsEnum = context.reader().terms(term.field()).iterator();
termsEnum.seekExact(term.bytes(), state);
final PostingsEnum postings = termsEnum.postings(acceptDocs, null, PostingsEnum.PAYLOADS);
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/NumericUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/NumericUtils.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/NumericUtils.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/NumericUtils.java Wed Apr 8 19:48:07 2015
@@ -537,8 +537,8 @@ public final class NumericUtils {
private static Terms intTerms(Terms terms) {
return new FilterLeafReader.FilterTerms(terms) {
@Override
- public TermsEnum iterator(TermsEnum reuse) throws IOException {
- return filterPrefixCodedInts(in.iterator(reuse));
+ public TermsEnum iterator() throws IOException {
+ return filterPrefixCodedInts(in.iterator());
}
};
}
@@ -546,8 +546,8 @@ public final class NumericUtils {
private static Terms longTerms(Terms terms) {
return new FilterLeafReader.FilterTerms(terms) {
@Override
- public TermsEnum iterator(TermsEnum reuse) throws IOException {
- return filterPrefixCodedLongs(in.iterator(reuse));
+ public TermsEnum iterator() throws IOException {
+ return filterPrefixCodedLongs(in.iterator());
}
};
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/automaton/CompiledAutomaton.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/automaton/CompiledAutomaton.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/automaton/CompiledAutomaton.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/automaton/CompiledAutomaton.java Wed Apr 8 19:48:07 2015
@@ -329,9 +329,9 @@ public class CompiledAutomaton {
case NONE:
return TermsEnum.EMPTY;
case ALL:
- return terms.iterator(null);
+ return terms.iterator();
case SINGLE:
- return new SingleTermsEnum(terms.iterator(null), term);
+ return new SingleTermsEnum(terms.iterator(), term);
case NORMAL:
return terms.intersect(this, null);
default:
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java Wed Apr 8 19:48:07 2015
@@ -319,7 +319,7 @@ public class TestMockAnalyzer extends Ba
final LeafReader reader = getOnlySegmentReader(writer.getReader());
final Fields fields = reader.getTermVectors(0);
final Terms terms = fields.terms("f");
- final TermsEnum te = terms.iterator(null);
+ final TermsEnum te = terms.iterator();
assertEquals(new BytesRef("a"), te.next());
final PostingsEnum dpe = te.postings(null, null, PostingsEnum.ALL);
assertEquals(0, dpe.nextDoc());
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingTermVectorsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingTermVectorsFormat.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingTermVectorsFormat.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingTermVectorsFormat.java Wed Apr 8 19:48:07 2015
@@ -60,7 +60,7 @@ public class TestCompressingTermVectorsF
LeafReader ir = getOnlySegmentReader(iw.getReader());
Terms terms = ir.getTermVector(0, "foo");
assertNotNull(terms);
- TermsEnum termsEnum = terms.iterator(null);
+ TermsEnum termsEnum = terms.iterator();
assertEquals(SeekStatus.FOUND, termsEnum.seekCeil(new BytesRef("this")));
try {
termsEnum.ord();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat3.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat3.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat3.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat3.java Wed Apr 8 19:48:07 2015
@@ -173,8 +173,8 @@ public class TestBlockPostingsFormat3 ex
// NOTE: we don't assert hasOffsets/hasPositions/hasPayloads because they are allowed to be different
boolean bothHavePositions = leftTerms.hasPositions() && rightTerms.hasPositions();
- TermsEnum leftTermsEnum = leftTerms.iterator(null);
- TermsEnum rightTermsEnum = rightTerms.iterator(null);
+ TermsEnum leftTermsEnum = leftTerms.iterator();
+ TermsEnum rightTermsEnum = rightTerms.iterator();
assertTermsEnum(leftTermsEnum, rightTermsEnum, true, bothHavePositions);
assertTermsSeeking(leftTerms, rightTerms);
@@ -206,7 +206,7 @@ public class TestBlockPostingsFormat3 ex
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);
@@ -234,8 +234,8 @@ public class TestBlockPostingsFormat3 ex
Collections.shuffle(shuffledTests, random);
for (BytesRef b : shuffledTests) {
- leftEnum = leftTerms.iterator(leftEnum);
- rightEnum = rightTerms.iterator(rightEnum);
+ leftEnum = leftTerms.iterator();
+ rightEnum = rightTerms.iterator();
assertEquals(leftEnum.seekExact(b), rightEnum.seekExact(b));
assertEquals(leftEnum.seekExact(b), rightEnum.seekExact(b));
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50DocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50DocValuesFormat.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50DocValuesFormat.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50DocValuesFormat.java Wed Apr 8 19:48:07 2015
@@ -187,7 +187,7 @@ public class TestLucene50DocValuesFormat
if (terms != null) {
SortedSetDocValues ssdv = r.getSortedSetDocValues("dv");
assertEquals(terms.size(), ssdv.getValueCount());
- TermsEnum expected = terms.iterator(null);
+ TermsEnum expected = terms.iterator();
TermsEnum actual = r.getSortedSetDocValues("dv").termsEnum();
assertEquals(terms.size(), expected, actual);
@@ -204,7 +204,7 @@ public class TestLucene50DocValuesFormat
Terms terms = ar.terms("indexed");
if (terms != null) {
assertEquals(terms.size(), ar.getSortedSetDocValues("dv").getValueCount());
- TermsEnum expected = terms.iterator(null);
+ TermsEnum expected = terms.iterator();
TermsEnum actual = ar.getSortedSetDocValues("dv").termsEnum();
assertEquals(terms.size(), expected, actual);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java?rev=1672155&r1=1672154&r2=1672155&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java Wed Apr 8 19:48:07 2015
@@ -244,7 +244,7 @@ public class Test2BTerms extends LuceneT
private List<BytesRef> findTerms(IndexReader r) throws IOException {
System.out.println("TEST: findTerms");
- final TermsEnum termsEnum = MultiFields.getTerms(r, "field").iterator(null);
+ final TermsEnum termsEnum = MultiFields.getTerms(r, "field").iterator();
final List<BytesRef> savedTerms = new ArrayList<>();
int nextSave = TestUtil.nextInt(random(), 500000, 1000000);
BytesRef term;
@@ -262,7 +262,7 @@ public class Test2BTerms extends LuceneT
System.out.println("TEST: run " + terms.size() + " terms on reader=" + r);
IndexSearcher s = newSearcher(r);
Collections.shuffle(terms, random());
- TermsEnum termsEnum = MultiFields.getTerms(r, "field").iterator(null);
+ TermsEnum termsEnum = MultiFields.getTerms(r, "field").iterator();
boolean failed = false;
for(int iter=0;iter<10*terms.size();iter++) {
final BytesRef term = terms.get(random().nextInt(terms.size()));