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:07 UTC
[1/5] lucenenet git commit: Lucene.net.Core.Store (IOContext +
RateLimitedDirectoryWrapper): Made UsageContext enum non-nullable
Repository: lucenenet
Updated Branches:
refs/heads/api-work 1ebaad01e -> 53ab67133
Lucene.net.Core.Store (IOContext + RateLimitedDirectoryWrapper): Made UsageContext enum non-nullable
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/fa628285
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/fa628285
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/fa628285
Branch: refs/heads/api-work
Commit: fa628285e6a6bdaeb154c4e4f9c530dcb43b0fa6
Parents: 1ebaad0
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Thu Jan 26 10:19:35 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Thu Jan 26 10:19:35 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Core/Store/IOContext.cs | 10 +++++-----
src/Lucene.Net.Core/Store/RateLimitedDirectoryWrapper.cs | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fa628285/src/Lucene.Net.Core/Store/IOContext.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/IOContext.cs b/src/Lucene.Net.Core/Store/IOContext.cs
index d4e73d9..8573544 100644
--- a/src/Lucene.Net.Core/Store/IOContext.cs
+++ b/src/Lucene.Net.Core/Store/IOContext.cs
@@ -38,13 +38,13 @@ namespace Lucene.Net.Store
MERGE,
READ,
FLUSH,
- DEFAULT // LUCENENET TODO: Eliminate nullables and make this value 0
+ DEFAULT = 0 // LUCENENET NOTE: 0 is the default for any value type, so when not initialized, this is the value we get
}
/// <summary>
/// An object of a enumerator Context type
/// </summary>
- public UsageContext? Context { get; private set; } // LUCENENET TODO: eliminate the nullable ?
+ public UsageContext Context { get; private set; }
public MergeInfo MergeInfo { get; private set; }
@@ -72,7 +72,7 @@ namespace Lucene.Net.Store
this.FlushInfo = flushInfo;
}
- public IOContext(UsageContext? context)
+ public IOContext(UsageContext context)
: this(context, null)
{
}
@@ -90,7 +90,7 @@ namespace Lucene.Net.Store
{
}
- private IOContext(UsageContext? context, MergeInfo mergeInfo)
+ private IOContext(UsageContext context, MergeInfo mergeInfo)
{
Debug.Assert(context != UsageContext.MERGE || mergeInfo != null, "MergeInfo must not be null if context is MERGE");
Debug.Assert(context != UsageContext.FLUSH, "Use IOContext(FlushInfo) to create a FLUSH IOContext");
@@ -116,7 +116,7 @@ namespace Lucene.Net.Store
{
const int prime = 31;
int result = 1;
- result = prime * result + ((Context == null) ? 0 : Context.GetHashCode());
+ result = prime * result + /*((Context == null) ? 0 :*/ Context.GetHashCode()/*)*/; // LUCENENET NOTE: Enum can never be null in .NET
result = prime * result + ((FlushInfo == null) ? 0 : FlushInfo.GetHashCode());
result = prime * result + ((MergeInfo == null) ? 0 : MergeInfo.GetHashCode());
result = prime * result + (ReadOnce ? 1231 : 1237);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fa628285/src/Lucene.Net.Core/Store/RateLimitedDirectoryWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/RateLimitedDirectoryWrapper.cs b/src/Lucene.Net.Core/Store/RateLimitedDirectoryWrapper.cs
index 05b9c7a..d3fa8c0 100644
--- a/src/Lucene.Net.Core/Store/RateLimitedDirectoryWrapper.cs
+++ b/src/Lucene.Net.Core/Store/RateLimitedDirectoryWrapper.cs
@@ -33,7 +33,7 @@ namespace Lucene.Net.Store
// we need to be volatile here to make sure we see all the values that are set
// / modified concurrently
//private volatile RateLimiter[] ContextRateLimiters = new RateLimiter[Enum.GetValues(typeof(IOContext.Context_e)).Length];
- private readonly IDictionary<IOContext.UsageContext?, RateLimiter> _contextRateLimiters = new ConcurrentDictionary<IOContext.UsageContext?, RateLimiter>();
+ private readonly IDictionary<IOContext.UsageContext, RateLimiter> _contextRateLimiters = new ConcurrentDictionary<IOContext.UsageContext, RateLimiter>();
public RateLimitedDirectoryWrapper(Directory wrapped)
: base(wrapped)
@@ -64,9 +64,9 @@ namespace Lucene.Net.Store
m_input.Copy(to, src, dest, context);
}
- private RateLimiter GetRateLimiter(IOContext.UsageContext? context) // LUCENENET TODO: Can we get rid of the nullable?
+ private RateLimiter GetRateLimiter(IOContext.UsageContext context)
{
- Debug.Assert(context != null);
+ //Debug.Assert(context != null); // LUCENENET NOTE: In .NET, enum can never be null
RateLimiter ret;
return _contextRateLimiters.TryGetValue(context, out ret) ? ret : null;
}
@@ -89,7 +89,7 @@ namespace Lucene.Net.Store
/// if context is <code>null</code> </exception>
/// <exception cref="AlreadyClosedException"> if the <seealso cref="Directory"/> is already closed
/// @lucene.experimental </exception>
- public void SetMaxWriteMBPerSec(double? mbPerSec, IOContext.UsageContext? context) // LUCENENET TODO: Can we get rid of the nullables?
+ public void SetMaxWriteMBPerSec(double? mbPerSec, IOContext.UsageContext context) // LUCENENET TODO: Can we get rid of the nullables?
{
EnsureOpen();
if (context == null)
[5/5] lucenenet git commit: Lucene.Net.Core.Search.FieldComparer
refactor: Changed Value(int) to this[int]
Posted by ni...@apache.org.
Lucene.Net.Core.Search.FieldComparer refactor: Changed Value(int) to this[int]
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/53ab6713
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/53ab6713
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/53ab6713
Branch: refs/heads/api-work
Commit: 53ab67133ed621f33fe3bc4b86983853108cb375
Parents: 715372a
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Thu Jan 26 12:24:08 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Thu Jan 26 12:24:08 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Core/Search/FieldComparator.cs | 43 ++++++++++----------
.../Search/FieldValueHitQueue.cs | 2 +-
.../ExpressionComparator.cs | 5 ++-
.../AbstractFirstPassGroupingCollector.cs | 2 +-
.../BlockGroupingCollector.cs | 2 +-
.../ToParentBlockJoinCollector.cs | 2 +-
.../ToParentBlockJoinFieldComparator.cs | 5 ++-
.../Index/Sorter/BlockJoinComparatorSource.cs | 10 +++--
src/Lucene.Net.Queries/Function/ValueSource.cs | 5 ++-
.../core/Search/JustCompileSearch.cs | 5 ++-
.../core/Search/TestElevationComparator.cs | 5 ++-
11 files changed, 48 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/53ab6713/src/Lucene.Net.Core/Search/FieldComparator.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Search/FieldComparator.cs b/src/Lucene.Net.Core/Search/FieldComparator.cs
index f40d95e..0019688 100644
--- a/src/Lucene.Net.Core/Search/FieldComparator.cs
+++ b/src/Lucene.Net.Core/Search/FieldComparator.cs
@@ -311,10 +311,11 @@ namespace Lucene.Net.Search
/// <summary>
/// Return the actual value in the slot.
+ /// LUCENENET NOTE: This was value(int) in Lucene.
/// </summary>
/// <param name="slot"> the value </param>
/// <returns> value in this slot </returns>
- public abstract IComparable Value(int slot); // LUCENENET TODO: Change to this[int slot] ? or GetValue(int slot) ?
+ public abstract IComparable this[int slot] { get; }
/// <summary>
/// Base FieldComparer class for numeric types
@@ -420,9 +421,9 @@ namespace Lucene.Net.Search
topValue = (sbyte)value;
}
- public override IComparable Value(int slot)
+ public override IComparable this[int slot]
{
- return values[slot];
+ get { return values[slot]; }
}
public override int CompareTop(int doc)
@@ -507,9 +508,9 @@ namespace Lucene.Net.Search
topValue = (double)value;
}
- public override IComparable Value(int slot)
+ public override IComparable this[int slot]
{
- return values[slot];
+ get { return values[slot]; }
}
public override int CompareTop(int doc)
@@ -595,9 +596,9 @@ namespace Lucene.Net.Search
topValue = (float)value;
}
- public override IComparable Value(int slot)
+ public override IComparable this[int slot]
{
- return values[slot];
+ get { return values[slot]; }
}
public override int CompareTop(int doc)
@@ -685,9 +686,9 @@ namespace Lucene.Net.Search
topValue = (short)value;
}
- public override IComparable Value(int slot)
+ public override IComparable this[int slot]
{
- return values[slot];
+ get { return values[slot]; }
}
public override int CompareTop(int doc)
@@ -771,9 +772,9 @@ namespace Lucene.Net.Search
topValue = (int)value;
}
- public override IComparable Value(int slot)
+ public override IComparable this[int slot]
{
- return values[slot];
+ get { return values[slot]; }
}
public override int CompareTop(int doc)
@@ -860,9 +861,9 @@ namespace Lucene.Net.Search
topValue = (long)value;
}
- public override IComparable Value(int slot)
+ public override IComparable this[int slot]
{
- return values[slot];
+ get { return values[slot]; }
}
public override int CompareTop(int doc)
@@ -946,9 +947,9 @@ namespace Lucene.Net.Search
}
}
- public override IComparable Value(int slot)
+ public override IComparable this[int slot]
{
- return Convert.ToSingle(scores[slot]);
+ get { return Convert.ToSingle(scores[slot]); }
}
// Override because we sort reverse of natural Float order:
@@ -1017,9 +1018,9 @@ namespace Lucene.Net.Search
topValue = (int)value;
}
- public override IComparable Value(int slot)
+ public override IComparable this[int slot]
{
- return Convert.ToInt32(docIDs[slot]);
+ get { return Convert.ToInt32(docIDs[slot]); }
}
public override int CompareTop(int doc)
@@ -1297,9 +1298,9 @@ namespace Lucene.Net.Search
//System.out.println("setTopValue " + topValue);
}
- public override IComparable Value(int slot)
+ public override IComparable this[int slot]
{
- return values[slot];
+ get { return values[slot]; }
}
public override int CompareTop(int doc)
@@ -1437,9 +1438,9 @@ namespace Lucene.Net.Search
topValue = (BytesRef)value;
}
- public override IComparable Value(int slot)
+ public override IComparable this[int slot]
{
- return values[slot];
+ get { return values[slot]; }
}
public override int CompareValues(BytesRef val1, BytesRef val2)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/53ab6713/src/Lucene.Net.Core/Search/FieldValueHitQueue.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Search/FieldValueHitQueue.cs b/src/Lucene.Net.Core/Search/FieldValueHitQueue.cs
index ca30b89..c01d2b8 100644
--- a/src/Lucene.Net.Core/Search/FieldValueHitQueue.cs
+++ b/src/Lucene.Net.Core/Search/FieldValueHitQueue.cs
@@ -244,7 +244,7 @@ namespace Lucene.Net.Search
IComparable[] fields = new IComparable[n];
for (int i = 0; i < n; ++i)
{
- fields[i] = m_comparers[i].Value(entry.Slot);
+ fields[i] = m_comparers[i][entry.Slot];
}
//if (maxscore > 1.0f) doc.score /= maxscore; // normalize scores
return new FieldDoc(entry.Doc, entry.Score, fields);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/53ab6713/src/Lucene.Net.Expressions/ExpressionComparator.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Expressions/ExpressionComparator.cs b/src/Lucene.Net.Expressions/ExpressionComparator.cs
index 24abae4..cae906b 100644
--- a/src/Lucene.Net.Expressions/ExpressionComparator.cs
+++ b/src/Lucene.Net.Expressions/ExpressionComparator.cs
@@ -77,9 +77,10 @@ namespace Lucene.Net.Expressions
return this;
}
- public override IComparable Value(int slot)
+ // LUCENENET NOTE: This was value(int) in Lucene.
+ public override IComparable this[int slot]
{
- return (values[slot]);
+ get { return values[slot]; }
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/53ab6713/src/Lucene.Net.Grouping/AbstractFirstPassGroupingCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/AbstractFirstPassGroupingCollector.cs b/src/Lucene.Net.Grouping/AbstractFirstPassGroupingCollector.cs
index 0a2b7ed..750177d 100644
--- a/src/Lucene.Net.Grouping/AbstractFirstPassGroupingCollector.cs
+++ b/src/Lucene.Net.Grouping/AbstractFirstPassGroupingCollector.cs
@@ -140,7 +140,7 @@ namespace Lucene.Net.Search.Grouping
searchGroup.SortValues = new object[sortFieldCount];
for (int sortFieldIDX = 0; sortFieldIDX < sortFieldCount; sortFieldIDX++)
{
- searchGroup.SortValues[sortFieldIDX] = comparers[sortFieldIDX].Value(group.ComparerSlot);
+ searchGroup.SortValues[sortFieldIDX] = comparers[sortFieldIDX][group.ComparerSlot];
}
}
result.Add(searchGroup);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/53ab6713/src/Lucene.Net.Grouping/BlockGroupingCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/BlockGroupingCollector.cs b/src/Lucene.Net.Grouping/BlockGroupingCollector.cs
index e522e41..165f386 100644
--- a/src/Lucene.Net.Grouping/BlockGroupingCollector.cs
+++ b/src/Lucene.Net.Grouping/BlockGroupingCollector.cs
@@ -448,7 +448,7 @@ namespace Lucene.Net.Search.Grouping
groupSortValues = new IComparable[comparers.Length];
for (int sortFieldIDX = 0; sortFieldIDX < comparers.Length; sortFieldIDX++)
{
- groupSortValues[sortFieldIDX] = comparers[sortFieldIDX].Value(og.comparerSlot);
+ groupSortValues[sortFieldIDX] = comparers[sortFieldIDX][og.comparerSlot];
}
}
else
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/53ab6713/src/Lucene.Net.Join/ToParentBlockJoinCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Join/ToParentBlockJoinCollector.cs b/src/Lucene.Net.Join/ToParentBlockJoinCollector.cs
index cbae9ab..46a0e54 100644
--- a/src/Lucene.Net.Join/ToParentBlockJoinCollector.cs
+++ b/src/Lucene.Net.Join/ToParentBlockJoinCollector.cs
@@ -514,7 +514,7 @@ namespace Lucene.Net.Join
groupSortValues = new object[comparers.Length];
for (int sortFieldIdx = 0; sortFieldIdx < comparers.Length; sortFieldIdx++)
{
- groupSortValues[sortFieldIdx] = comparers[sortFieldIdx].Value(og.Slot);
+ groupSortValues[sortFieldIdx] = comparers[sortFieldIdx][og.Slot];
}
}
else
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/53ab6713/src/Lucene.Net.Join/ToParentBlockJoinFieldComparator.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Join/ToParentBlockJoinFieldComparator.cs b/src/Lucene.Net.Join/ToParentBlockJoinFieldComparator.cs
index cdc0f36..5b9d91f 100644
--- a/src/Lucene.Net.Join/ToParentBlockJoinFieldComparator.cs
+++ b/src/Lucene.Net.Join/ToParentBlockJoinFieldComparator.cs
@@ -112,9 +112,10 @@ namespace Lucene.Net.Join
return set;
}
- public override IComparable Value(int slot)
+ // LUCENENET NOTE: This was value(int) in Lucene.
+ public override IComparable this[int slot]
{
- return _wrappedComparer.Value(slot);
+ get { return _wrappedComparer[slot]; }
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/53ab6713/src/Lucene.Net.Misc/Index/Sorter/BlockJoinComparatorSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Misc/Index/Sorter/BlockJoinComparatorSource.cs b/src/Lucene.Net.Misc/Index/Sorter/BlockJoinComparatorSource.cs
index 8e299cf..d2f0fbc 100644
--- a/src/Lucene.Net.Misc/Index/Sorter/BlockJoinComparatorSource.cs
+++ b/src/Lucene.Net.Misc/Index/Sorter/BlockJoinComparatorSource.cs
@@ -192,10 +192,14 @@ namespace Lucene.Net.Index.Sorter
return this;
}
- public override IComparable Value(int slot)
+ // LUCENENET NOTE: This was value(int) in Lucene.
+ public override IComparable this[int slot]
{
- // really our sort "value" is more complex...
- throw new System.NotSupportedException("filling sort field values is not yet supported");
+ get
+ {
+ // really our sort "value" is more complex...
+ throw new System.NotSupportedException("filling sort field values is not yet supported");
+ }
}
public override void SetScorer(Scorer scorer)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/53ab6713/src/Lucene.Net.Queries/Function/ValueSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Function/ValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSource.cs
index f42d71c..55f737d 100644
--- a/src/Lucene.Net.Queries/Function/ValueSource.cs
+++ b/src/Lucene.Net.Queries/Function/ValueSource.cs
@@ -183,9 +183,10 @@ namespace Lucene.Net.Queries.Function
this.topValue = (double)value;
}
- public override IComparable Value(int slot)
+ // LUCENENET NOTE: This was value(int) in Lucene.
+ public override IComparable this[int slot]
{
- return values[slot];
+ get { return values[slot]; }
}
public override int CompareTop(int doc)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/53ab6713/src/Lucene.Net.Tests/core/Search/JustCompileSearch.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/JustCompileSearch.cs b/src/Lucene.Net.Tests/core/Search/JustCompileSearch.cs
index 8d2eb86..c610709 100644
--- a/src/Lucene.Net.Tests/core/Search/JustCompileSearch.cs
+++ b/src/Lucene.Net.Tests/core/Search/JustCompileSearch.cs
@@ -152,9 +152,10 @@ namespace Lucene.Net.Search
throw new System.NotSupportedException(UNSUPPORTED_MSG);
}
- public override IComparable Value(int slot)
+ // LUCENENET NOTE: This was value(int) in Lucene.
+ public override IComparable this[int slot]
{
- throw new System.NotSupportedException(UNSUPPORTED_MSG);
+ get { throw new System.NotSupportedException(UNSUPPORTED_MSG); }
}
public override int CompareTop(int doc)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/53ab6713/src/Lucene.Net.Tests/core/Search/TestElevationComparator.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestElevationComparator.cs b/src/Lucene.Net.Tests/core/Search/TestElevationComparator.cs
index edcd05d..832dc1b 100644
--- a/src/Lucene.Net.Tests/core/Search/TestElevationComparator.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestElevationComparator.cs
@@ -225,9 +225,10 @@ namespace Lucene.Net.Search
return this;
}
- public override IComparable Value(int slot)
+ // LUCENENET NOTE: This was value(int) in Lucene.
+ public override IComparable this[int slot]
{
- return Convert.ToInt32(values[slot]);
+ get { return values[slot]; }
}
public override int CompareTop(int doc)
[3/5] lucenenet git commit: Lucene.Net.Core.Index.Terms refactor:
Renamed Iterator() > GetIterator()
Posted by ni...@apache.org.
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.TestFramework/Util/TestUtil.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/TestUtil.cs b/src/Lucene.Net.TestFramework/Util/TestUtil.cs
index 398e5e0..85ff2d9 100644
--- a/src/Lucene.Net.TestFramework/Util/TestUtil.cs
+++ b/src/Lucene.Net.TestFramework/Util/TestUtil.cs
@@ -1098,7 +1098,7 @@ namespace Lucene.Net.Util
{
return null;
}
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
if (!termsEnum.SeekExact(term))
{
return null;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TestTeeSinkTokenFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TestTeeSinkTokenFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TestTeeSinkTokenFilter.cs
index 781fe0e..161c3b9 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TestTeeSinkTokenFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TestTeeSinkTokenFilter.cs
@@ -116,7 +116,7 @@ namespace Lucene.Net.Analysis.Sinks
IndexReader r = DirectoryReader.Open(dir);
Terms vector = r.GetTermVectors(0).Terms("field");
assertEquals(1, vector.Count);
- TermsEnum termsEnum = vector.Iterator(null);
+ TermsEnum termsEnum = vector.GetIterator(null);
termsEnum.Next();
assertEquals(2, termsEnum.TotalTermFreq);
DocsAndPositionsEnum positions = termsEnum.DocsAndPositions(null, null);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests.Codecs/Pulsing/Test10KPulsings.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Codecs/Pulsing/Test10KPulsings.cs b/src/Lucene.Net.Tests.Codecs/Pulsing/Test10KPulsings.cs
index 1bd88c8..64f66a0 100644
--- a/src/Lucene.Net.Tests.Codecs/Pulsing/Test10KPulsings.cs
+++ b/src/Lucene.Net.Tests.Codecs/Pulsing/Test10KPulsings.cs
@@ -79,7 +79,7 @@ namespace Lucene.Net.Codecs.Pulsing
IndexReader ir = iw.Reader;
iw.Dispose();
- TermsEnum te = MultiFields.GetTerms(ir, "field").Iterator(null);
+ TermsEnum te = MultiFields.GetTerms(ir, "field").GetIterator(null);
DocsEnum de = null;
for (int i = 0; i < 10050; i++)
@@ -151,7 +151,7 @@ namespace Lucene.Net.Codecs.Pulsing
IndexReader ir = iw.Reader;
iw.Dispose();
- TermsEnum te = MultiFields.GetTerms(ir, "field").Iterator(null);
+ TermsEnum te = MultiFields.GetTerms(ir, "field").GetIterator(null);
DocsEnum de = null;
for (int i = 0; i < 10050; i++)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests.Codecs/Pulsing/TestPulsingReuse.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Codecs/Pulsing/TestPulsingReuse.cs b/src/Lucene.Net.Tests.Codecs/Pulsing/TestPulsingReuse.cs
index b6cc5ba..d711b1d 100644
--- a/src/Lucene.Net.Tests.Codecs/Pulsing/TestPulsingReuse.cs
+++ b/src/Lucene.Net.Tests.Codecs/Pulsing/TestPulsingReuse.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.Codecs.Pulsing
AtomicReader segment = GetOnlySegmentReader(ir);
DocsEnum reuse = null;
IDictionary<DocsEnum, bool?> allEnums = new IdentityHashMap<DocsEnum, bool?>();
- TermsEnum te = segment.Terms("foo").Iterator(null);
+ TermsEnum te = segment.Terms("foo").GetIterator(null);
while (te.Next() != null)
{
reuse = te.Docs(null, reuse, DocsEnum.FLAG_NONE);
@@ -60,7 +60,7 @@ namespace Lucene.Net.Codecs.Pulsing
allEnums.Clear();
DocsAndPositionsEnum posReuse = null;
- te = segment.Terms("foo").Iterator(null);
+ te = segment.Terms("foo").GetIterator(null);
while (te.Next() != null)
{
posReuse = te.DocsAndPositions(null, posReuse);
@@ -94,7 +94,7 @@ namespace Lucene.Net.Codecs.Pulsing
AtomicReader segment = GetOnlySegmentReader(ir);
DocsEnum reuse = null;
IDictionary<DocsEnum, bool?> allEnums = new IdentityHashMap<DocsEnum, bool?>();
- TermsEnum te = segment.Terms("foo").Iterator(null);
+ TermsEnum te = segment.Terms("foo").GetIterator(null);
while (te.Next() != null)
{
reuse = te.Docs(null, reuse, DocsEnum.FLAG_NONE);
@@ -105,7 +105,7 @@ namespace Lucene.Net.Codecs.Pulsing
allEnums.Clear();
DocsAndPositionsEnum posReuse = null;
- te = segment.Terms("foo").Iterator(null);
+ te = segment.Terms("foo").GetIterator(null);
while (te.Next() != null)
{
posReuse = te.DocsAndPositions(null, posReuse);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests.Join/TestJoinUtil.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Join/TestJoinUtil.cs b/src/Lucene.Net.Tests.Join/TestJoinUtil.cs
index 5abdec0..274a588 100644
--- a/src/Lucene.Net.Tests.Join/TestJoinUtil.cs
+++ b/src/Lucene.Net.Tests.Join/TestJoinUtil.cs
@@ -717,7 +717,7 @@ namespace Lucene.Net.Tests.Join
joinValues.AddAll(joinValueToJoinScores.Keys);
foreach (BytesRef joinValue in joinValues)
{
- termsEnum = terms.Iterator(termsEnum);
+ termsEnum = terms.GetIterator(termsEnum);
if (termsEnum.SeekExact(joinValue))
{
docsEnum = termsEnum.Docs(slowCompositeReader.LiveDocs, docsEnum, DocsEnum.FLAG_NONE);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs b/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs
index f9469d4..82720b0 100644
--- a/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs
+++ b/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs
@@ -152,8 +152,8 @@ namespace Lucene.Net.Index.Memory
assertEquals(iwTerms.DocCount, memTerms.DocCount);
assertEquals(iwTerms.SumDocFreq, memTerms.SumDocFreq);
assertEquals(iwTerms.SumTotalTermFreq, memTerms.SumTotalTermFreq);
- TermsEnum iwTermsIter = iwTerms.Iterator(null);
- TermsEnum memTermsIter = memTerms.Iterator(null);
+ TermsEnum iwTermsIter = iwTerms.GetIterator(null);
+ TermsEnum memTermsIter = memTerms.GetIterator(null);
if (iwTerms.HasPositions)
{
bool offsets = iwTerms.HasOffsets && memTerms.HasOffsets;
@@ -328,7 +328,7 @@ namespace Lucene.Net.Index.Memory
assertTrue(disi.NextDoc() != DocIdSetIterator.NO_MORE_DOCS);
// now reuse and check again
- TermsEnum te = reader.Terms("foo").Iterator(null);
+ TermsEnum te = reader.Terms("foo").GetIterator(null);
assertTrue(te.SeekExact(new BytesRef("bar")));
disi = te.Docs(null, disi, DocsEnum.FLAG_NONE);
docid = disi.DocID;
@@ -369,7 +369,7 @@ namespace Lucene.Net.Index.Memory
assertEquals(3, disi.EndOffset);
// now reuse and check again
- TermsEnum te = reader.Terms("foo").Iterator(null);
+ TermsEnum te = reader.Terms("foo").GetIterator(null);
assertTrue(te.SeekExact(new BytesRef("bar")));
disi = te.DocsAndPositions(null, disi);
docid = disi.DocID;
@@ -546,8 +546,8 @@ namespace Lucene.Net.Index.Memory
protected void CompareTermVectors(Terms terms, Terms memTerms, string field_name)
{
- TermsEnum termEnum = terms.Iterator(null);
- TermsEnum memTermEnum = memTerms.Iterator(null);
+ TermsEnum termEnum = terms.GetIterator(null);
+ TermsEnum memTermEnum = memTerms.GetIterator(null);
while (termEnum.Next() != null)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs b/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
index 7b56abb..793aaaa 100644
--- a/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
+++ b/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
@@ -245,7 +245,7 @@ namespace Lucene.Net.Index.Sorter
// [Test] // LUCENENET NOTE: For now, we are overriding this test in every subclass to pull it into the right context for the subclass
public virtual void TestDocsAndPositionsEnum()
{
- TermsEnum termsEnum = reader.Terms(DOC_POSITIONS_FIELD).Iterator(null);
+ TermsEnum termsEnum = reader.Terms(DOC_POSITIONS_FIELD).GetIterator(null);
assertEquals(TermsEnum.SeekStatus.FOUND, termsEnum.SeekCeil(new BytesRef(DOC_POSITIONS_TERM)));
DocsAndPositionsEnum sortedPositions = termsEnum.DocsAndPositions(null, null);
int doc;
@@ -326,7 +326,7 @@ namespace Lucene.Net.Index.Sorter
public virtual void TestDocsEnum()
{
IBits mappedLiveDocs = RandomLiveDocs(reader.MaxDoc);
- TermsEnum termsEnum = reader.Terms(DOCS_ENUM_FIELD).Iterator(null);
+ TermsEnum termsEnum = reader.Terms(DOCS_ENUM_FIELD).GetIterator(null);
assertEquals(TermsEnum.SeekStatus.FOUND, termsEnum.SeekCeil(new BytesRef(DOCS_ENUM_TERM)));
DocsEnum docs = termsEnum.Docs(mappedLiveDocs, null);
@@ -431,7 +431,7 @@ namespace Lucene.Net.Index.Sorter
{
Terms terms = reader.GetTermVector(i, TERM_VECTORS_FIELD);
assertNotNull("term vectors not found for doc " + i + " field [" + TERM_VECTORS_FIELD + "]", terms);
- assertEquals("incorrect term vector for doc " + i, sortedValues[i].toString(), terms.Iterator(null).Next().Utf8ToString());
+ assertEquals("incorrect term vector for doc " + i, sortedValues[i].toString(), terms.GetIterator(null).Next().Utf8ToString());
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests.Misc/Index/TestMultiPassIndexSplitter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/Index/TestMultiPassIndexSplitter.cs b/src/Lucene.Net.Tests.Misc/Index/TestMultiPassIndexSplitter.cs
index f949d95..c03719c 100644
--- a/src/Lucene.Net.Tests.Misc/Index/TestMultiPassIndexSplitter.cs
+++ b/src/Lucene.Net.Tests.Misc/Index/TestMultiPassIndexSplitter.cs
@@ -81,7 +81,7 @@ namespace Lucene.Net.Index
assertTrue(ir.NumDocs - NUM_DOCS / 3 <= 1); // rounding error
doc = ir.Document(0);
assertEquals("0", doc.Get("id"));
- te = MultiFields.GetTerms(ir, "id").Iterator(null);
+ te = MultiFields.GetTerms(ir, "id").GetIterator(null);
assertEquals(TermsEnum.SeekStatus.NOT_FOUND, te.SeekCeil(new BytesRef("1")));
assertNotSame("1", te.Term.Utf8ToString());
}
@@ -90,7 +90,7 @@ namespace Lucene.Net.Index
assertTrue(ir.NumDocs - NUM_DOCS / 3 <= 1);
doc = ir.Document(0);
assertEquals("1", doc.Get("id"));
- te = MultiFields.GetTerms(ir, "id").Iterator(null);
+ te = MultiFields.GetTerms(ir, "id").GetIterator(null);
assertEquals(TermsEnum.SeekStatus.NOT_FOUND, te.SeekCeil(new BytesRef("0")));
assertNotSame("0", te.Term.Utf8ToString());
@@ -101,7 +101,7 @@ namespace Lucene.Net.Index
doc = ir.Document(0);
assertEquals("2", doc.Get("id"));
- te = MultiFields.GetTerms(ir, "id").Iterator(null);
+ te = MultiFields.GetTerms(ir, "id").GetIterator(null);
assertEquals(TermsEnum.SeekStatus.NOT_FOUND, te.SeekCeil(new BytesRef("1")));
assertNotSame("1", te.Term);
@@ -156,7 +156,7 @@ namespace Lucene.Net.Index
doc = ir.Document(0);
assertEquals(start + "", doc.Get("id"));
// make sure the deleted doc is not here
- TermsEnum te = MultiFields.GetTerms(ir, "id").Iterator(null);
+ TermsEnum te = MultiFields.GetTerms(ir, "id").GetIterator(null);
Term t = new Term("id", (NUM_DOCS - 1) + "");
assertEquals(TermsEnum.SeekStatus.NOT_FOUND, te.SeekCeil(new BytesRef(t.Text())));
assertNotSame(t.Text(), te.Term.Utf8ToString());
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Analysis/TestMockAnalyzer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Analysis/TestMockAnalyzer.cs b/src/Lucene.Net.Tests/core/Analysis/TestMockAnalyzer.cs
index 72a63f3..d1f429c 100644
--- a/src/Lucene.Net.Tests/core/Analysis/TestMockAnalyzer.cs
+++ b/src/Lucene.Net.Tests/core/Analysis/TestMockAnalyzer.cs
@@ -368,7 +368,7 @@ namespace Lucene.Net.Analysis
AtomicReader reader = GetOnlySegmentReader(writer.Reader);
Fields fields = reader.GetTermVectors(0);
Terms terms = fields.Terms("f");
- TermsEnum te = terms.Iterator(null);
+ TermsEnum te = terms.GetIterator(null);
Assert.AreEqual(new BytesRef("a"), te.Next());
DocsAndPositionsEnum dpe = te.DocsAndPositions(null, null);
Assert.AreEqual(0, dpe.NextDoc());
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Codecs/Compressing/TestCompressingTermVectorsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Compressing/TestCompressingTermVectorsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Compressing/TestCompressingTermVectorsFormat.cs
index a5b5181..1ce3276 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Compressing/TestCompressingTermVectorsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Compressing/TestCompressingTermVectorsFormat.cs
@@ -60,7 +60,7 @@ namespace Lucene.Net.Codecs.Compressing
AtomicReader ir = GetOnlySegmentReader(iw.Reader);
Terms terms = ir.GetTermVector(0, "foo");
Assert.IsNotNull(terms);
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
Assert.AreEqual(TermsEnum.SeekStatus.FOUND, termsEnum.SeekCeil(new BytesRef("this")));
try
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
index e24025d..01fa90f 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
@@ -139,7 +139,7 @@ namespace Lucene.Net.Codecs.Lucene3x
{
Terms terms = fields.Terms(field);
Assert.IsNotNull(terms);
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
BytesRef text;
BytesRef lastText = null;
while ((text = termsEnum.Next()) != null)
@@ -202,7 +202,7 @@ namespace Lucene.Net.Codecs.Lucene3x
TermsEnum te;
if (!tes.TryGetValue(field, out te))
{
- te = MultiFields.GetTerms(reader, field).Iterator(null);
+ te = MultiFields.GetTerms(reader, field).GetIterator(null);
tes[field] = te;
}
@@ -278,7 +278,7 @@ namespace Lucene.Net.Codecs.Lucene3x
TermsEnum te;
if (!tes.TryGetValue(field, out te))
{
- te = MultiFields.GetTerms(reader, field).Iterator(null);
+ te = MultiFields.GetTerms(reader, field).GetIterator(null);
tes[field] = te;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
index dd48238..f6aa8a8 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
@@ -171,7 +171,7 @@ namespace Lucene.Net.Codecs.Lucene3x
{
Terms terms = fields.Terms(field);
Assert.IsNotNull(terms);
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
while (termsEnum.Next() != null)
{
if (sample.Count >= size)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
index 0c576c5..556a013 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
@@ -71,7 +71,7 @@ namespace Lucene.Net.Codecs.Lucene40
{
AtomicReader indexReader = (AtomicReader)ctx.Reader;
Terms terms = indexReader.Terms("body");
- TermsEnum iterator = terms.Iterator(null);
+ TermsEnum iterator = terms.GetIterator(null);
IdentityHashMap<DocsEnum, bool?> enums = new IdentityHashMap<DocsEnum, bool?>();
MatchNoBits bits = new MatchNoBits(indexReader.MaxDoc);
while ((iterator.Next()) != null)
@@ -100,7 +100,7 @@ namespace Lucene.Net.Codecs.Lucene40
foreach (AtomicReaderContext ctx in open.Leaves)
{
Terms terms = ((AtomicReader)ctx.Reader).Terms("body");
- TermsEnum iterator = terms.Iterator(null);
+ TermsEnum iterator = terms.GetIterator(null);
IdentityHashMap<DocsEnum, bool?> enums = new IdentityHashMap<DocsEnum, bool?>();
MatchNoBits bits = new MatchNoBits(open.MaxDoc);
DocsEnum docs = null;
@@ -112,7 +112,7 @@ namespace Lucene.Net.Codecs.Lucene40
Assert.AreEqual(1, enums.Count);
enums.Clear();
- iterator = terms.Iterator(null);
+ iterator = terms.GetIterator(null);
docs = null;
while ((iterator.Next()) != null)
{
@@ -122,7 +122,7 @@ namespace Lucene.Net.Codecs.Lucene40
Assert.AreEqual(terms.Count, enums.Count);
enums.Clear();
- iterator = terms.Iterator(null);
+ iterator = terms.GetIterator(null);
docs = null;
while ((iterator.Next()) != null)
{
@@ -156,10 +156,10 @@ namespace Lucene.Net.Codecs.Lucene40
foreach (AtomicReaderContext ctx in leaves)
{
Terms terms = ((AtomicReader)ctx.Reader).Terms("body");
- TermsEnum iterator = terms.Iterator(null);
+ TermsEnum iterator = terms.GetIterator(null);
IdentityHashMap<DocsEnum, bool?> enums = new IdentityHashMap<DocsEnum, bool?>();
MatchNoBits bits = new MatchNoBits(firstReader.MaxDoc);
- iterator = terms.Iterator(null);
+ iterator = terms.GetIterator(null);
DocsEnum docs = null;
BytesRef term = null;
while ((term = iterator.Next()) != null)
@@ -169,7 +169,7 @@ namespace Lucene.Net.Codecs.Lucene40
}
Assert.AreEqual(terms.Count, enums.Count);
- iterator = terms.Iterator(null);
+ iterator = terms.GetIterator(null);
enums.Clear();
docs = null;
while ((term = iterator.Next()) != null)
@@ -194,7 +194,7 @@ namespace Lucene.Net.Codecs.Lucene40
{
return null;
}
- TermsEnum iterator = terms.Iterator(null);
+ TermsEnum iterator = terms.GetIterator(null);
if (iterator.SeekExact(term))
{
return iterator.Docs(bits, null, Random().NextBoolean() ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestBlockPostingsFormat3.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestBlockPostingsFormat3.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestBlockPostingsFormat3.cs
index f9cdc88..1e14bba 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestBlockPostingsFormat3.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestBlockPostingsFormat3.cs
@@ -205,8 +205,8 @@ namespace Lucene.Net.Codecs.Lucene41
// NOTE: we don't assert hasOffsets/hasPositions/hasPayloads because they are allowed to be different
- TermsEnum leftTermsEnum = leftTerms.Iterator(null);
- TermsEnum rightTermsEnum = rightTerms.Iterator(null);
+ TermsEnum leftTermsEnum = leftTerms.GetIterator(null);
+ TermsEnum rightTermsEnum = rightTerms.GetIterator(null);
AssertTermsEnum(leftTermsEnum, rightTermsEnum, true);
AssertTermsSeeking(leftTerms, rightTerms);
@@ -243,7 +243,7 @@ namespace Lucene.Net.Codecs.Lucene41
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)
{
@@ -279,8 +279,8 @@ namespace Lucene.Net.Codecs.Lucene41
foreach (BytesRef b in shuffledTests)
{
- leftEnum = leftTerms.Iterator(leftEnum);
- rightEnum = rightTerms.Iterator(rightEnum);
+ leftEnum = leftTerms.GetIterator(leftEnum);
+ rightEnum = rightTerms.GetIterator(rightEnum);
Assert.AreEqual(leftEnum.SeekExact(b), rightEnum.SeekExact(b));
Assert.AreEqual(leftEnum.SeekExact(b), rightEnum.SeekExact(b));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Document/TestDocument.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Document/TestDocument.cs b/src/Lucene.Net.Tests/core/Document/TestDocument.cs
index 0f30dc4..3e51b12 100644
--- a/src/Lucene.Net.Tests/core/Document/TestDocument.cs
+++ b/src/Lucene.Net.Tests/core/Document/TestDocument.cs
@@ -409,7 +409,7 @@ namespace Lucene.Net.Documents
Terms tvs = tvFields.Terms(field);
Assert.IsNotNull(tvs);
Assert.AreEqual(2, tvs.Count);
- TermsEnum tvsEnum = tvs.Iterator(null);
+ TermsEnum tvsEnum = tvs.GetIterator(null);
Assert.AreEqual(new BytesRef("abc"), tvsEnum.Next());
DocsAndPositionsEnum dpEnum = tvsEnum.DocsAndPositions(null, null);
if (field.Equals("tv"))
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/Test2BTerms.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/Test2BTerms.cs b/src/Lucene.Net.Tests/core/Index/Test2BTerms.cs
index bb15720..3111892 100644
--- a/src/Lucene.Net.Tests/core/Index/Test2BTerms.cs
+++ b/src/Lucene.Net.Tests/core/Index/Test2BTerms.cs
@@ -260,7 +260,7 @@ namespace Lucene.Net.Index
private IList<BytesRef> FindTerms(IndexReader r)
{
Console.WriteLine("TEST: findTerms");
- TermsEnum termsEnum = MultiFields.GetTerms(r, "field").Iterator(null);
+ TermsEnum termsEnum = MultiFields.GetTerms(r, "field").GetIterator(null);
IList<BytesRef> savedTerms = new List<BytesRef>();
int nextSave = TestUtil.NextInt(Random(), 500000, 1000000);
BytesRef term;
@@ -281,7 +281,7 @@ namespace Lucene.Net.Index
Console.WriteLine("TEST: run " + terms.Count + " terms on reader=" + r);
IndexSearcher s = NewSearcher(r);
terms = CollectionsHelper.Shuffle(terms);
- TermsEnum termsEnum = MultiFields.GetTerms(r, "field").Iterator(null);
+ TermsEnum termsEnum = MultiFields.GetTerms(r, "field").GetIterator(null);
bool failed = false;
for (int iter = 0; iter < 10 * terms.Count; iter++)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs b/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs
index 0ca5bf9..33c858a 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs
@@ -787,7 +787,7 @@ namespace Lucene.Net.Index
{
Directory dir = OldIndexDirs[name];
IndexReader r = DirectoryReader.Open(dir);
- TermsEnum terms = MultiFields.GetFields(r).Terms("content").Iterator(null);
+ TermsEnum terms = MultiFields.GetFields(r).Terms("content").GetIterator(null);
BytesRef t = terms.Next();
Assert.IsNotNull(t);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs b/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
index 50e8b43..8f27199 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
@@ -744,7 +744,7 @@ namespace Lucene.Net.Index
{
Directory dir = OldIndexDirs[name];
IndexReader r = DirectoryReader.Open(dir);
- TermsEnum terms = MultiFields.GetFields(r).Terms("content").Iterator(null);
+ TermsEnum terms = MultiFields.GetFields(r).Terms("content").GetIterator(null);
BytesRef t = terms.Next();
Assert.IsNotNull(t);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestBagOfPositions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestBagOfPositions.cs b/src/Lucene.Net.Tests/core/Index/TestBagOfPositions.cs
index 4797fb4..782b24c 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBagOfPositions.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBagOfPositions.cs
@@ -136,7 +136,7 @@ namespace Lucene.Net.Index
Terms terms = air.Terms("field");
// numTerms-1 because there cannot be a term 0 with 0 postings:
Assert.AreEqual(numTerms - 1, terms.Count);
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
BytesRef termBR;
while ((termBR = termsEnum.Next()) != null)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestBagOfPostings.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestBagOfPostings.cs b/src/Lucene.Net.Tests/core/Index/TestBagOfPostings.cs
index 607961b..f8f6c5f 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBagOfPostings.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBagOfPostings.cs
@@ -117,7 +117,7 @@ namespace Lucene.Net.Index
{
Assert.AreEqual(numTerms - 1, terms.Count);
}
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
BytesRef term_;
while ((term_ = termsEnum.Next()) != null)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestCodecs.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestCodecs.cs b/src/Lucene.Net.Tests/core/Index/TestCodecs.cs
index 4247869..f9b4b68 100644
--- a/src/Lucene.Net.Tests/core/Index/TestCodecs.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestCodecs.cs
@@ -407,7 +407,7 @@ namespace Lucene.Net.Index
Terms terms2 = reader.Terms(fieldName);
Assert.IsNotNull(terms2);
- TermsEnum termsEnum = terms2.Iterator(null);
+ TermsEnum termsEnum = terms2.GetIterator(null);
DocsEnum docsEnum = null;
for (int i = 0; i < NUM_TERMS; i++)
@@ -629,7 +629,7 @@ namespace Lucene.Net.Index
for (int iter = 0; iter < NUM_TEST_ITER; iter++)
{
FieldData field = Fields[Random().Next(Fields.Length)];
- TermsEnum termsEnum = TermsDict.Terms(field.FieldInfo.Name).Iterator(null);
+ TermsEnum termsEnum = TermsDict.Terms(field.FieldInfo.Name).GetIterator(null);
#pragma warning disable 612, 618
if (Si.Codec is Lucene3xCodec)
#pragma warning restore 612, 618
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs b/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
index 39a094d..ee4a8b6 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
@@ -99,11 +99,11 @@ namespace Lucene.Net.Index
MultiReader mr3 = new MultiReader(readers2);
// test mixing up TermDocs and TermEnums from different readers.
- TermsEnum te2 = MultiFields.GetTerms(mr2, "body").Iterator(null);
+ TermsEnum te2 = MultiFields.GetTerms(mr2, "body").GetIterator(null);
te2.SeekCeil(new BytesRef("wow"));
DocsEnum td = TestUtil.Docs(Random(), mr2, "body", te2.Term, MultiFields.GetLiveDocs(mr2), null, 0);
- TermsEnum te3 = MultiFields.GetTerms(mr3, "body").Iterator(null);
+ TermsEnum te3 = MultiFields.GetTerms(mr3, "body").GetIterator(null);
te3.SeekCeil(new BytesRef("wow"));
td = TestUtil.Docs(Random(), te3, MultiFields.GetLiveDocs(mr3), td, 0);
@@ -668,11 +668,11 @@ namespace Lucene.Net.Index
Assert.IsNull(fields2.Terms(field1));
continue;
}
- TermsEnum enum1 = terms1.Iterator(null);
+ TermsEnum enum1 = terms1.GetIterator(null);
Terms terms2 = fields2.Terms(field1);
Assert.IsNotNull(terms2);
- TermsEnum enum2 = terms2.Iterator(null);
+ TermsEnum enum2 = terms2.GetIterator(null);
while (enum1.Next() != null)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestDoc.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDoc.cs b/src/Lucene.Net.Tests/core/Index/TestDoc.cs
index 763a439..482c3ec 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDoc.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDoc.cs
@@ -249,7 +249,7 @@ namespace Lucene.Net.Index
{
Terms terms = fields.Terms(field);
Assert.IsNotNull(terms);
- TermsEnum tis = terms.Iterator(null);
+ TermsEnum tis = terms.GetIterator(null);
while (tis.Next() != null)
{
@out.Write(" term=" + field + ":" + tis.Term);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestDocCount.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDocCount.cs b/src/Lucene.Net.Tests/core/Index/TestDocCount.cs
index 025c31f..6322786 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDocCount.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDocCount.cs
@@ -85,7 +85,7 @@ namespace Lucene.Net.Index
}
int docCount = terms.DocCount;
FixedBitSet visited = new FixedBitSet(ir.MaxDoc);
- TermsEnum te = terms.Iterator(null);
+ TermsEnum te = terms.GetIterator(null);
while (te.Next() != null)
{
DocsEnum de = TestUtil.Docs(Random(), te, null, null, DocsEnum.FLAG_NONE);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestDocTermOrds.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDocTermOrds.cs b/src/Lucene.Net.Tests/core/Index/TestDocTermOrds.cs
index ba073b8..599402b 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDocTermOrds.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDocTermOrds.cs
@@ -353,7 +353,7 @@ namespace Lucene.Net.Index
{
Console.WriteLine("TEST: verify prefix=" + (prefixRef == null ? "null" : prefixRef.Utf8ToString()));
Console.WriteLine("TEST: all TERMS:");
- TermsEnum allTE = MultiFields.GetTerms(r, "field").Iterator(null);
+ TermsEnum allTE = MultiFields.GetTerms(r, "field").GetIterator(null);
int ord = 0;
while (allTE.Next() != null)
{
@@ -374,7 +374,7 @@ namespace Lucene.Net.Index
Terms terms = MultiFields.GetTerms(r, "field");
if (terms != null)
{
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
TermsEnum.SeekStatus result = termsEnum.SeekCeil(prefixRef);
if (result != TermsEnum.SeekStatus.END)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestDocsAndPositions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDocsAndPositions.cs b/src/Lucene.Net.Tests/core/Index/TestDocsAndPositions.cs
index 1efdf21..03ba737 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDocsAndPositions.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDocsAndPositions.cs
@@ -105,7 +105,7 @@ namespace Lucene.Net.Index
Terms terms = reader.Terms(FieldName);
if (terms != null)
{
- TermsEnum te = terms.Iterator(null);
+ TermsEnum te = terms.GetIterator(null);
if (te.SeekExact(bytes))
{
return te.DocsAndPositions(liveDocs, null);
@@ -389,7 +389,7 @@ namespace Lucene.Net.Index
Assert.IsTrue(disi.NextDoc() != DocIdSetIterator.NO_MORE_DOCS);
// now reuse and check again
- TermsEnum te = r.Terms("foo").Iterator(null);
+ TermsEnum te = r.Terms("foo").GetIterator(null);
Assert.IsTrue(te.SeekExact(new BytesRef("bar")));
disi = TestUtil.Docs(Random(), te, null, disi, DocsEnum.FLAG_NONE);
docid = disi.DocID;
@@ -416,7 +416,7 @@ namespace Lucene.Net.Index
Assert.IsTrue(disi.NextDoc() != DocIdSetIterator.NO_MORE_DOCS);
// now reuse and check again
- TermsEnum te = r.Terms("foo").Iterator(null);
+ TermsEnum te = r.Terms("foo").GetIterator(null);
Assert.IsTrue(te.SeekExact(new BytesRef("bar")));
disi = te.DocsAndPositions(null, disi);
docid = disi.DocID;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestFilterAtomicReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestFilterAtomicReader.cs b/src/Lucene.Net.Tests/core/Index/TestFilterAtomicReader.cs
index 66ec6f2..ff95c85 100644
--- a/src/Lucene.Net.Tests/core/Index/TestFilterAtomicReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestFilterAtomicReader.cs
@@ -61,9 +61,9 @@ namespace Lucene.Net.Index
{
}
- public override TermsEnum Iterator(TermsEnum reuse)
+ public override TermsEnum GetIterator(TermsEnum reuse)
{
- return new TestTermsEnum(base.Iterator(reuse));
+ return new TestTermsEnum(base.GetIterator(reuse));
}
}
@@ -167,7 +167,7 @@ namespace Lucene.Net.Index
reader.Dispose();
reader = DirectoryReader.Open(target);
- TermsEnum terms = MultiFields.GetTerms(reader, "default").Iterator(null);
+ TermsEnum terms = MultiFields.GetTerms(reader, "default").GetIterator(null);
while (terms.Next() != null)
{
Assert.IsTrue(terms.Term.Utf8ToString().IndexOf('e') != -1);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestFlex.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestFlex.cs b/src/Lucene.Net.Tests/core/Index/TestFlex.cs
index 30fdf7b..4c6a924 100644
--- a/src/Lucene.Net.Tests/core/Index/TestFlex.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestFlex.cs
@@ -61,7 +61,7 @@ namespace Lucene.Net.Index
IndexReader r = w.Reader;
- TermsEnum terms = MultiFields.GetTerms(r, "field3").Iterator(null);
+ TermsEnum terms = MultiFields.GetTerms(r, "field3").GetIterator(null);
Assert.AreEqual(TermsEnum.SeekStatus.END, terms.SeekCeil(new BytesRef("abc")));
r.Dispose();
}
@@ -80,7 +80,7 @@ namespace Lucene.Net.Index
w.AddDocument(doc);
w.ForceMerge(1);
DirectoryReader r = w.Reader;
- TermsEnum terms = GetOnlySegmentReader(r).Fields.Terms("f").Iterator(null);
+ TermsEnum terms = GetOnlySegmentReader(r).Fields.Terms("f").GetIterator(null);
Assert.IsTrue(terms.Next() != null);
try
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
index 5810adf..b2d5535 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
@@ -917,7 +917,7 @@ namespace Lucene.Net.Index
writer.Dispose();
DirectoryReader reader = DirectoryReader.Open(dir);
AtomicReader subreader = GetOnlySegmentReader(reader);
- TermsEnum te = subreader.Fields.Terms("").Iterator(null);
+ TermsEnum te = subreader.Fields.Terms("").GetIterator(null);
Assert.AreEqual(new BytesRef("a"), te.Next());
Assert.AreEqual(new BytesRef("b"), te.Next());
Assert.AreEqual(new BytesRef("c"), te.Next());
@@ -940,7 +940,7 @@ namespace Lucene.Net.Index
writer.Dispose();
DirectoryReader reader = DirectoryReader.Open(dir);
AtomicReader subreader = GetOnlySegmentReader(reader);
- TermsEnum te = subreader.Fields.Terms("").Iterator(null);
+ TermsEnum te = subreader.Fields.Terms("").GetIterator(null);
Assert.AreEqual(new BytesRef(""), te.Next());
Assert.AreEqual(new BytesRef("a"), te.Next());
Assert.AreEqual(new BytesRef("b"), te.Next());
@@ -1078,7 +1078,7 @@ namespace Lucene.Net.Index
IndexReader r = DirectoryReader.Open(dir);
Terms tpv = r.GetTermVectors(0).Terms("field");
- TermsEnum termsEnum = tpv.Iterator(null);
+ TermsEnum termsEnum = tpv.GetIterator(null);
Assert.IsNotNull(termsEnum.Next());
DocsAndPositionsEnum dpEnum = termsEnum.DocsAndPositions(null, null);
Assert.IsNotNull(dpEnum);
@@ -1582,7 +1582,7 @@ namespace Lucene.Net.Index
w.AddDocument(d);
AtomicReader r = GetOnlySegmentReader(w.Reader);
- TermsEnum t = r.Fields.Terms("field").Iterator(null);
+ TermsEnum t = r.Fields.Terms("field").GetIterator(null);
int count = 0;
while (t.Next() != null)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestIndexWriterUnicode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterUnicode.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterUnicode.cs
index 0e4862b..251f05d 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterUnicode.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterUnicode.cs
@@ -149,7 +149,7 @@ namespace Lucene.Net.Index
private void CheckTermsOrder(IndexReader r, ISet<string> allTerms, bool isTop)
{
- TermsEnum terms = MultiFields.GetFields(r).Terms("f").Iterator(null);
+ TermsEnum terms = MultiFields.GetFields(r).Terms("f").GetIterator(null);
BytesRef last = new BytesRef();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs b/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
index 68986a0..a3d76b0 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexableField.cs
@@ -320,7 +320,7 @@ namespace Lucene.Net.Index
{
Terms tfv = r.GetTermVectors(docID).Terms(name);
Assert.IsNotNull(tfv);
- TermsEnum termsEnum = tfv.Iterator(null);
+ TermsEnum termsEnum = tfv.GetIterator(null);
Assert.AreEqual(new BytesRef("" + counter), termsEnum.Next());
Assert.AreEqual(1, termsEnum.TotalTermFreq);
DocsAndPositionsEnum dpEnum = termsEnum.DocsAndPositions(null, null);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestParallelTermEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestParallelTermEnum.cs b/src/Lucene.Net.Tests/core/Index/TestParallelTermEnum.cs
index f57dc3b..db90e9f 100644
--- a/src/Lucene.Net.Tests/core/Index/TestParallelTermEnum.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestParallelTermEnum.cs
@@ -81,7 +81,7 @@ namespace Lucene.Net.Index
private void CheckTerms(Terms terms, IBits liveDocs, params string[] termsList)
{
Assert.IsNotNull(terms);
- TermsEnum te = terms.Iterator(null);
+ TermsEnum te = terms.GetIterator(null);
foreach (string t in termsList)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestPayloads.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestPayloads.cs b/src/Lucene.Net.Tests/core/Index/TestPayloads.cs
index 6278405..e1798f6 100644
--- a/src/Lucene.Net.Tests/core/Index/TestPayloads.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestPayloads.cs
@@ -493,7 +493,7 @@ namespace Lucene.Net.Index
}
writer.Dispose();
IndexReader reader = DirectoryReader.Open(dir);
- TermsEnum terms = MultiFields.GetFields(reader).Terms(field).Iterator(null);
+ TermsEnum terms = MultiFields.GetFields(reader).Terms(field).GetIterator(null);
IBits liveDocs = MultiFields.GetLiveDocs(reader);
DocsAndPositionsEnum tp = null;
while (terms.Next() != null)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestPayloadsOnVectors.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestPayloadsOnVectors.cs b/src/Lucene.Net.Tests/core/Index/TestPayloadsOnVectors.cs
index b2dec2a..81d8863 100644
--- a/src/Lucene.Net.Tests/core/Index/TestPayloadsOnVectors.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestPayloadsOnVectors.cs
@@ -79,7 +79,7 @@ namespace Lucene.Net.Index
DirectoryReader reader = writer.Reader;
Terms terms = reader.GetTermVector(1, "field");
Debug.Assert(terms != null);
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
Assert.IsTrue(termsEnum.SeekExact(new BytesRef("withPayload")));
DocsAndPositionsEnum de = termsEnum.DocsAndPositions(null, null);
Assert.AreEqual(0, de.NextDoc());
@@ -124,7 +124,7 @@ namespace Lucene.Net.Index
DirectoryReader reader = writer.Reader;
Terms terms = reader.GetTermVector(0, "field");
Debug.Assert(terms != null);
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
Assert.IsTrue(termsEnum.SeekExact(new BytesRef("withPayload")));
DocsAndPositionsEnum de = termsEnum.DocsAndPositions(null, null);
Assert.AreEqual(0, de.NextDoc());
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestPerSegmentDeletes.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestPerSegmentDeletes.cs b/src/Lucene.Net.Tests/core/Index/TestPerSegmentDeletes.cs
index 6ac74af..a665696 100644
--- a/src/Lucene.Net.Tests/core/Index/TestPerSegmentDeletes.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestPerSegmentDeletes.cs
@@ -246,7 +246,7 @@ namespace Lucene.Net.Index
{
Fields fields = MultiFields.GetFields(reader);
Terms cterms = fields.Terms(term.Field);
- TermsEnum ctermsEnum = cterms.Iterator(null);
+ TermsEnum ctermsEnum = cterms.GetIterator(null);
if (ctermsEnum.SeekExact(new BytesRef(term.Text())))
{
DocsEnum docsEnum = TestUtil.Docs(Random(), ctermsEnum, bits, null, DocsEnum.FLAG_NONE);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestPostingsOffsets.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestPostingsOffsets.cs b/src/Lucene.Net.Tests/core/Index/TestPostingsOffsets.cs
index edf670c..f09a50c 100644
--- a/src/Lucene.Net.Tests/core/Index/TestPostingsOffsets.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestPostingsOffsets.cs
@@ -327,7 +327,7 @@ namespace Lucene.Net.Index
// TODO: improve this
AtomicReader sub = (AtomicReader)ctx.Reader;
//System.out.println("\nsub=" + sub);
- TermsEnum termsEnum = sub.Fields.Terms("content").Iterator(null);
+ TermsEnum termsEnum = sub.Fields.Terms("content").GetIterator(null);
DocsEnum docs = null;
DocsAndPositionsEnum docsAndPositions = null;
DocsAndPositionsEnum docsAndPositionsAndOffsets = null;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestSegmentMerger.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestSegmentMerger.cs b/src/Lucene.Net.Tests/core/Index/TestSegmentMerger.cs
index 0cd5a7d..f73c270 100644
--- a/src/Lucene.Net.Tests/core/Index/TestSegmentMerger.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestSegmentMerger.cs
@@ -131,7 +131,7 @@ namespace Lucene.Net.Index
Terms vector = mergedReader.GetTermVectors(0).Terms(DocHelper.TEXT_FIELD_2_KEY);
Assert.IsNotNull(vector);
Assert.AreEqual(3, vector.Count);
- TermsEnum termsEnum = vector.Iterator(null);
+ TermsEnum termsEnum = vector.GetIterator(null);
int i = 0;
while (termsEnum.Next() != null)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestSegmentReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestSegmentReader.cs b/src/Lucene.Net.Tests/core/Index/TestSegmentReader.cs
index 5820321..effcd5c 100644
--- a/src/Lucene.Net.Tests/core/Index/TestSegmentReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestSegmentReader.cs
@@ -142,7 +142,7 @@ namespace Lucene.Net.Index
{
Terms terms = fields.Terms(field);
Assert.IsNotNull(terms);
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
while (termsEnum.Next() != null)
{
BytesRef term = termsEnum.Term;
@@ -211,7 +211,7 @@ namespace Lucene.Net.Index
Terms result = Reader.GetTermVectors(0).Terms(DocHelper.TEXT_FIELD_2_KEY);
Assert.IsNotNull(result);
Assert.AreEqual(3, result.Count);
- TermsEnum termsEnum = result.Iterator(null);
+ TermsEnum termsEnum = result.GetIterator(null);
while (termsEnum.Next() != null)
{
string term = termsEnum.Term.Utf8ToString();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestSegmentTermDocs.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestSegmentTermDocs.cs b/src/Lucene.Net.Tests/core/Index/TestSegmentTermDocs.cs
index ad07a66..dc8d8a9 100644
--- a/src/Lucene.Net.Tests/core/Index/TestSegmentTermDocs.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestSegmentTermDocs.cs
@@ -73,7 +73,7 @@ namespace Lucene.Net.Index
Assert.IsTrue(reader != null);
Assert.AreEqual(indexDivisor, reader.TermInfosIndexDivisor);
- TermsEnum terms = reader.Fields.Terms(DocHelper.TEXT_FIELD_2_KEY).Iterator(null);
+ TermsEnum terms = reader.Fields.Terms(DocHelper.TEXT_FIELD_2_KEY).GetIterator(null);
terms.SeekCeil(new BytesRef("field"));
DocsEnum termDocs = TestUtil.Docs(Random(), terms, reader.LiveDocs, null, DocsEnum.FLAG_FREQS);
if (termDocs.NextDoc() != DocIdSetIterator.NO_MORE_DOCS)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestSegmentTermEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestSegmentTermEnum.cs b/src/Lucene.Net.Tests/core/Index/TestSegmentTermEnum.cs
index e43bc9b..e6bdca3 100644
--- a/src/Lucene.Net.Tests/core/Index/TestSegmentTermEnum.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestSegmentTermEnum.cs
@@ -86,7 +86,7 @@ namespace Lucene.Net.Index
AddDoc(writer, "aaa bbb");
writer.Dispose();
SegmentReader reader = GetOnlySegmentReader(DirectoryReader.Open(Dir));
- TermsEnum terms = reader.Fields.Terms("content").Iterator(null);
+ TermsEnum terms = reader.Fields.Terms("content").GetIterator(null);
Assert.IsNotNull(terms.Next());
Assert.AreEqual("aaa", terms.Term.Utf8ToString());
Assert.IsNotNull(terms.Next());
@@ -114,7 +114,7 @@ namespace Lucene.Net.Index
private void VerifyDocFreq()
{
IndexReader reader = DirectoryReader.Open(Dir);
- TermsEnum termEnum = MultiFields.GetTerms(reader, "content").Iterator(null);
+ TermsEnum termEnum = MultiFields.GetTerms(reader, "content").GetIterator(null);
// create enumeration of all terms
// go to the first term (aaa)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestStressAdvance.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestStressAdvance.cs b/src/Lucene.Net.Tests/core/Index/TestStressAdvance.cs
index 9215dc8..aeefc90 100644
--- a/src/Lucene.Net.Tests/core/Index/TestStressAdvance.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestStressAdvance.cs
@@ -91,7 +91,7 @@ namespace Lucene.Net.Index
bDocIDs.Add(docID);
}
}
- TermsEnum te = GetOnlySegmentReader(r).Fields.Terms("field").Iterator(null);
+ TermsEnum te = GetOnlySegmentReader(r).Fields.Terms("field").GetIterator(null);
DocsEnum de = null;
for (int iter2 = 0; iter2 < 10; iter2++)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs b/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
index 77d6e8f..489c913 100644
--- a/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
@@ -372,7 +372,7 @@ namespace Lucene.Net.Index
Assert.IsTrue(MultiFields.GetFields(r2) == null || MultiFields.GetFields(r2).Terms(idField) == null);
return;
}
- TermsEnum termsEnum = terms1.Iterator(null);
+ TermsEnum termsEnum = terms1.GetIterator(null);
IBits liveDocs1 = MultiFields.GetLiveDocs(r1);
IBits liveDocs2 = MultiFields.GetLiveDocs(r2);
@@ -395,7 +395,7 @@ namespace Lucene.Net.Index
return;
}
Terms terms2 = fields.Terms(idField);
- TermsEnum termsEnum2 = terms2.Iterator(null);
+ TermsEnum termsEnum2 = terms2.GetIterator(null);
DocsEnum termDocs1 = null;
DocsEnum termDocs2 = null;
@@ -467,7 +467,7 @@ namespace Lucene.Net.Index
Console.WriteLine(" " + field + ":");
Terms terms3 = tv1.Terms(field);
Assert.IsNotNull(terms3);
- TermsEnum termsEnum3 = terms3.Iterator(null);
+ TermsEnum termsEnum3 = terms3.GetIterator(null);
BytesRef term2;
while ((term2 = termsEnum3.Next()) != null)
{
@@ -506,7 +506,7 @@ namespace Lucene.Net.Index
Console.WriteLine(" " + field + ":");
Terms terms3 = tv2.Terms(field);
Assert.IsNotNull(terms3);
- TermsEnum termsEnum3 = terms3.Iterator(null);
+ TermsEnum termsEnum3 = terms3.GetIterator(null);
BytesRef term2;
while ((term2 = termsEnum3.Next()) != null)
{
@@ -577,7 +577,7 @@ namespace Lucene.Net.Index
{
continue;
}
- termsEnum1 = terms.Iterator(null);
+ termsEnum1 = terms.GetIterator(null);
}
term1 = termsEnum1.Next();
if (term1 == null)
@@ -619,7 +619,7 @@ namespace Lucene.Net.Index
{
continue;
}
- termsEnum2 = terms.Iterator(null);
+ termsEnum2 = terms.GetIterator(null);
}
term2 = termsEnum2.Next();
if (term2 == null)
@@ -717,11 +717,11 @@ namespace Lucene.Net.Index
Terms terms1 = d1.Terms(field1);
Assert.IsNotNull(terms1);
- TermsEnum termsEnum1 = terms1.Iterator(null);
+ TermsEnum termsEnum1 = terms1.GetIterator(null);
Terms terms2 = d2.Terms(field2);
Assert.IsNotNull(terms2);
- TermsEnum termsEnum2 = terms2.Iterator(null);
+ TermsEnum termsEnum2 = terms2.GetIterator(null);
DocsAndPositionsEnum dpEnum1 = null;
DocsAndPositionsEnum dpEnum2 = null;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestSumDocFreq.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestSumDocFreq.cs b/src/Lucene.Net.Tests/core/Index/TestSumDocFreq.cs
index 63b07e6..c18ef01 100644
--- a/src/Lucene.Net.Tests/core/Index/TestSumDocFreq.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestSumDocFreq.cs
@@ -100,7 +100,7 @@ namespace Lucene.Net.Index
}
long computedSumDocFreq = 0;
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
while (termsEnum.Next() != null)
{
computedSumDocFreq += termsEnum.DocFreq;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestTermVectorsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestTermVectorsReader.cs b/src/Lucene.Net.Tests/core/Index/TestTermVectorsReader.cs
index cb39326..694005c 100644
--- a/src/Lucene.Net.Tests/core/Index/TestTermVectorsReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestTermVectorsReader.cs
@@ -250,7 +250,7 @@ namespace Lucene.Net.Index
Terms vector = reader.Get(j).Terms(TestFields[0]);
Assert.IsNotNull(vector);
Assert.AreEqual(TestTerms.Length, vector.Count);
- TermsEnum termsEnum = vector.Iterator(null);
+ TermsEnum termsEnum = vector.GetIterator(null);
for (int i = 0; i < TestTerms.Length; i++)
{
BytesRef text = termsEnum.Next();
@@ -273,7 +273,7 @@ namespace Lucene.Net.Index
Terms vector = reader.Get(j).Terms(TestFields[0]);
Assert.IsNotNull(vector);
Assert.AreEqual(TestTerms.Length, vector.Count);
- TermsEnum termsEnum = vector.Iterator(null);
+ TermsEnum termsEnum = vector.GetIterator(null);
DocsEnum docsEnum = null;
for (int i = 0; i < TestTerms.Length; i++)
{
@@ -303,7 +303,7 @@ namespace Lucene.Net.Index
Terms vector = reader.Get(0).Terms(TestFields[0]);
Assert.IsNotNull(vector);
Assert.AreEqual(TestTerms.Length, vector.Count);
- TermsEnum termsEnum = vector.Iterator(null);
+ TermsEnum termsEnum = vector.GetIterator(null);
DocsAndPositionsEnum dpEnum = null;
for (int i = 0; i < TestTerms.Length; i++)
{
@@ -343,7 +343,7 @@ namespace Lucene.Net.Index
Terms freqVector = reader.Get(0).Terms(TestFields[1]); //no pos, no offset
Assert.IsNotNull(freqVector);
Assert.AreEqual(TestTerms.Length, freqVector.Count);
- termsEnum = freqVector.Iterator(null);
+ termsEnum = freqVector.GetIterator(null);
Assert.IsNotNull(termsEnum);
for (int i = 0; i < TestTerms.Length; i++)
{
@@ -364,7 +364,7 @@ namespace Lucene.Net.Index
TermVectorsReader reader = Codec.Default.TermVectorsFormat.VectorsReader(Dir, Seg.Info, FieldInfos, NewIOContext(Random()));
Terms vector = reader.Get(0).Terms(TestFields[0]);
Assert.IsNotNull(vector);
- TermsEnum termsEnum = vector.Iterator(null);
+ TermsEnum termsEnum = vector.GetIterator(null);
Assert.IsNotNull(termsEnum);
Assert.AreEqual(TestTerms.Length, vector.Count);
DocsAndPositionsEnum dpEnum = null;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestTermVectorsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestTermVectorsWriter.cs b/src/Lucene.Net.Tests/core/Index/TestTermVectorsWriter.cs
index 0f653b0..9cd1989 100644
--- a/src/Lucene.Net.Tests/core/Index/TestTermVectorsWriter.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestTermVectorsWriter.cs
@@ -69,7 +69,7 @@ namespace Lucene.Net.Index
IndexReader r = DirectoryReader.Open(dir);
Terms vector = r.GetTermVectors(0).Terms("field");
Assert.IsNotNull(vector);
- TermsEnum termsEnum = vector.Iterator(null);
+ TermsEnum termsEnum = vector.GetIterator(null);
Assert.IsNotNull(termsEnum.Next());
Assert.AreEqual("", termsEnum.Term.Utf8ToString());
@@ -125,7 +125,7 @@ namespace Lucene.Net.Index
w.Dispose();
IndexReader r = DirectoryReader.Open(dir);
- TermsEnum termsEnum = r.GetTermVectors(0).Terms("field").Iterator(null);
+ TermsEnum termsEnum = r.GetTermVectors(0).Terms("field").GetIterator(null);
Assert.IsNotNull(termsEnum.Next());
DocsAndPositionsEnum dpEnum = termsEnum.DocsAndPositions(null, null);
Assert.AreEqual(2, termsEnum.TotalTermFreq);
@@ -162,7 +162,7 @@ namespace Lucene.Net.Index
w.Dispose();
IndexReader r = DirectoryReader.Open(dir);
- TermsEnum termsEnum = r.GetTermVectors(0).Terms("field").Iterator(null);
+ TermsEnum termsEnum = r.GetTermVectors(0).Terms("field").GetIterator(null);
Assert.IsNotNull(termsEnum.Next());
DocsAndPositionsEnum dpEnum = termsEnum.DocsAndPositions(null, null);
Assert.AreEqual(2, termsEnum.TotalTermFreq);
@@ -215,7 +215,7 @@ namespace Lucene.Net.Index
w.Dispose();
IndexReader r = DirectoryReader.Open(dir);
- TermsEnum termsEnum = r.GetTermVectors(0).Terms("field").Iterator(null);
+ TermsEnum termsEnum = r.GetTermVectors(0).Terms("field").GetIterator(null);
Assert.IsNotNull(termsEnum.Next());
DocsAndPositionsEnum dpEnum = termsEnum.DocsAndPositions(null, null);
Assert.AreEqual(2, termsEnum.TotalTermFreq);
@@ -252,7 +252,7 @@ namespace Lucene.Net.Index
w.Dispose();
IndexReader r = DirectoryReader.Open(dir);
- TermsEnum termsEnum = r.GetTermVectors(0).Terms("field").Iterator(null);
+ TermsEnum termsEnum = r.GetTermVectors(0).Terms("field").GetIterator(null);
Assert.IsNotNull(termsEnum.Next());
DocsAndPositionsEnum dpEnum = termsEnum.DocsAndPositions(null, null);
Assert.AreEqual(2, termsEnum.TotalTermFreq);
@@ -290,7 +290,7 @@ namespace Lucene.Net.Index
w.Dispose();
IndexReader r = DirectoryReader.Open(dir);
- TermsEnum termsEnum = r.GetTermVectors(0).Terms("field").Iterator(null);
+ TermsEnum termsEnum = r.GetTermVectors(0).Terms("field").GetIterator(null);
Assert.IsNotNull(termsEnum.Next());
DocsAndPositionsEnum dpEnum = termsEnum.DocsAndPositions(null, null);
@@ -336,7 +336,7 @@ namespace Lucene.Net.Index
w.Dispose();
IndexReader r = DirectoryReader.Open(dir);
- TermsEnum termsEnum = r.GetTermVectors(0).Terms("field").Iterator(null);
+ TermsEnum termsEnum = r.GetTermVectors(0).Terms("field").GetIterator(null);
Assert.IsNotNull(termsEnum.Next());
DocsAndPositionsEnum dpEnum = termsEnum.DocsAndPositions(null, null);
@@ -380,7 +380,7 @@ namespace Lucene.Net.Index
w.Dispose();
IndexReader r = DirectoryReader.Open(dir);
- TermsEnum termsEnum = r.GetTermVectors(0).Terms("field").Iterator(null);
+ TermsEnum termsEnum = r.GetTermVectors(0).Terms("field").GetIterator(null);
Assert.IsNotNull(termsEnum.Next());
DocsAndPositionsEnum dpEnum = termsEnum.DocsAndPositions(null, null);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestTermdocPerf.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestTermdocPerf.cs b/src/Lucene.Net.Tests/core/Index/TestTermdocPerf.cs
index 34fbfca..c76b4ee 100644
--- a/src/Lucene.Net.Tests/core/Index/TestTermdocPerf.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestTermdocPerf.cs
@@ -136,7 +136,7 @@ namespace Lucene.Net.Index
IndexReader reader = DirectoryReader.Open(dir);
- TermsEnum tenum = MultiFields.GetTerms(reader, "foo").Iterator(null);
+ TermsEnum tenum = MultiFields.GetTerms(reader, "foo").GetIterator(null);
start = Environment.TickCount;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestTermsEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestTermsEnum.cs b/src/Lucene.Net.Tests/core/Index/TestTermsEnum.cs
index cdb7a40..608fee0 100644
--- a/src/Lucene.Net.Tests/core/Index/TestTermsEnum.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestTermsEnum.cs
@@ -64,7 +64,7 @@ namespace Lucene.Net.Index
w.Dispose();
List<BytesRef> terms = new List<BytesRef>();
- TermsEnum termsEnum = MultiFields.GetTerms(r, "body").Iterator(null);
+ TermsEnum termsEnum = MultiFields.GetTerms(r, "body").GetIterator(null);
BytesRef term;
while ((term = termsEnum.Next()) != null)
{
@@ -568,7 +568,7 @@ namespace Lucene.Net.Index
Assert.AreEqual(1, DocFreq(r, "xx"));
Assert.AreEqual(1, DocFreq(r, "aa4"));
- TermsEnum te = MultiFields.GetTerms(r, FIELD).Iterator(null);
+ TermsEnum te = MultiFields.GetTerms(r, FIELD).GetIterator(null);
while (te.Next() != null)
{
//System.out.println("TEST: next term=" + te.Term().Utf8ToString());
@@ -604,7 +604,7 @@ namespace Lucene.Net.Index
Terms terms = MultiFields.GetTerms(r, "field");
if (terms != null)
{
- Assert.IsNull(terms.Iterator(null).Next());
+ Assert.IsNull(terms.GetIterator(null).Next());
}
r.Dispose();
d.Dispose();
@@ -737,7 +737,7 @@ namespace Lucene.Net.Index
Console.WriteLine(" " + t.Utf8ToString() + " " + t);
}
}
- TermsEnum te = MultiFields.GetTerms(r, FIELD).Iterator(null);
+ TermsEnum te = MultiFields.GetTerms(r, FIELD).GetIterator(null);
int END_LOC = -validTerms.Length - 1;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Index/TestTermsEnum2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestTermsEnum2.cs b/src/Lucene.Net.Tests/core/Index/TestTermsEnum2.cs
index eaad20c..d6cdaf8 100644
--- a/src/Lucene.Net.Tests/core/Index/TestTermsEnum2.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestTermsEnum2.cs
@@ -124,7 +124,7 @@ namespace Lucene.Net.Index
{
string reg = AutomatonTestUtil.RandomRegexp(Random());
Automaton automaton = (new RegExp(reg, RegExp.NONE)).ToAutomaton();
- TermsEnum te = MultiFields.GetTerms(Reader, "field").Iterator(null);
+ TermsEnum te = MultiFields.GetTerms(Reader, "field").GetIterator(null);
IList<BytesRef> unsortedTerms = new List<BytesRef>(Terms);
unsortedTerms = CollectionsHelper.Shuffle(unsortedTerms);
@@ -156,7 +156,7 @@ namespace Lucene.Net.Index
{
for (int i = 0; i < NumIterations; i++)
{
- TermsEnum te = MultiFields.GetTerms(Reader, "field").Iterator(null);
+ TermsEnum te = MultiFields.GetTerms(Reader, "field").GetIterator(null);
foreach (BytesRef term in Terms)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs b/src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs
index 8b2f669..a27562a 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMultiPhraseQuery.cs
@@ -78,7 +78,7 @@ namespace Lucene.Net.Search
// this TermEnum gives "piccadilly", "pie" and "pizza".
string prefix = "pi";
- TermsEnum te = MultiFields.GetFields(reader).Terms("body").Iterator(null);
+ TermsEnum te = MultiFields.GetFields(reader).Terms("body").GetIterator(null);
te.SeekCeil(new BytesRef(prefix));
do
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs b/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
index d4d5e1d..fd04407 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
@@ -212,7 +212,7 @@ namespace Lucene.Net.Search
protected override TermsEnum GetTermsEnum(Terms terms, AttributeSource atts)
{
- return new TermRangeTermsEnumAnonymousInnerClassHelper(this, terms.Iterator(null), new BytesRef("2"), new BytesRef("7"));
+ return new TermRangeTermsEnumAnonymousInnerClassHelper(this, terms.GetIterator(null), new BytesRef("2"), new BytesRef("7"));
}
private class TermRangeTermsEnumAnonymousInnerClassHelper : TermRangeTermsEnum
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Search/TestMultiThreadTermVectors.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestMultiThreadTermVectors.cs b/src/Lucene.Net.Tests/core/Search/TestMultiThreadTermVectors.cs
index 03b42b5..501a84c 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMultiThreadTermVectors.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMultiThreadTermVectors.cs
@@ -214,7 +214,7 @@ namespace Lucene.Net.Search
Terms vector = Reader.GetTermVectors(docId).Terms("field");
TimeElapsed += Environment.TickCount - start;
- VerifyVector(vector.Iterator(null), docId);
+ VerifyVector(vector.GetIterator(null), docId);
}
}
@@ -224,7 +224,7 @@ namespace Lucene.Net.Search
{
Terms terms = vectors.Terms(field);
Debug.Assert(terms != null);
- VerifyVector(terms.Iterator(null), num);
+ VerifyVector(terms.GetIterator(null), num);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Search/TestPhrasePrefixQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPhrasePrefixQuery.cs b/src/Lucene.Net.Tests/core/Search/TestPhrasePrefixQuery.cs
index 00ac1d8..9a0864e 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPhrasePrefixQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPhrasePrefixQuery.cs
@@ -77,7 +77,7 @@ namespace Lucene.Net.Search
// this TermEnum gives "piccadilly", "pie" and "pizza".
string prefix = "pi";
- TermsEnum te = MultiFields.GetFields(reader).Terms("body").Iterator(null);
+ TermsEnum te = MultiFields.GetFields(reader).Terms("body").GetIterator(null);
te.SeekCeil(new BytesRef(prefix));
do
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Search/TestPrefixRandom.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPrefixRandom.cs b/src/Lucene.Net.Tests/core/Search/TestPrefixRandom.cs
index b78aa41..0eb2314 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPrefixRandom.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPrefixRandom.cs
@@ -100,7 +100,7 @@ namespace Lucene.Net.Search
protected override TermsEnum GetTermsEnum(Terms terms, AttributeSource atts)
{
- return new SimplePrefixTermsEnum(this, terms.Iterator(null), Prefix);
+ return new SimplePrefixTermsEnum(this, terms.GetIterator(null), Prefix);
}
private class SimplePrefixTermsEnum : FilteredTermsEnum
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Search/TestRegexpRandom2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestRegexpRandom2.cs b/src/Lucene.Net.Tests/core/Search/TestRegexpRandom2.cs
index ba29511..434e75c 100644
--- a/src/Lucene.Net.Tests/core/Search/TestRegexpRandom2.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestRegexpRandom2.cs
@@ -120,7 +120,7 @@ namespace Lucene.Net.Search
protected override TermsEnum GetTermsEnum(Terms terms, AttributeSource atts)
{
- return new SimpleAutomatonTermsEnum(this, terms.Iterator(null));
+ return new SimpleAutomatonTermsEnum(this, terms.GetIterator(null));
}
private sealed class SimpleAutomatonTermsEnum : FilteredTermsEnum
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Search/TestSameScoresWithThreads.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSameScoresWithThreads.cs b/src/Lucene.Net.Tests/core/Search/TestSameScoresWithThreads.cs
index 31b615d..7179b51 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSameScoresWithThreads.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSameScoresWithThreads.cs
@@ -67,7 +67,7 @@ namespace Lucene.Net.Search
IndexSearcher s = NewSearcher(r);
Terms terms = MultiFields.GetFields(r).Terms("body");
int termCount = 0;
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
while (termsEnum.Next() != null)
{
termCount++;
@@ -76,7 +76,7 @@ namespace Lucene.Net.Search
// Target ~10 terms to search:
double chance = 10.0 / termCount;
- termsEnum = terms.Iterator(termsEnum);
+ termsEnum = terms.GetIterator(termsEnum);
IDictionary<BytesRef, TopDocs> answers = new Dictionary<BytesRef, TopDocs>();
while (termsEnum.Next() != null)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Search/TestShardSearching.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestShardSearching.cs b/src/Lucene.Net.Tests/core/Search/TestShardSearching.cs
index 6b0db71..2626873 100644
--- a/src/Lucene.Net.Tests/core/Search/TestShardSearching.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestShardSearching.cs
@@ -198,7 +198,7 @@ namespace Lucene.Net.Search
{
// TODO: try to "focus" on high freq terms sometimes too
// TODO: maybe also periodically reset the terms...?
- TermsEnum termsEnum = MultiFields.GetTerms(mockReader, "body").Iterator(null);
+ TermsEnum termsEnum = MultiFields.GetTerms(mockReader, "body").GetIterator(null);
terms = new List<BytesRef>();
while (termsEnum.Next() != null)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Search/TestSort.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSort.cs b/src/Lucene.Net.Tests/core/Search/TestSort.cs
index e8b076c..c4205cf 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSort.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSort.cs
@@ -1563,7 +1563,7 @@ namespace Lucene.Net.Search
public TermsEnum TermsEnum(Terms terms)
{
- return terms.Iterator(null);
+ return terms.GetIterator(null);
}
}
@@ -1621,7 +1621,7 @@ namespace Lucene.Net.Search
public TermsEnum TermsEnum(Terms terms)
{
- return terms.Iterator(null);
+ return terms.GetIterator(null);
}
}
@@ -1679,7 +1679,7 @@ namespace Lucene.Net.Search
public TermsEnum TermsEnum(Terms terms)
{
- return terms.Iterator(null);
+ return terms.GetIterator(null);
}
}
@@ -1737,7 +1737,7 @@ namespace Lucene.Net.Search
public TermsEnum TermsEnum(Terms terms)
{
- return terms.Iterator(null);
+ return terms.GetIterator(null);
}
}
@@ -1795,7 +1795,7 @@ namespace Lucene.Net.Search
public TermsEnum TermsEnum(Terms terms)
{
- return terms.Iterator(null);
+ return terms.GetIterator(null);
}
}
@@ -1853,7 +1853,7 @@ namespace Lucene.Net.Search
public TermsEnum TermsEnum(Terms terms)
{
- return terms.Iterator(null);
+ return terms.GetIterator(null);
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs b/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
index 216e83b..db970a0 100644
--- a/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
@@ -147,7 +147,7 @@ namespace Lucene.Net.Search
Terms vector = vectors.Terms("field");
Assert.IsNotNull(vector);
Assert.AreEqual(1, vector.Count);
- TermsEnum termsEnum = vector.Iterator(null);
+ TermsEnum termsEnum = vector.GetIterator(null);
Assert.IsNotNull(termsEnum.Next());
Assert.AreEqual("one", termsEnum.Term.Utf8ToString());
Assert.AreEqual(5, termsEnum.TotalTermFreq);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/715372a1/src/Lucene.Net.Tests/core/Util/Fst/TestFSTs.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/Fst/TestFSTs.cs b/src/Lucene.Net.Tests/core/Util/Fst/TestFSTs.cs
index 2e36a9c..6eca4d9 100644
--- a/src/Lucene.Net.Tests/core/Util/Fst/TestFSTs.cs
+++ b/src/Lucene.Net.Tests/core/Util/Fst/TestFSTs.cs
@@ -368,7 +368,7 @@ namespace Lucene.Net.Util.Fst
if (terms != null)
{
IntsRef scratchIntsRef = new IntsRef();
- TermsEnum termsEnum = terms.Iterator(null);
+ TermsEnum termsEnum = terms.GetIterator(null);
if (VERBOSE)
{
Console.WriteLine("TEST: got termsEnum=" + termsEnum);
@@ -1108,7 +1108,7 @@ namespace Lucene.Net.Util.Fst
}
// Verify w/ MultiTermsEnum
- TermsEnum termsEnum = MultiFields.GetTerms(r, "id").Iterator(null);
+ TermsEnum termsEnum = MultiFields.GetTerms(r, "id").GetIterator(null);
for (int iter = 0; iter < 2 * NUM_IDS; iter++)
{
string id;
[4/5] lucenenet git commit: Lucene.Net.Core.Index.Terms refactor:
Renamed Iterator() > GetIterator()
Posted by ni...@apache.org.
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();
[2/5] lucenenet git commit: TestFramework: Updated error description
of TestProtectedFieldNames and TestPrivateFieldNames to instruct how to fix
the problem.
Posted by ni...@apache.org.
TestFramework: Updated error description of TestProtectedFieldNames and TestPrivateFieldNames to instruct how to fix the problem.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/36498470
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/36498470
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/36498470
Branch: refs/heads/api-work
Commit: 3649847000714f3ac81eb5f7771191c48b6b7120
Parents: fa62828
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Thu Jan 26 12:00:27 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Thu Jan 26 12:00:27 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.TestFramework/Util/ApiScanTestBase.cs | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/36498470/src/Lucene.Net.TestFramework/Util/ApiScanTestBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/ApiScanTestBase.cs b/src/Lucene.Net.TestFramework/Util/ApiScanTestBase.cs
index 542a4c2..bf7678c 100644
--- a/src/Lucene.Net.TestFramework/Util/ApiScanTestBase.cs
+++ b/src/Lucene.Net.TestFramework/Util/ApiScanTestBase.cs
@@ -76,7 +76,8 @@ namespace Lucene.Net.Util
}
//}
- Assert.IsFalse(names.Any(), names.Count() + " invalid protected field names detected.");
+ Assert.IsFalse(names.Any(), names.Count() + " invalid protected field names detected. " +
+ "Protected fields must be camelCase and prefixed with 'm_' to prevent naming conflicts with properties.");
}
//[Test, LuceneNetSpecific]
@@ -92,7 +93,8 @@ namespace Lucene.Net.Util
}
//}
- Assert.IsFalse(names.Any(), names.Count() + " invalid private field names detected.");
+ Assert.IsFalse(names.Any(), names.Count() + " invalid private field names detected. " +
+ "Private field names should be camelCase.");
}
//[Test, LuceneNetSpecific]