You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2017/01/26 05:28:10 UTC
[4/5] lucenenet git commit: Lucene.Net.Core.Index.Terms refactor:
Renamed Iterator() > GetIterator()
Lucene.Net.Core.Index.Terms refactor: Renamed Iterator() > GetIterator()
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/715372a1
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/715372a1
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/715372a1
Branch: refs/heads/api-work
Commit: 715372a1451af8a20090d3bc752dab582a252811
Parents: 3649847
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Thu Jan 26 12:04:11 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Thu Jan 26 12:04:11 2017 +0700
----------------------------------------------------------------------
.../Analysis/Query/QueryAutoStopWordAnalyzer.cs | 2 +-
.../SimpleNaiveBayesClassifier.cs | 2 +-
.../BlockTerms/BlockTermsReader.cs | 2 +-
.../Bloom/BloomFilteringPostingsFormat.cs | 4 ++--
.../Memory/DirectPostingsFormat.cs | 4 ++--
.../Memory/FSTOrdTermsReader.cs | 2 +-
src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs | 2 +-
.../Memory/MemoryPostingsFormat.cs | 2 +-
.../SimpleText/SimpleTextFieldsReader.cs | 2 +-
.../SimpleText/SimpleTextTermVectorsReader.cs | 2 +-
.../Codecs/BlockTreeTermsReader.cs | 2 +-
.../Compressing/CompressingTermVectorsReader.cs | 2 +-
src/Lucene.Net.Core/Codecs/FieldsConsumer.cs | 2 +-
.../Codecs/Lucene3x/Lucene3xFields.cs | 2 +-
.../Lucene3x/Lucene3xTermVectorsReader.cs | 2 +-
.../Lucene40/Lucene40TermVectorsReader.cs | 2 +-
src/Lucene.Net.Core/Codecs/TermVectorsWriter.cs | 4 ++--
src/Lucene.Net.Core/Index/AtomicReader.cs | 8 ++++----
.../Index/BufferedUpdatesStream.cs | 4 ++--
src/Lucene.Net.Core/Index/CheckIndex.cs | 6 +++---
src/Lucene.Net.Core/Index/DocTermOrds.cs | 6 +++---
src/Lucene.Net.Core/Index/FilterAtomicReader.cs | 4 ++--
src/Lucene.Net.Core/Index/MultiFields.cs | 4 ++--
src/Lucene.Net.Core/Index/MultiTerms.cs | 4 ++--
src/Lucene.Net.Core/Index/TermContext.cs | 2 +-
src/Lucene.Net.Core/Index/Terms.cs | 6 +++---
.../Search/DocTermOrdsRewriteMethod.cs | 2 +-
src/Lucene.Net.Core/Search/FieldCache.cs | 20 ++++++++++----------
src/Lucene.Net.Core/Search/FieldCacheImpl.cs | 6 +++---
.../Search/FieldCacheRewriteMethod.cs | 2 +-
src/Lucene.Net.Core/Search/FuzzyQuery.cs | 2 +-
src/Lucene.Net.Core/Search/MultiPhraseQuery.cs | 2 +-
src/Lucene.Net.Core/Search/NumericRangeQuery.cs | 2 +-
src/Lucene.Net.Core/Search/PhraseQuery.cs | 2 +-
src/Lucene.Net.Core/Search/PrefixQuery.cs | 2 +-
.../Search/Spans/SpanTermQuery.cs | 4 ++--
src/Lucene.Net.Core/Search/TermQuery.cs | 2 +-
src/Lucene.Net.Core/Search/TermRangeQuery.cs | 2 +-
.../Util/Automaton/CompiledAutomaton.cs | 6 +++---
.../Directory/DirectoryTaxonomyWriter.cs | 6 +++---
.../Highlight/TokenSources.cs | 4 ++--
.../TokenStreamFromTermPositionVector.cs | 2 +-
.../PostingsHighlight/PostingsHighlighter.cs | 2 +-
.../VectorHighlight/FieldTermStack.cs | 2 +-
src/Lucene.Net.Join/TermsIncludingScoreQuery.cs | 4 ++--
src/Lucene.Net.Join/TermsQuery.cs | 2 +-
.../MemoryIndex.MemoryIndexReader.cs | 2 +-
.../Index/Sorter/SortingAtomicReader.cs | 4 ++--
src/Lucene.Net.Misc/Misc/HighFreqTerms.cs | 4 ++--
src/Lucene.Net.Queries/CommonTermsQuery.cs | 2 +-
.../ValueSources/JoinDocFreqValueSource.cs | 2 +-
.../Function/ValueSources/TFValueSource.cs | 2 +-
.../ValueSources/TermFreqValueSource.cs | 2 +-
src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs | 2 +-
src/Lucene.Net.Queries/TermFilter.cs | 2 +-
src/Lucene.Net.Queries/TermsFilter.cs | 2 +-
.../Surround/Query/SrndPrefixQuery.cs | 2 +-
.../Surround/Query/SrndTermQuery.cs | 2 +-
.../Surround/Query/SrndTruncQuery.cs | 2 +-
.../Queries/DuplicateFilter.cs | 4 ++--
.../Queries/SlowFuzzyQuery.cs | 2 +-
.../Queries/SlowFuzzyTermsEnum.cs | 2 +-
.../Prefix/AbstractPrefixTreeFilter.cs | 2 +-
.../Prefix/AbstractVisitingPrefixTreeFilter.cs | 2 +-
.../Util/ShapeFieldCacheProvider.cs | 2 +-
.../Spell/HighFrequencyDictionary.cs | 2 +-
.../Spell/LuceneDictionary.cs | 2 +-
src/Lucene.Net.Suggest/Spell/SpellChecker.cs | 2 +-
.../Suggest/Analyzing/BlendedInfixSuggester.cs | 2 +-
.../Suggest/Analyzing/FreeTextSuggester.cs | 2 +-
.../Codecs/ramonly/RAMOnlyPostingsFormat.cs | 2 +-
.../Index/AssertingAtomicReader.cs | 4 ++--
.../Index/BasePostingsFormatTestCase.cs | 2 +-
.../Index/BaseTermVectorsFormatTestCase.cs | 2 +-
.../ThreadedIndexingAndSearchingTestCase.cs | 2 +-
.../Util/LuceneTestCase.cs | 12 ++++++------
src/Lucene.Net.TestFramework/Util/TestUtil.cs | 2 +-
.../Analysis/Sinks/TestTeeSinkTokenFilter.cs | 2 +-
.../Pulsing/Test10KPulsings.cs | 4 ++--
.../Pulsing/TestPulsingReuse.cs | 8 ++++----
src/Lucene.Net.Tests.Join/TestJoinUtil.cs | 2 +-
.../Index/Memory/MemoryIndexTest.cs | 12 ++++++------
.../Index/Sorter/SorterTestBase.cs | 6 +++---
.../Index/TestMultiPassIndexSplitter.cs | 8 ++++----
.../core/Analysis/TestMockAnalyzer.cs | 2 +-
.../TestCompressingTermVectorsFormat.cs | 2 +-
.../core/Codecs/Lucene3x/TestSurrogates.cs | 6 +++---
.../Codecs/Lucene3x/TestTermInfosReaderIndex.cs | 2 +-
.../core/Codecs/Lucene40/TestReuseDocsEnum.cs | 16 ++++++++--------
.../Codecs/Lucene41/TestBlockPostingsFormat3.cs | 10 +++++-----
.../core/Document/TestDocument.cs | 2 +-
src/Lucene.Net.Tests/core/Index/Test2BTerms.cs | 4 ++--
.../core/Index/TestBackwardsCompatibility.cs | 2 +-
.../core/Index/TestBackwardsCompatibility3x.cs | 2 +-
.../core/Index/TestBagOfPositions.cs | 2 +-
.../core/Index/TestBagOfPostings.cs | 2 +-
src/Lucene.Net.Tests/core/Index/TestCodecs.cs | 4 ++--
.../core/Index/TestDirectoryReader.cs | 8 ++++----
src/Lucene.Net.Tests/core/Index/TestDoc.cs | 2 +-
src/Lucene.Net.Tests/core/Index/TestDocCount.cs | 2 +-
.../core/Index/TestDocTermOrds.cs | 4 ++--
.../core/Index/TestDocsAndPositions.cs | 6 +++---
.../core/Index/TestFilterAtomicReader.cs | 6 +++---
src/Lucene.Net.Tests/core/Index/TestFlex.cs | 4 ++--
.../core/Index/TestIndexWriter.cs | 8 ++++----
.../core/Index/TestIndexWriterUnicode.cs | 2 +-
.../core/Index/TestIndexableField.cs | 2 +-
.../core/Index/TestParallelTermEnum.cs | 2 +-
src/Lucene.Net.Tests/core/Index/TestPayloads.cs | 2 +-
.../core/Index/TestPayloadsOnVectors.cs | 4 ++--
.../core/Index/TestPerSegmentDeletes.cs | 2 +-
.../core/Index/TestPostingsOffsets.cs | 2 +-
.../core/Index/TestSegmentMerger.cs | 2 +-
.../core/Index/TestSegmentReader.cs | 4 ++--
.../core/Index/TestSegmentTermDocs.cs | 2 +-
.../core/Index/TestSegmentTermEnum.cs | 4 ++--
.../core/Index/TestStressAdvance.cs | 2 +-
.../core/Index/TestStressIndexing2.cs | 16 ++++++++--------
.../core/Index/TestSumDocFreq.cs | 2 +-
.../core/Index/TestTermVectorsReader.cs | 10 +++++-----
.../core/Index/TestTermVectorsWriter.cs | 16 ++++++++--------
.../core/Index/TestTermdocPerf.cs | 2 +-
.../core/Index/TestTermsEnum.cs | 8 ++++----
.../core/Index/TestTermsEnum2.cs | 4 ++--
.../core/Search/TestMultiPhraseQuery.cs | 2 +-
.../core/Search/TestMultiTermQueryRewrites.cs | 2 +-
.../core/Search/TestMultiThreadTermVectors.cs | 4 ++--
.../core/Search/TestPhrasePrefixQuery.cs | 2 +-
.../core/Search/TestPrefixRandom.cs | 2 +-
.../core/Search/TestRegexpRandom2.cs | 2 +-
.../core/Search/TestSameScoresWithThreads.cs | 4 ++--
.../core/Search/TestShardSearching.cs | 2 +-
src/Lucene.Net.Tests/core/Search/TestSort.cs | 12 ++++++------
.../core/Search/TestTermVectors.cs | 2 +-
src/Lucene.Net.Tests/core/Util/Fst/TestFSTs.cs | 4 ++--
135 files changed, 252 insertions(+), 252 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Analysis.Common/Analysis/Query/QueryAutoStopWordAnalyzer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Query/QueryAutoStopWordAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Query/QueryAutoStopWordAnalyzer.cs
index 574d303..372d41e 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Query/QueryAutoStopWordAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Query/QueryAutoStopWordAnalyzer.cs
@@ -130,7 +130,7 @@ namespace Lucene.Net.Analysis.Query
CharsRef spare = new CharsRef();
if (terms != null)
{
- TermsEnum te = terms.Iterator(null);
+ TermsEnum te = terms.GetIterator(null);
BytesRef text;
while ((text = te.Next()) != null)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Classification/SimpleNaiveBayesClassifier.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Classification/SimpleNaiveBayesClassifier.cs b/src/Lucene.Net.Classification/SimpleNaiveBayesClassifier.cs
index 609d7ef..da03626 100644
--- a/src/Lucene.Net.Classification/SimpleNaiveBayesClassifier.cs
+++ b/src/Lucene.Net.Classification/SimpleNaiveBayesClassifier.cs
@@ -119,7 +119,7 @@ namespace Lucene.Net.Classification
BytesRef foundClass = new BytesRef();
Terms terms = MultiFields.GetTerms(_atomicReader, _classFieldName);
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
BytesRef next;
String[] tokenizedDoc = TokenizeDoc(inputDocument);
while ((next = termsEnum.Next()) != null)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs b/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs
index 318aa48..8ab0ef6 100644
--- a/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs
+++ b/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs
@@ -316,7 +316,7 @@ namespace Lucene.Net.Codecs.BlockTerms
get { return BytesRef.UTF8SortedAsUnicodeComparer; }
}
- public override TermsEnum Iterator(TermsEnum reuse)
+ public override TermsEnum GetIterator(TermsEnum reuse)
{
return new SegmentTermsEnum(this, _blockTermsReader);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs b/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs
index 94e3f0e..0e717c6 100644
--- a/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs
@@ -248,7 +248,7 @@ namespace Lucene.Net.Codecs.Bloom
return _delegateTerms.Intersect(compiled, startTerm);
}
- public override TermsEnum Iterator(TermsEnum reuse)
+ public override TermsEnum GetIterator(TermsEnum reuse)
{
if (!(reuse is BloomFilteredTermsEnum))
return new BloomFilteredTermsEnum(_delegateTerms, reuse, _filter);
@@ -338,7 +338,7 @@ namespace Lucene.Net.Codecs.Bloom
// this can be a relativly heavy operation depending on the
// delegate postings format and they underlying directory
// (clone IndexInput)
- return DELEGATE_TERMS_ENUM ?? (DELEGATE_TERMS_ENUM = _delegateTerms.Iterator(_reuseDelegate));
+ return DELEGATE_TERMS_ENUM ?? (DELEGATE_TERMS_ENUM = _delegateTerms.GetIterator(_reuseDelegate));
}
public override BytesRef Next()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs
index 343e623..5bc3aa4 100644
--- a/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs
@@ -346,7 +346,7 @@ namespace Lucene.Net.Codecs.Memory
BytesRef term;
DocsEnum docsEnum = null;
DocsAndPositionsEnum docsAndPositionsEnum = null;
- TermsEnum termsEnum = termsIn.Iterator(null);
+ TermsEnum termsEnum = termsIn.GetIterator(null);
int termOffset = 0;
IntArrayWriter scratch = new IntArrayWriter();
@@ -740,7 +740,7 @@ namespace Lucene.Net.Codecs.Memory
}
}
- public override TermsEnum Iterator(TermsEnum reuse)
+ public override TermsEnum GetIterator(TermsEnum reuse)
{
DirectTermsEnum termsEnum;
if (reuse != null && reuse is DirectTermsEnum)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs
index 9e60be7..0f6e739 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs
@@ -299,7 +299,7 @@ namespace Lucene.Net.Codecs.Memory
}
}
- public override TermsEnum Iterator(TermsEnum reuse)
+ public override TermsEnum GetIterator(TermsEnum reuse)
{
return new SegmentTermsEnum(this);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs b/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs
index dedb55d..691b654 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs
@@ -266,7 +266,7 @@ namespace Lucene.Net.Codecs.Memory
}
}
- public override TermsEnum Iterator(TermsEnum reuse)
+ public override TermsEnum GetIterator(TermsEnum reuse)
{
return new SegmentTermsEnum(this);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs
index 57edda6..5967d65 100644
--- a/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs
@@ -1006,7 +1006,7 @@ namespace Lucene.Net.Codecs.Memory
get { return termCount; }
}
- public override TermsEnum Iterator(TermsEnum reuse)
+ public override TermsEnum GetIterator(TermsEnum reuse)
{
return new FSTTermsEnum(field, fst);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs
index 86015e9..1df924f 100644
--- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs
+++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs
@@ -677,7 +677,7 @@ namespace Lucene.Net.Codecs.SimpleText
return (_fst != null) ? _fst.SizeInBytes() : 0;
}
- public override TermsEnum Iterator(TermsEnum reuse)
+ public override TermsEnum GetIterator(TermsEnum reuse)
{
return (_fst != null && _fieldInfo.IndexOptions.HasValue) ? new SimpleTextTermsEnum(_outerInstance, _fst, _fieldInfo.IndexOptions.Value) : TermsEnum.EMPTY;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs
index 868c9cb..e65d971 100644
--- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs
+++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs
@@ -323,7 +323,7 @@ namespace Lucene.Net.Codecs.SimpleText
TERMS = new SortedDictionary<BytesRef, SimpleTVPostings>();
}
- public override TermsEnum Iterator(TermsEnum reuse)
+ public override TermsEnum GetIterator(TermsEnum reuse)
{
// TODO: reuse
return new SimpleTVTermsEnum(TERMS);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Codecs/BlockTreeTermsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/BlockTreeTermsReader.cs b/src/Lucene.Net.Core/Codecs/BlockTreeTermsReader.cs
index 41194bf..9955458 100644
--- a/src/Lucene.Net.Core/Codecs/BlockTreeTermsReader.cs
+++ b/src/Lucene.Net.Core/Codecs/BlockTreeTermsReader.cs
@@ -646,7 +646,7 @@ namespace Lucene.Net.Codecs
get { return fieldInfo.HasPayloads; }
}
- public override TermsEnum Iterator(TermsEnum reuse)
+ public override TermsEnum GetIterator(TermsEnum reuse)
{
return new SegmentTermsEnum(this);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsReader.cs b/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsReader.cs
index 3383115..2257ecb 100644
--- a/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsReader.cs
+++ b/src/Lucene.Net.Core/Codecs/Compressing/CompressingTermVectorsReader.cs
@@ -800,7 +800,7 @@ namespace Lucene.Net.Codecs.Compressing
this.termBytes = termBytes;
}
- public override TermsEnum Iterator(TermsEnum reuse)
+ public override TermsEnum GetIterator(TermsEnum reuse)
{
TVTermsEnum termsEnum;
if (reuse != null && reuse is TVTermsEnum)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Codecs/FieldsConsumer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/FieldsConsumer.cs b/src/Lucene.Net.Core/Codecs/FieldsConsumer.cs
index 2093591..948e121 100644
--- a/src/Lucene.Net.Core/Codecs/FieldsConsumer.cs
+++ b/src/Lucene.Net.Core/Codecs/FieldsConsumer.cs
@@ -79,7 +79,7 @@ namespace Lucene.Net.Codecs
if (terms != null)
{
TermsConsumer termsConsumer = AddField(info);
- termsConsumer.Merge(mergeState, info.IndexOptions, terms.Iterator(null));
+ termsConsumer.Merge(mergeState, info.IndexOptions, terms.GetIterator(null));
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFields.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFields.cs b/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFields.cs
index a1b84ff..520d2cf 100644
--- a/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFields.cs
+++ b/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xFields.cs
@@ -208,7 +208,7 @@ namespace Lucene.Net.Codecs.Lucene3x
this.fieldInfo = fieldInfo;
}
- public override TermsEnum Iterator(TermsEnum reuse)
+ public override TermsEnum GetIterator(TermsEnum reuse)
{
var termsEnum = new PreTermsEnum(outerInstance);
termsEnum.Reset(fieldInfo);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs b/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs
index 311ea75..5161e5e 100644
--- a/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs
+++ b/src/Lucene.Net.Core/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs
@@ -372,7 +372,7 @@ namespace Lucene.Net.Codecs.Lucene3x
unicodeSortOrder = outerInstance.SortTermsByUnicode();
}
- public override TermsEnum Iterator(TermsEnum reuse)
+ public override TermsEnum GetIterator(TermsEnum reuse)
{
TVTermsEnum termsEnum;
if (reuse is TVTermsEnum)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40TermVectorsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40TermVectorsReader.cs b/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40TermVectorsReader.cs
index 9d096e4..8463507 100644
--- a/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40TermVectorsReader.cs
+++ b/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40TermVectorsReader.cs
@@ -361,7 +361,7 @@ namespace Lucene.Net.Codecs.Lucene40
tvfFPStart = outerInstance.tvf.FilePointer;
}
- public override TermsEnum Iterator(TermsEnum reuse)
+ public override TermsEnum GetIterator(TermsEnum reuse)
{
TVTermsEnum termsEnum;
if (reuse is TVTermsEnum)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Codecs/TermVectorsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/TermVectorsWriter.cs b/src/Lucene.Net.Core/Codecs/TermVectorsWriter.cs
index b3cb12d..ea1c1df 100644
--- a/src/Lucene.Net.Core/Codecs/TermVectorsWriter.cs
+++ b/src/Lucene.Net.Core/Codecs/TermVectorsWriter.cs
@@ -299,7 +299,7 @@ namespace Lucene.Net.Codecs
{
// count manually. It is stupid, but needed, as Terms.size() is not a mandatory statistics function
numTerms = 0;
- termsEnum = terms.Iterator(termsEnum);
+ termsEnum = terms.GetIterator(termsEnum);
while (termsEnum.Next() != null)
{
numTerms++;
@@ -307,7 +307,7 @@ namespace Lucene.Net.Codecs
}
StartField(fieldInfo, numTerms, hasPositions, hasOffsets, hasPayloads);
- termsEnum = terms.Iterator(termsEnum);
+ termsEnum = terms.GetIterator(termsEnum);
int termCount = 0;
while (termsEnum.Next() != null)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Index/AtomicReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/AtomicReader.cs b/src/Lucene.Net.Core/Index/AtomicReader.cs
index 4a1b2c2..601fc41 100644
--- a/src/Lucene.Net.Core/Index/AtomicReader.cs
+++ b/src/Lucene.Net.Core/Index/AtomicReader.cs
@@ -115,7 +115,7 @@ namespace Lucene.Net.Index
{
return 0;
}
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
if (termsEnum.SeekExact(term.Bytes))
{
return termsEnum.DocFreq;
@@ -145,7 +145,7 @@ namespace Lucene.Net.Index
{
return 0;
}
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
if (termsEnum.SeekExact(term.Bytes))
{
return termsEnum.TotalTermFreq;
@@ -213,7 +213,7 @@ namespace Lucene.Net.Index
Terms terms = fields.Terms(term.Field);
if (terms != null)
{
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
if (termsEnum.SeekExact(term.Bytes))
{
return termsEnum.Docs(LiveDocs, null);
@@ -238,7 +238,7 @@ namespace Lucene.Net.Index
Terms terms = fields.Terms(term.Field);
if (terms != null)
{
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
if (termsEnum.SeekExact(term.Bytes))
{
return termsEnum.DocsAndPositions(LiveDocs, null);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Index/BufferedUpdatesStream.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/BufferedUpdatesStream.cs b/src/Lucene.Net.Core/Index/BufferedUpdatesStream.cs
index 41bc2f7..5db21ca 100644
--- a/src/Lucene.Net.Core/Index/BufferedUpdatesStream.cs
+++ b/src/Lucene.Net.Core/Index/BufferedUpdatesStream.cs
@@ -484,7 +484,7 @@ namespace Lucene.Net.Index
Terms terms = fields.Terms(currentField);
if (terms != null)
{
- termsEnum = terms.Iterator(termsEnum);
+ termsEnum = terms.GetIterator(termsEnum);
}
else
{
@@ -589,7 +589,7 @@ namespace Lucene.Net.Index
Terms terms = fields.Terms(currentField);
if (terms != null)
{
- termsEnum = terms.Iterator(termsEnum);
+ termsEnum = terms.GetIterator(termsEnum);
}
else
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Index/CheckIndex.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/CheckIndex.cs b/src/Lucene.Net.Core/Index/CheckIndex.cs
index 87ac70b..2f3cd0c 100644
--- a/src/Lucene.Net.Core/Index/CheckIndex.cs
+++ b/src/Lucene.Net.Core/Index/CheckIndex.cs
@@ -1084,7 +1084,7 @@ namespace Lucene.Net.Index
}
}
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
bool hasOrd = true;
long termCountStart = status.DelTermCount + status.TermCount;
@@ -2133,7 +2133,7 @@ namespace Lucene.Net.Index
if (crossCheckTermVectors)
{
Terms terms = tfv.Terms(field);
- termsEnum = terms.Iterator(termsEnum);
+ termsEnum = terms.GetIterator(termsEnum);
bool postingsHasFreq = fieldInfo.IndexOptions >= IndexOptions.DOCS_AND_FREQS;
bool postingsHasPayload = fieldInfo.HasPayloads;
bool vectorsHasPayload = terms.HasPayloads;
@@ -2143,7 +2143,7 @@ namespace Lucene.Net.Index
{
throw new Exception("vector field=" + field + " does not exist in postings; doc=" + j);
}
- postingsTermsEnum = postingsTerms.Iterator(postingsTermsEnum);
+ postingsTermsEnum = postingsTerms.GetIterator(postingsTermsEnum);
bool hasProx = terms.HasOffsets || terms.HasPositions;
BytesRef term = null;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Index/DocTermOrds.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/DocTermOrds.cs b/src/Lucene.Net.Core/Index/DocTermOrds.cs
index 2da4a30..ecea4bf 100644
--- a/src/Lucene.Net.Core/Index/DocTermOrds.cs
+++ b/src/Lucene.Net.Core/Index/DocTermOrds.cs
@@ -277,7 +277,7 @@ namespace Lucene.Net.Index
}
else
{
- return terms.Iterator(null);
+ return terms.GetIterator(null);
}
}
else
@@ -352,7 +352,7 @@ namespace Lucene.Net.Index
return;
}
- TermsEnum te = terms.Iterator(null);
+ TermsEnum te = terms.GetIterator(null);
BytesRef seekStart = termPrefix != null ? termPrefix : new BytesRef();
//System.out.println("seekStart=" + seekStart.utf8ToString());
if (te.SeekCeil(seekStart) == TermsEnum.SeekStatus.END)
@@ -744,7 +744,7 @@ namespace Lucene.Net.Index
InitializeInstanceFields();
Debug.Assert(outerInstance.m_indexedTermsArray != null);
- termsEnum = reader.Fields.Terms(outerInstance.m_field).Iterator(null);
+ termsEnum = reader.Fields.Terms(outerInstance.m_field).GetIterator(null);
}
public override IComparer<BytesRef> Comparer
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Index/FilterAtomicReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/FilterAtomicReader.cs b/src/Lucene.Net.Core/Index/FilterAtomicReader.cs
index 6c4f085..1fdef36 100644
--- a/src/Lucene.Net.Core/Index/FilterAtomicReader.cs
+++ b/src/Lucene.Net.Core/Index/FilterAtomicReader.cs
@@ -112,9 +112,9 @@ namespace Lucene.Net.Index
this.m_input = input;
}
- public override TermsEnum Iterator(TermsEnum reuse)
+ public override TermsEnum GetIterator(TermsEnum reuse)
{
- return m_input.Iterator(reuse);
+ return m_input.GetIterator(reuse);
}
public override IComparer<BytesRef> Comparer
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Index/MultiFields.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/MultiFields.cs b/src/Lucene.Net.Core/Index/MultiFields.cs
index 1045dfe..b4f0081 100644
--- a/src/Lucene.Net.Core/Index/MultiFields.cs
+++ b/src/Lucene.Net.Core/Index/MultiFields.cs
@@ -179,7 +179,7 @@ namespace Lucene.Net.Index
Terms terms = GetTerms(r, field);
if (terms != null)
{
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
if (termsEnum.SeekExact(term))
{
return termsEnum.Docs(liveDocs, null, flags);
@@ -214,7 +214,7 @@ namespace Lucene.Net.Index
Terms terms = GetTerms(r, field);
if (terms != null)
{
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
if (termsEnum.SeekExact(term))
{
return termsEnum.DocsAndPositions(liveDocs, null, flags);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Index/MultiTerms.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/MultiTerms.cs b/src/Lucene.Net.Core/Index/MultiTerms.cs
index 803a72c..a807cb5 100644
--- a/src/Lucene.Net.Core/Index/MultiTerms.cs
+++ b/src/Lucene.Net.Core/Index/MultiTerms.cs
@@ -110,12 +110,12 @@ namespace Lucene.Net.Index
}
}
- public override TermsEnum Iterator(TermsEnum reuse)
+ public override TermsEnum GetIterator(TermsEnum reuse)
{
IList<MultiTermsEnum.TermsEnumIndex> termsEnums = new List<MultiTermsEnum.TermsEnumIndex>();
for (int i = 0; i < subs.Length; i++)
{
- TermsEnum termsEnum = subs[i].Iterator(null);
+ TermsEnum termsEnum = subs[i].GetIterator(null);
if (termsEnum != null)
{
termsEnums.Add(new MultiTermsEnum.TermsEnumIndex(termsEnum, i));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Index/TermContext.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/TermContext.cs b/src/Lucene.Net.Core/Index/TermContext.cs
index d28aa23..42a6afd 100644
--- a/src/Lucene.Net.Core/Index/TermContext.cs
+++ b/src/Lucene.Net.Core/Index/TermContext.cs
@@ -102,7 +102,7 @@ namespace Lucene.Net.Index
Terms terms = fields.Terms(field);
if (terms != null)
{
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
if (termsEnum.SeekExact(bytes))
{
TermState termState = termsEnum.GetTermState();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Index/Terms.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/Terms.cs b/src/Lucene.Net.Core/Index/Terms.cs
index 2fdbf1e..d75eda1 100644
--- a/src/Lucene.Net.Core/Index/Terms.cs
+++ b/src/Lucene.Net.Core/Index/Terms.cs
@@ -44,7 +44,7 @@ namespace Lucene.Net.Index
/// field, you can pass it for possible reuse if the
/// implementation can do so.
/// </summary>
- public abstract TermsEnum Iterator(TermsEnum reuse); // TODO: Rename GetIterator for consistency? Or possibly GetEnumerator(TermsEnum) ?
+ public abstract TermsEnum GetIterator(TermsEnum reuse);
/// <summary>
/// Returns a TermsEnum that iterates over all terms that
@@ -70,11 +70,11 @@ namespace Lucene.Net.Index
}
if (startTerm == null)
{
- return new AutomatonTermsEnum(Iterator(null), compiled);
+ return new AutomatonTermsEnum(GetIterator(null), compiled);
}
else
{
- return new AutomatonTermsEnumAnonymousInnerClassHelper(this, Iterator(null), compiled, startTerm);
+ return new AutomatonTermsEnumAnonymousInnerClassHelper(this, GetIterator(null), compiled, startTerm);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Search/DocTermOrdsRewriteMethod.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Search/DocTermOrdsRewriteMethod.cs b/src/Lucene.Net.Core/Search/DocTermOrdsRewriteMethod.cs
index 7b97d7e..5392ea2 100644
--- a/src/Lucene.Net.Core/Search/DocTermOrdsRewriteMethod.cs
+++ b/src/Lucene.Net.Core/Search/DocTermOrdsRewriteMethod.cs
@@ -142,7 +142,7 @@ namespace Lucene.Net.Search
}
}
- public override TermsEnum Iterator(TermsEnum reuse)
+ public override TermsEnum GetIterator(TermsEnum reuse)
{
return docTermOrds.GetTermsEnum();
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Search/FieldCache.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Search/FieldCache.cs b/src/Lucene.Net.Core/Search/FieldCache.cs
index 5fcbe6a..d4c36d5 100644
--- a/src/Lucene.Net.Core/Search/FieldCache.cs
+++ b/src/Lucene.Net.Core/Search/FieldCache.cs
@@ -502,7 +502,7 @@ namespace Lucene.Net.Search
public TermsEnum TermsEnum(Terms terms)
{
- return terms.Iterator(null);
+ return terms.GetIterator(null);
}
}
@@ -526,7 +526,7 @@ namespace Lucene.Net.Search
public TermsEnum TermsEnum(Terms terms)
{
- return terms.Iterator(null);
+ return terms.GetIterator(null);
}
}
@@ -545,7 +545,7 @@ namespace Lucene.Net.Search
public TermsEnum TermsEnum(Terms terms)
{
- return terms.Iterator(null);
+ return terms.GetIterator(null);
}
public override string ToString()
@@ -573,7 +573,7 @@ namespace Lucene.Net.Search
public TermsEnum TermsEnum(Terms terms)
{
- return terms.Iterator(null);
+ return terms.GetIterator(null);
}
public override string ToString()
@@ -597,7 +597,7 @@ namespace Lucene.Net.Search
public TermsEnum TermsEnum(Terms terms)
{
- return terms.Iterator(null);
+ return terms.GetIterator(null);
}
public override string ToString()
@@ -621,7 +621,7 @@ namespace Lucene.Net.Search
public TermsEnum TermsEnum(Terms terms)
{
- return terms.Iterator(null);
+ return terms.GetIterator(null);
}
public override string ToString()
@@ -641,7 +641,7 @@ namespace Lucene.Net.Search
public TermsEnum TermsEnum(Terms terms)
{
- return NumericUtils.FilterPrefixCodedInts(terms.Iterator(null));
+ return NumericUtils.FilterPrefixCodedInts(terms.GetIterator(null));
}
public override string ToString()
@@ -666,7 +666,7 @@ namespace Lucene.Net.Search
public TermsEnum TermsEnum(Terms terms)
{
- return NumericUtils.FilterPrefixCodedInts(terms.Iterator(null));
+ return NumericUtils.FilterPrefixCodedInts(terms.GetIterator(null));
}
}
@@ -686,7 +686,7 @@ namespace Lucene.Net.Search
public TermsEnum TermsEnum(Terms terms)
{
- return NumericUtils.FilterPrefixCodedLongs(terms.Iterator(null));
+ return NumericUtils.FilterPrefixCodedLongs(terms.GetIterator(null));
}
}
@@ -706,7 +706,7 @@ namespace Lucene.Net.Search
public TermsEnum TermsEnum(Terms terms)
{
- return NumericUtils.FilterPrefixCodedLongs(terms.Iterator(null));
+ return NumericUtils.FilterPrefixCodedLongs(terms.GetIterator(null));
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Search/FieldCacheImpl.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Search/FieldCacheImpl.cs b/src/Lucene.Net.Core/Search/FieldCacheImpl.cs
index 4c212c9..455836d 100644
--- a/src/Lucene.Net.Core/Search/FieldCacheImpl.cs
+++ b/src/Lucene.Net.Core/Search/FieldCacheImpl.cs
@@ -985,7 +985,7 @@ namespace Lucene.Net.Search
// Fast case: all docs have this field:
return new Lucene.Net.Util.Bits.MatchAllBits(maxDoc);
}
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
DocsEnum docs = null;
while (true)
{
@@ -1659,7 +1659,7 @@ namespace Lucene.Net.Search
if (terms != null)
{
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
DocsEnum docs = null;
while (true)
@@ -1819,7 +1819,7 @@ namespace Lucene.Net.Search
if (terms != null)
{
int termCount = 0;
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
DocsEnum docs = null;
while (true)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Search/FieldCacheRewriteMethod.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Search/FieldCacheRewriteMethod.cs b/src/Lucene.Net.Core/Search/FieldCacheRewriteMethod.cs
index 27b70c1..973bf8b 100644
--- a/src/Lucene.Net.Core/Search/FieldCacheRewriteMethod.cs
+++ b/src/Lucene.Net.Core/Search/FieldCacheRewriteMethod.cs
@@ -146,7 +146,7 @@ namespace Lucene.Net.Search
}
}
- public override TermsEnum Iterator(TermsEnum reuse)
+ public override TermsEnum GetIterator(TermsEnum reuse)
{
return fcsi.GetTermsEnum();
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Search/FuzzyQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Search/FuzzyQuery.cs b/src/Lucene.Net.Core/Search/FuzzyQuery.cs
index dafd226..35bbc87 100644
--- a/src/Lucene.Net.Core/Search/FuzzyQuery.cs
+++ b/src/Lucene.Net.Core/Search/FuzzyQuery.cs
@@ -168,7 +168,7 @@ namespace Lucene.Net.Search
{
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.GetIterator(null), term.Bytes);
}
return new FuzzyTermsEnum(terms, atts, Term, maxEdits, prefixLength, transpositions);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Search/MultiPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Search/MultiPhraseQuery.cs b/src/Lucene.Net.Core/Search/MultiPhraseQuery.cs
index 225db4d..c90feba 100644
--- a/src/Lucene.Net.Core/Search/MultiPhraseQuery.cs
+++ b/src/Lucene.Net.Core/Search/MultiPhraseQuery.cs
@@ -225,7 +225,7 @@ namespace Lucene.Net.Search
}
// Reuse single TermsEnum below:
- TermsEnum termsEnum = fieldTerms.Iterator(null);
+ TermsEnum termsEnum = fieldTerms.GetIterator(null);
for (int pos = 0; pos < postingsFreqs.Length; pos++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Search/NumericRangeQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Search/NumericRangeQuery.cs b/src/Lucene.Net.Core/Search/NumericRangeQuery.cs
index 78e092a..63928c9 100644
--- a/src/Lucene.Net.Core/Search/NumericRangeQuery.cs
+++ b/src/Lucene.Net.Core/Search/NumericRangeQuery.cs
@@ -189,7 +189,7 @@ namespace Lucene.Net.Search
{
return TermsEnum.EMPTY;
}
- return new NumericRangeTermsEnum(this, terms.Iterator(null));
+ return new NumericRangeTermsEnum(this, terms.GetIterator(null));
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Search/PhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Search/PhraseQuery.cs b/src/Lucene.Net.Core/Search/PhraseQuery.cs
index 1d85f14..64140f1 100644
--- a/src/Lucene.Net.Core/Search/PhraseQuery.cs
+++ b/src/Lucene.Net.Core/Search/PhraseQuery.cs
@@ -344,7 +344,7 @@ namespace Lucene.Net.Search
}
// Reuse single TermsEnum below:
- TermsEnum te = fieldTerms.Iterator(null);
+ TermsEnum te = fieldTerms.GetIterator(null);
for (int i = 0; i < outerInstance.terms.Count; i++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Search/PrefixQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Search/PrefixQuery.cs b/src/Lucene.Net.Core/Search/PrefixQuery.cs
index 850a04d..6b06894 100644
--- a/src/Lucene.Net.Core/Search/PrefixQuery.cs
+++ b/src/Lucene.Net.Core/Search/PrefixQuery.cs
@@ -57,7 +57,7 @@ namespace Lucene.Net.Search
protected override TermsEnum GetTermsEnum(Terms terms, AttributeSource atts)
{
- TermsEnum tenum = terms.Iterator(null);
+ TermsEnum tenum = terms.GetIterator(null);
if (_prefix.Bytes.Length == 0)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Search/Spans/SpanTermQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Search/Spans/SpanTermQuery.cs b/src/Lucene.Net.Core/Search/Spans/SpanTermQuery.cs
index 6115b71..0d129a6 100644
--- a/src/Lucene.Net.Core/Search/Spans/SpanTermQuery.cs
+++ b/src/Lucene.Net.Core/Search/Spans/SpanTermQuery.cs
@@ -135,7 +135,7 @@ namespace Lucene.Net.Search.Spans
Terms terms = fields.Terms(m_term.Field);
if (terms != null)
{
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
if (termsEnum.SeekExact(m_term.Bytes))
{
state = termsEnum.GetTermState();
@@ -165,7 +165,7 @@ namespace Lucene.Net.Search.Spans
return TermSpans.EMPTY_TERM_SPANS;
}
- TermsEnum termsEnum_ = context.AtomicReader.Terms(m_term.Field).Iterator(null);
+ TermsEnum termsEnum_ = context.AtomicReader.Terms(m_term.Field).GetIterator(null);
termsEnum_.SeekExact(m_term.Bytes, state);
DocsAndPositionsEnum postings = termsEnum_.DocsAndPositions(acceptDocs, null, DocsAndPositionsEnum.FLAG_PAYLOADS);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Search/TermQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Search/TermQuery.cs b/src/Lucene.Net.Core/Search/TermQuery.cs
index 7da29ca..e2e3ec7 100644
--- a/src/Lucene.Net.Core/Search/TermQuery.cs
+++ b/src/Lucene.Net.Core/Search/TermQuery.cs
@@ -112,7 +112,7 @@ namespace Lucene.Net.Search
return null;
}
//System.out.println("LD=" + reader.getLiveDocs() + " set?=" + (reader.getLiveDocs() != null ? reader.getLiveDocs().get(0) : "null"));
- TermsEnum termsEnum = context.AtomicReader.Terms(outerInstance.term.Field).Iterator(null);
+ TermsEnum termsEnum = context.AtomicReader.Terms(outerInstance.term.Field).GetIterator(null);
termsEnum.SeekExact(outerInstance.term.Bytes, state);
return termsEnum;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Search/TermRangeQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Search/TermRangeQuery.cs b/src/Lucene.Net.Core/Search/TermRangeQuery.cs
index 1012ca5..6d42f0b 100644
--- a/src/Lucene.Net.Core/Search/TermRangeQuery.cs
+++ b/src/Lucene.Net.Core/Search/TermRangeQuery.cs
@@ -128,7 +128,7 @@ namespace Lucene.Net.Search
return TermsEnum.EMPTY;
}
- TermsEnum tenum = terms.Iterator(null);
+ TermsEnum tenum = terms.GetIterator(null);
if ((lowerTerm == null || (includeLower && lowerTerm.Length == 0)) && upperTerm == null)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Core/Util/Automaton/CompiledAutomaton.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Util/Automaton/CompiledAutomaton.cs b/src/Lucene.Net.Core/Util/Automaton/CompiledAutomaton.cs
index 0ed0c8d..f85f748 100644
--- a/src/Lucene.Net.Core/Util/Automaton/CompiledAutomaton.cs
+++ b/src/Lucene.Net.Core/Util/Automaton/CompiledAutomaton.cs
@@ -289,15 +289,15 @@ namespace Lucene.Net.Util.Automaton
return TermsEnum.EMPTY;
case Lucene.Net.Util.Automaton.CompiledAutomaton.AUTOMATON_TYPE.ALL:
- return terms.Iterator(null);
+ return terms.GetIterator(null);
case Lucene.Net.Util.Automaton.CompiledAutomaton.AUTOMATON_TYPE.SINGLE:
- return new SingleTermsEnum(terms.Iterator(null), Term);
+ return new SingleTermsEnum(terms.GetIterator(null), Term);
case Lucene.Net.Util.Automaton.CompiledAutomaton.AUTOMATON_TYPE.PREFIX:
// TODO: this is very likely faster than .intersect,
// but we should test and maybe cutover
- return new PrefixTermsEnum(terms.Iterator(null), Term);
+ return new PrefixTermsEnum(terms.GetIterator(null), Term);
case Lucene.Net.Util.Automaton.CompiledAutomaton.AUTOMATON_TYPE.NORMAL:
return terms.Intersect(this, null);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs b/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs
index bde4f3b..e30a488 100644
--- a/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyWriter.cs
@@ -438,7 +438,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
Terms terms = ctx.AtomicReader.Terms(Consts.FULL);
if (terms != null)
{
- termsEnum = terms.Iterator(termsEnum);
+ termsEnum = terms.GetIterator(termsEnum);
if (termsEnum.SeekExact(catTerm))
{
// liveDocs=null because the taxonomy has no deletes
@@ -796,7 +796,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
Terms terms = ctx.AtomicReader.Terms(Consts.FULL);
if (terms != null) // cannot really happen, but be on the safe side
{
- termsEnum = terms.Iterator(termsEnum);
+ termsEnum = terms.GetIterator(termsEnum);
while (termsEnum.Next() != null)
{
if (!cache.IsFull)
@@ -916,7 +916,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
{
AtomicReader ar = ctx.AtomicReader;
Terms terms = ar.Terms(Consts.FULL);
- te = terms.Iterator(te);
+ te = terms.GetIterator(te);
while (te.Next() != null)
{
FacetLabel cp = new FacetLabel(FacetsConfig.StringToPath(te.Term.Utf8ToString()));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Highlighter/Highlight/TokenSources.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Highlighter/Highlight/TokenSources.cs b/src/Lucene.Net.Highlighter/Highlight/TokenSources.cs
index 2682a95..edfbb35 100644
--- a/src/Lucene.Net.Highlighter/Highlight/TokenSources.cs
+++ b/src/Lucene.Net.Highlighter/Highlight/TokenSources.cs
@@ -206,7 +206,7 @@ namespace Lucene.Net.Search.Highlight
bool hasPayloads = tpv.HasPayloads;
// code to reconstruct the original sequence of Tokens
- TermsEnum termsEnum = tpv.Iterator(null);
+ TermsEnum termsEnum = tpv.GetIterator(null);
int totalTokens = 0;
while (termsEnum.Next() != null)
{
@@ -214,7 +214,7 @@ namespace Lucene.Net.Search.Highlight
}
Token[] tokensInOriginalOrder = new Token[totalTokens];
List<Token> unsortedTokens = null;
- termsEnum = tpv.Iterator(null);
+ termsEnum = tpv.GetIterator(null);
BytesRef text;
DocsAndPositionsEnum dpEnum = null;
while ((text = termsEnum.Next()) != null)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Highlighter/Highlight/TokenStreamFromTermPositionVector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Highlighter/Highlight/TokenStreamFromTermPositionVector.cs b/src/Lucene.Net.Highlighter/Highlight/TokenStreamFromTermPositionVector.cs
index 124d88c..fec5a35 100644
--- a/src/Lucene.Net.Highlighter/Highlight/TokenStreamFromTermPositionVector.cs
+++ b/src/Lucene.Net.Highlighter/Highlight/TokenStreamFromTermPositionVector.cs
@@ -54,7 +54,7 @@ namespace Lucene.Net.Search.Highlight
bool hasOffsets = vector.HasOffsets;
bool hasPayloads = vector.HasPayloads;
- TermsEnum termsEnum = vector.Iterator(null);
+ TermsEnum termsEnum = vector.GetIterator(null);
BytesRef text;
DocsAndPositionsEnum dpEnum = null;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Highlighter/PostingsHighlight/PostingsHighlighter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Highlighter/PostingsHighlight/PostingsHighlighter.cs b/src/Lucene.Net.Highlighter/PostingsHighlight/PostingsHighlighter.cs
index 17f8afd..63c48bc 100644
--- a/src/Lucene.Net.Highlighter/PostingsHighlight/PostingsHighlighter.cs
+++ b/src/Lucene.Net.Highlighter/PostingsHighlight/PostingsHighlighter.cs
@@ -533,7 +533,7 @@ namespace Lucene.Net.Search.PostingsHighlight
Terms t = r.Terms(field);
if (t != null)
{
- termsEnum = t.Iterator(null);
+ termsEnum = t.GetIterator(null);
postings = new DocsAndPositionsEnum[terms.Length];
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Highlighter/VectorHighlight/FieldTermStack.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Highlighter/VectorHighlight/FieldTermStack.cs b/src/Lucene.Net.Highlighter/VectorHighlight/FieldTermStack.cs
index f8eb657..7b326f1 100644
--- a/src/Lucene.Net.Highlighter/VectorHighlight/FieldTermStack.cs
+++ b/src/Lucene.Net.Highlighter/VectorHighlight/FieldTermStack.cs
@@ -89,7 +89,7 @@ namespace Lucene.Net.Search.VectorHighlight
}
CharsRef spare = new CharsRef();
- TermsEnum termsEnum = vector.Iterator(null);
+ TermsEnum termsEnum = vector.GetIterator(null);
DocsAndPositionsEnum dpEnum = null;
BytesRef text;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Join/TermsIncludingScoreQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Join/TermsIncludingScoreQuery.cs b/src/Lucene.Net.Join/TermsIncludingScoreQuery.cs
index 986280f..708dc91 100644
--- a/src/Lucene.Net.Join/TermsIncludingScoreQuery.cs
+++ b/src/Lucene.Net.Join/TermsIncludingScoreQuery.cs
@@ -174,7 +174,7 @@ namespace Lucene.Net.Join
// what is the runtime...seems ok?
long cost = context.AtomicReader.MaxDoc * terms.Count;
- segmentTermsEnum = terms.Iterator(segmentTermsEnum);
+ segmentTermsEnum = terms.GetIterator(segmentTermsEnum);
if (outerInstance._multipleValuesPerDocument)
{
return new MVInOrderScorer(outerInstance, this, acceptDocs, segmentTermsEnum, context.AtomicReader.MaxDoc, cost);
@@ -198,7 +198,7 @@ namespace Lucene.Net.Join
// what is the runtime...seems ok?
long cost = context.AtomicReader.MaxDoc * terms.Count;
- segmentTermsEnum = terms.Iterator(segmentTermsEnum);
+ segmentTermsEnum = terms.GetIterator(segmentTermsEnum);
// Optimized impls that take advantage of docs
// being allowed to be out of order:
if (outerInstance._multipleValuesPerDocument)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Join/TermsQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Join/TermsQuery.cs b/src/Lucene.Net.Join/TermsQuery.cs
index d7fac78..010ce4a 100644
--- a/src/Lucene.Net.Join/TermsQuery.cs
+++ b/src/Lucene.Net.Join/TermsQuery.cs
@@ -54,7 +54,7 @@ namespace Lucene.Net.Join
return TermsEnum.EMPTY;
}
- return new SeekingTermSetTermsEnum(terms.Iterator(null), _terms, _ords);
+ return new SeekingTermSetTermsEnum(terms.GetIterator(null), _terms, _ords);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs b/src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs
index 729390e..9e70d6e 100644
--- a/src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs
+++ b/src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs
@@ -182,7 +182,7 @@ namespace Lucene.Net.Index.Memory
this.info = info;
}
- public override TermsEnum Iterator(TermsEnum reuse)
+ public override TermsEnum GetIterator(TermsEnum reuse)
{
return new MemoryTermsEnum(outerInstance.outerInstance, info);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Misc/Index/Sorter/SortingAtomicReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Misc/Index/Sorter/SortingAtomicReader.cs b/src/Lucene.Net.Misc/Index/Sorter/SortingAtomicReader.cs
index 18745f8..f062fdb 100644
--- a/src/Lucene.Net.Misc/Index/Sorter/SortingAtomicReader.cs
+++ b/src/Lucene.Net.Misc/Index/Sorter/SortingAtomicReader.cs
@@ -84,9 +84,9 @@ namespace Lucene.Net.Index.Sorter
this.indexOptions = indexOptions;
}
- public override TermsEnum Iterator(TermsEnum reuse)
+ public override TermsEnum GetIterator(TermsEnum reuse)
{
- return new SortingTermsEnum(m_input.Iterator(reuse), docMap, indexOptions);
+ return new SortingTermsEnum(m_input.GetIterator(reuse), docMap, indexOptions);
}
public override TermsEnum Intersect(CompiledAutomaton compiled, BytesRef startTerm)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Misc/Misc/HighFreqTerms.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Misc/Misc/HighFreqTerms.cs b/src/Lucene.Net.Misc/Misc/HighFreqTerms.cs
index f331870..1f94deb 100644
--- a/src/Lucene.Net.Misc/Misc/HighFreqTerms.cs
+++ b/src/Lucene.Net.Misc/Misc/HighFreqTerms.cs
@@ -108,7 +108,7 @@ namespace Lucene.Net.Misc
Terms terms = fields.Terms(field);
if (terms != null)
{
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
tiq = new TermStatsQueue(numTerms, comparer);
tiq.Fill(field, termsEnum);
}
@@ -126,7 +126,7 @@ namespace Lucene.Net.Misc
Terms terms = fields.Terms(fieldName);
if (terms != null)
{
- tiq.Fill(fieldName, terms.Iterator(null));
+ tiq.Fill(fieldName, terms.GetIterator(null));
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Queries/CommonTermsQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/CommonTermsQuery.cs b/src/Lucene.Net.Queries/CommonTermsQuery.cs
index 892f936..5e919ab 100644
--- a/src/Lucene.Net.Queries/CommonTermsQuery.cs
+++ b/src/Lucene.Net.Queries/CommonTermsQuery.cs
@@ -268,7 +268,7 @@ namespace Lucene.Net.Queries
// field does not exist
continue;
}
- termsEnum = terms.Iterator(termsEnum);
+ termsEnum = terms.GetIterator(termsEnum);
Debug.Assert(termsEnum != null);
if (termsEnum == TermsEnum.EMPTY)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Queries/Function/ValueSources/JoinDocFreqValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/JoinDocFreqValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/JoinDocFreqValueSource.cs
index 7ff1175..c0ca237 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/JoinDocFreqValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/JoinDocFreqValueSource.cs
@@ -52,7 +52,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
BinaryDocValues terms = cache.GetTerms(readerContext.AtomicReader, field, false, PackedInts.FAST);
IndexReader top = ReaderUtil.GetTopLevelContext(readerContext).Reader;
Terms t = MultiFields.GetTerms(top, qfield);
- TermsEnum termsEnum = t == null ? TermsEnum.EMPTY : t.Iterator(null);
+ TermsEnum termsEnum = t == null ? TermsEnum.EMPTY : t.GetIterator(null);
return new IntDocValuesAnonymousInnerClassHelper(this, this, terms, termsEnum);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs
index 9b6dc33..ec9a4f1 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs
@@ -94,7 +94,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
if (terms != null)
{
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
if (termsEnum.SeekExact(outerInstance.indexedBytes))
{
docs = termsEnum.Docs(null, null);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs
index 983bc6a..ec32fed 100644
--- a/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs
@@ -77,7 +77,7 @@ namespace Lucene.Net.Queries.Function.ValueSources
if (terms != null)
{
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
if (termsEnum.SeekExact(outerInstance.indexedBytes))
{
docs = termsEnum.Docs(null, null);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
index 6bd3c90..24dd148 100644
--- a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
+++ b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
@@ -566,7 +566,7 @@ namespace Lucene.Net.Queries.Mlt
/// <param name="vector"> List of terms and their frequencies for a doc/field </param>
private void AddTermFrequencies(IDictionary<string, Int> termFreqMap, Terms vector)
{
- var termsEnum = vector.Iterator(null);
+ var termsEnum = vector.GetIterator(null);
var spare = new CharsRef();
BytesRef text;
while ((text = termsEnum.Next()) != null)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Queries/TermFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/TermFilter.cs b/src/Lucene.Net.Queries/TermFilter.cs
index 96ef80c..74d3353 100644
--- a/src/Lucene.Net.Queries/TermFilter.cs
+++ b/src/Lucene.Net.Queries/TermFilter.cs
@@ -60,7 +60,7 @@ namespace Lucene.Net.Queries
return null;
}
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
if (!termsEnum.SeekExact(term.Bytes))
{
return null;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Queries/TermsFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/TermsFilter.cs b/src/Lucene.Net.Queries/TermsFilter.cs
index ba57ca7..0b944d4 100644
--- a/src/Lucene.Net.Queries/TermsFilter.cs
+++ b/src/Lucene.Net.Queries/TermsFilter.cs
@@ -238,7 +238,7 @@ namespace Lucene.Net.Queries
{
if ((terms = fields.Terms(termsAndField.field)) != null)
{
- termsEnum = terms.Iterator(termsEnum); // this won't return null
+ termsEnum = terms.GetIterator(termsEnum); // this won't return null
for (int i = termsAndField.start; i < termsAndField.end; i++)
{
spare.Offset = offsets[i];
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.QueryParser/Surround/Query/SrndPrefixQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/SrndPrefixQuery.cs b/src/Lucene.Net.QueryParser/Surround/Query/SrndPrefixQuery.cs
index 6959b00..3425f15 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/SrndPrefixQuery.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/SrndPrefixQuery.cs
@@ -62,7 +62,7 @@ namespace Lucene.Net.QueryParsers.Surround.Query
Terms terms = MultiFields.GetTerms(reader, fieldName);
if (terms != null)
{
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
bool skip = false;
TermsEnum.SeekStatus status = termsEnum.SeekCeil(new BytesRef(Prefix));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.QueryParser/Surround/Query/SrndTermQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/SrndTermQuery.cs b/src/Lucene.Net.QueryParser/Surround/Query/SrndTermQuery.cs
index 1d67cfa..e7a5c0f 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/SrndTermQuery.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/SrndTermQuery.cs
@@ -50,7 +50,7 @@ namespace Lucene.Net.QueryParsers.Surround.Query
Terms terms = MultiFields.GetTerms(reader, fieldName);
if (terms != null)
{
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
TermsEnum.SeekStatus status = termsEnum.SeekCeil(new BytesRef(TermText));
if (status == TermsEnum.SeekStatus.FOUND)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.QueryParser/Surround/Query/SrndTruncQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/SrndTruncQuery.cs b/src/Lucene.Net.QueryParser/Surround/Query/SrndTruncQuery.cs
index dc71b03..834da4f 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/SrndTruncQuery.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/SrndTruncQuery.cs
@@ -99,7 +99,7 @@ namespace Lucene.Net.QueryParsers.Surround.Query
Terms terms = MultiFields.GetTerms(reader, fieldName);
if (terms != null)
{
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
TermsEnum.SeekStatus status = termsEnum.SeekCeil(prefixRef);
BytesRef text;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Sandbox/Queries/DuplicateFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Sandbox/Queries/DuplicateFilter.cs b/src/Lucene.Net.Sandbox/Queries/DuplicateFilter.cs
index 86469e3..3b97d06 100644
--- a/src/Lucene.Net.Sandbox/Queries/DuplicateFilter.cs
+++ b/src/Lucene.Net.Sandbox/Queries/DuplicateFilter.cs
@@ -79,7 +79,7 @@ namespace Lucene.Net.Sandbox.Queries
return bits;
}
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
DocsEnum docs = null;
while (true)
{
@@ -129,7 +129,7 @@ namespace Lucene.Net.Sandbox.Queries
return bits;
}
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
DocsEnum docs = null;
while (true)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Sandbox/Queries/SlowFuzzyQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Sandbox/Queries/SlowFuzzyQuery.cs b/src/Lucene.Net.Sandbox/Queries/SlowFuzzyQuery.cs
index 6fd64a9..7889613 100644
--- a/src/Lucene.Net.Sandbox/Queries/SlowFuzzyQuery.cs
+++ b/src/Lucene.Net.Sandbox/Queries/SlowFuzzyQuery.cs
@@ -150,7 +150,7 @@ namespace Lucene.Net.Sandbox.Queries
{
if (!termLongEnough)
{ // can only match if it's exact
- return new SingleTermsEnum(terms.Iterator(null), term.Bytes);
+ return new SingleTermsEnum(terms.GetIterator(null), term.Bytes);
}
return new SlowFuzzyTermsEnum(terms, atts, Term, minimumSimilarity, prefixLength);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Sandbox/Queries/SlowFuzzyTermsEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Sandbox/Queries/SlowFuzzyTermsEnum.cs b/src/Lucene.Net.Sandbox/Queries/SlowFuzzyTermsEnum.cs
index 83f5521..629de32 100644
--- a/src/Lucene.Net.Sandbox/Queries/SlowFuzzyTermsEnum.cs
+++ b/src/Lucene.Net.Sandbox/Queries/SlowFuzzyTermsEnum.cs
@@ -85,7 +85,7 @@ namespace Lucene.Net.Sandbox.Queries
/// </summary>
/// <exception cref="IOException">If there is a low-level I/O error.</exception>
public LinearFuzzyTermsEnum(SlowFuzzyTermsEnum outerInstance)
- : base(outerInstance.m_terms.Iterator(null))
+ : base(outerInstance.m_terms.GetIterator(null))
{
this.outerInstance = outerInstance;
this.boostAtt = Attributes.AddAttribute<IBoostAttribute>();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Spatial/Prefix/AbstractPrefixTreeFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Spatial/Prefix/AbstractPrefixTreeFilter.cs b/src/Lucene.Net.Spatial/Prefix/AbstractPrefixTreeFilter.cs
index f945962..bd50961 100644
--- a/src/Lucene.Net.Spatial/Prefix/AbstractPrefixTreeFilter.cs
+++ b/src/Lucene.Net.Spatial/Prefix/AbstractPrefixTreeFilter.cs
@@ -104,7 +104,7 @@ namespace Lucene.Net.Spatial.Prefix
Terms terms = reader.Terms(outerInstance.fieldName);
if (terms != null)
{
- termsEnum = terms.Iterator(null);
+ termsEnum = terms.GetIterator(null);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Spatial/Prefix/AbstractVisitingPrefixTreeFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Spatial/Prefix/AbstractVisitingPrefixTreeFilter.cs b/src/Lucene.Net.Spatial/Prefix/AbstractVisitingPrefixTreeFilter.cs
index 4148f95..0c89180 100644
--- a/src/Lucene.Net.Spatial/Prefix/AbstractVisitingPrefixTreeFilter.cs
+++ b/src/Lucene.Net.Spatial/Prefix/AbstractVisitingPrefixTreeFilter.cs
@@ -204,7 +204,7 @@ namespace Lucene.Net.Spatial.Prefix
if (compare > 0)
{
// leap frog (termsEnum is beyond where we would otherwise seek)
- Debug.Assert(!context.AtomicReader.Terms(outerInstance.fieldName).Iterator(null).SeekExact(curVNodeTerm), "should be absent");
+ Debug.Assert(!context.AtomicReader.Terms(outerInstance.fieldName).GetIterator(null).SeekExact(curVNodeTerm), "should be absent");
}
else
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Spatial/Util/ShapeFieldCacheProvider.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Spatial/Util/ShapeFieldCacheProvider.cs b/src/Lucene.Net.Spatial/Util/ShapeFieldCacheProvider.cs
index 174fc4d..b6a7eb4 100644
--- a/src/Lucene.Net.Spatial/Util/ShapeFieldCacheProvider.cs
+++ b/src/Lucene.Net.Spatial/Util/ShapeFieldCacheProvider.cs
@@ -74,7 +74,7 @@ namespace Lucene.Net.Spatial.Util
TermsEnum te = null;
if (terms != null)
{
- te = terms.Iterator(te);
+ te = terms.GetIterator(te);
BytesRef term = te.Next();
while (term != null)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Suggest/Spell/HighFrequencyDictionary.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Spell/HighFrequencyDictionary.cs b/src/Lucene.Net.Suggest/Spell/HighFrequencyDictionary.cs
index 1e6d82c..4dcefc7 100644
--- a/src/Lucene.Net.Suggest/Spell/HighFrequencyDictionary.cs
+++ b/src/Lucene.Net.Suggest/Spell/HighFrequencyDictionary.cs
@@ -76,7 +76,7 @@ namespace Lucene.Net.Search.Spell
Terms terms = MultiFields.GetTerms(outerInstance.reader, outerInstance.field);
if (terms != null)
{
- termsEnum = terms.Iterator(null);
+ termsEnum = terms.GetIterator(null);
}
else
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Suggest/Spell/LuceneDictionary.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Spell/LuceneDictionary.cs b/src/Lucene.Net.Suggest/Spell/LuceneDictionary.cs
index b881eeb..348ab04 100644
--- a/src/Lucene.Net.Suggest/Spell/LuceneDictionary.cs
+++ b/src/Lucene.Net.Suggest/Spell/LuceneDictionary.cs
@@ -46,7 +46,7 @@ namespace Lucene.Net.Search.Spell
Terms terms = MultiFields.GetTerms(reader, field);
if (terms != null)
{
- return new InputIteratorWrapper(terms.Iterator(null));
+ return new InputIteratorWrapper(terms.GetIterator(null));
}
else
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Suggest/Spell/SpellChecker.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Spell/SpellChecker.cs b/src/Lucene.Net.Suggest/Spell/SpellChecker.cs
index 6c80d69..23e916a 100644
--- a/src/Lucene.Net.Suggest/Spell/SpellChecker.cs
+++ b/src/Lucene.Net.Suggest/Spell/SpellChecker.cs
@@ -522,7 +522,7 @@ namespace Lucene.Net.Search.Spell
Terms terms = ctx.AtomicReader.Terms(F_WORD);
if (terms != null)
{
- termsEnums.Add(terms.Iterator(null));
+ termsEnums.Add(terms.GetIterator(null));
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Suggest/Suggest/Analyzing/BlendedInfixSuggester.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Suggest/Analyzing/BlendedInfixSuggester.cs b/src/Lucene.Net.Suggest/Suggest/Analyzing/BlendedInfixSuggester.cs
index 983bf9e..8df5f20 100644
--- a/src/Lucene.Net.Suggest/Suggest/Analyzing/BlendedInfixSuggester.cs
+++ b/src/Lucene.Net.Suggest/Suggest/Analyzing/BlendedInfixSuggester.cs
@@ -257,7 +257,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
private double CreateCoefficient(IndexSearcher searcher, int doc, IEnumerable<string> matchedTokens, string prefixToken)
{
Terms tv = searcher.IndexReader.GetTermVector(doc, TEXT_FIELD_NAME);
- TermsEnum it = tv.Iterator(TermsEnum.EMPTY);
+ TermsEnum it = tv.GetIterator(TermsEnum.EMPTY);
int? position = int.MaxValue;
BytesRef term;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Suggest/Suggest/Analyzing/FreeTextSuggester.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Suggest/Analyzing/FreeTextSuggester.cs b/src/Lucene.Net.Suggest/Suggest/Analyzing/FreeTextSuggester.cs
index d196539..7c9e723 100644
--- a/src/Lucene.Net.Suggest/Suggest/Analyzing/FreeTextSuggester.cs
+++ b/src/Lucene.Net.Suggest/Suggest/Analyzing/FreeTextSuggester.cs
@@ -368,7 +368,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
}
// Move all ngrams into an FST:
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
Outputs<long?> outputs = PositiveIntOutputs.Singleton;
Builder<long?> builder = new Builder<long?>(FST.INPUT_TYPE.BYTE1, outputs);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.TestFramework/Codecs/ramonly/RAMOnlyPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/ramonly/RAMOnlyPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/ramonly/RAMOnlyPostingsFormat.cs
index 518784c..e0e0d20 100644
--- a/src/Lucene.Net.TestFramework/Codecs/ramonly/RAMOnlyPostingsFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/ramonly/RAMOnlyPostingsFormat.cs
@@ -199,7 +199,7 @@ namespace Lucene.Net.Codecs.ramonly
}
}
- public override TermsEnum Iterator(TermsEnum reuse)
+ public override TermsEnum GetIterator(TermsEnum reuse)
{
return new RAMTermsEnum(this);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.TestFramework/Index/AssertingAtomicReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/AssertingAtomicReader.cs b/src/Lucene.Net.TestFramework/Index/AssertingAtomicReader.cs
index 7bd6330..01cf168 100644
--- a/src/Lucene.Net.TestFramework/Index/AssertingAtomicReader.cs
+++ b/src/Lucene.Net.TestFramework/Index/AssertingAtomicReader.cs
@@ -98,7 +98,7 @@ namespace Lucene.Net.Index
return new AssertingTermsEnum(termsEnum);
}
- public override TermsEnum Iterator(TermsEnum reuse)
+ public override TermsEnum GetIterator(TermsEnum reuse)
{
// TODO: should we give this thing a random to be super-evil,
// and randomly *not* unwrap?
@@ -106,7 +106,7 @@ namespace Lucene.Net.Index
{
reuse = ((AssertingTermsEnum)reuse).m_input;
}
- TermsEnum termsEnum = base.Iterator(reuse);
+ TermsEnum termsEnum = base.GetIterator(reuse);
Debug.Assert(termsEnum != null);
return new AssertingTermsEnum(termsEnum);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
index 8a1db6b..71650fd 100644
--- a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
@@ -1150,7 +1150,7 @@ namespace Lucene.Net.Index
Terms terms = fieldsSource.Terms(fieldAndTerm.Field);
Assert.IsNotNull(terms);
- termsEnum = terms.Iterator(null);
+ termsEnum = terms.GetIterator(null);
if (!useTermState)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
index e51fa0f..e4200ce 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
@@ -536,7 +536,7 @@ namespace Lucene.Net.Index
}
BytesRef[] sortedTerms = uniqueTerms.ToArray(/*new BytesRef[0]*/);
Array.Sort(sortedTerms, terms.Comparer);
- TermsEnum termsEnum = terms.Iterator(Random().NextBoolean() ? null : this.termsEnum.Value);
+ TermsEnum termsEnum = terms.GetIterator(Random().NextBoolean() ? null : this.termsEnum.Value);
this.termsEnum.Value = termsEnum;
for (int i = 0; i < sortedTerms.Length; ++i)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs b/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
index c2a96aa..e3ccfb6 100644
--- a/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
@@ -477,7 +477,7 @@ namespace Lucene.Net.Index
{
continue;
}
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
int seenTermCount = 0;
int shift;
int trigger;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
index 470abe8..c9c9122 100644
--- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
@@ -1922,8 +1922,8 @@ namespace Lucene.Net.Util
Assert.AreEqual(leftTerms.HasPositions, rightTerms.HasPositions);
Assert.AreEqual(leftTerms.HasPayloads, rightTerms.HasPayloads);
- TermsEnum leftTermsEnum = leftTerms.Iterator(null);
- TermsEnum rightTermsEnum = rightTerms.Iterator(null);
+ TermsEnum leftTermsEnum = leftTerms.GetIterator(null);
+ TermsEnum rightTermsEnum = rightTerms.GetIterator(null);
AssertTermsEnumEquals(info, leftReader, leftTermsEnum, rightTermsEnum, true);
AssertTermsSeekingEquals(info, leftTerms, rightTerms);
@@ -2197,7 +2197,7 @@ namespace Lucene.Net.Util
int numPasses = 0;
while (numPasses < 10 && tests.Count < numTests)
{
- leftEnum = leftTerms.Iterator(leftEnum);
+ leftEnum = leftTerms.GetIterator(leftEnum);
BytesRef term = null;
while ((term = leftEnum.Next()) != null)
{
@@ -2248,7 +2248,7 @@ namespace Lucene.Net.Util
numPasses++;
}
- rightEnum = rightTerms.Iterator(rightEnum);
+ rightEnum = rightTerms.GetIterator(rightEnum);
IList<BytesRef> shuffledTests = new List<BytesRef>(tests);
shuffledTests = CollectionsHelper.Shuffle(shuffledTests);
@@ -2258,8 +2258,8 @@ namespace Lucene.Net.Util
if (Rarely())
{
// reuse the enums
- leftEnum = leftTerms.Iterator(leftEnum);
- rightEnum = rightTerms.Iterator(rightEnum);
+ leftEnum = leftTerms.GetIterator(leftEnum);
+ rightEnum = rightTerms.GetIterator(rightEnum);
}
bool seekExact = Random().NextBoolean();