This is an automated email from the ASF dual-hosted git repository.
nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git
The following commit(s) were added to refs/heads/master by this push:
new 80d8cacc5 SWEEP: Renamed classes from using Iterable and Iterator to
Enumerable and Enumerator, where appropropriate. See #279.
80d8cacc5 is described below
commit 80d8cacc5a0c0f0a831b9e66edbacc9eb41b102e
Author: Shad Storhaug <[email protected]>
AuthorDate: Tue Oct 18 16:52:35 2022 +0700
SWEEP: Renamed classes from using Iterable and Iterator to Enumerable and
Enumerator, where appropropriate. See #279.
---
.../Memory/MemoryDocValuesConsumer.cs | 12 +++----
.../VectorHighlight/BaseFragListBuilder.cs | 6 ++--
.../Codecs/Lucene42/Lucene42DocValuesConsumer.cs | 17 +++++-----
.../Codecs/MissingOrdRemapper.cs | 38 +++++++++++-----------
.../Index/RandomIndexWriter.cs | 28 ++++++++--------
src/Lucene.Net.Tests/Index/TestIndexWriter.cs | 17 +++++-----
src/Lucene.Net.Tests/Index/TestIndexableField.cs | 10 +++---
.../Codecs/Lucene3x/Lucene3xTermVectorsReader.cs | 6 ++--
src/Lucene.Net/Index/BufferedUpdatesStream.cs | 8 ++---
src/Lucene.Net/Index/CoalescedUpdates.cs | 30 ++++++++++-------
src/Lucene.Net/Index/FrozenBufferedUpdates.cs | 24 +++++++-------
src/Lucene.Net/Util/AttributeSource.cs | 6 ++--
src/Lucene.Net/Util/RamUsageEstimator.cs | 11 ++++---
src/Lucene.Net/Util/WeakIdentityMap.cs | 8 ++---
14 files changed, 115 insertions(+), 106 deletions(-)
diff --git a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesConsumer.cs
b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesConsumer.cs
index 2b7739567..0ddbcc672 100644
--- a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesConsumer.cs
+++ b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesConsumer.cs
@@ -404,18 +404,18 @@ namespace Lucene.Net.Codecs.Memory
IEnumerable<long?> docToOrdCount, IEnumerable<long?> ords)
{
// write the ordinals as a binary field
- AddBinaryField(field, new IterableAnonymousClass(docToOrdCount,
ords));
+ AddBinaryField(field, new EnumerableAnonymousClass(docToOrdCount,
ords));
// write the values as FST
WriteFST(field, values);
}
- private class IterableAnonymousClass : IEnumerable<BytesRef>
+ private class EnumerableAnonymousClass : IEnumerable<BytesRef>
{
private readonly IEnumerable<long?> _docToOrdCount;
private readonly IEnumerable<long?> _ords;
- public IterableAnonymousClass(IEnumerable<long?> docToOrdCount,
IEnumerable<long?> ords)
+ public EnumerableAnonymousClass(IEnumerable<long?> docToOrdCount,
IEnumerable<long?> ords)
{
_docToOrdCount = docToOrdCount;
_ords = ords;
@@ -423,7 +423,7 @@ namespace Lucene.Net.Codecs.Memory
public IEnumerator<BytesRef> GetEnumerator()
{
- return new SortedSetIterator(_docToOrdCount.GetEnumerator(),
_ords.GetEnumerator());
+ return new SortedSetEnumerator(_docToOrdCount.GetEnumerator(),
_ords.GetEnumerator());
}
IEnumerator IEnumerable.GetEnumerator()
@@ -433,7 +433,7 @@ namespace Lucene.Net.Codecs.Memory
}
// per-document vint-encoded byte[]
- internal class SortedSetIterator : IEnumerator<BytesRef>
+ internal class SortedSetEnumerator : IEnumerator<BytesRef>
{
private byte[] buffer = new byte[10];
private readonly ByteArrayDataOutput @out = new
ByteArrayDataOutput(); // LUCENENET: marked readonly
@@ -446,7 +446,7 @@ namespace Lucene.Net.Codecs.Memory
object IEnumerator.Current => this.Current;
- internal SortedSetIterator(IEnumerator<long?> counts,
IEnumerator<long?> ords)
+ internal SortedSetEnumerator(IEnumerator<long?> counts,
IEnumerator<long?> ords)
{
this.counts = counts;
this.ords = ords;
diff --git a/src/Lucene.Net.Highlighter/VectorHighlight/BaseFragListBuilder.cs
b/src/Lucene.Net.Highlighter/VectorHighlight/BaseFragListBuilder.cs
index b357acca7..aae799a50 100644
--- a/src/Lucene.Net.Highlighter/VectorHighlight/BaseFragListBuilder.cs
+++ b/src/Lucene.Net.Highlighter/VectorHighlight/BaseFragListBuilder.cs
@@ -63,7 +63,7 @@ namespace Lucene.Net.Search.VectorHighlight
throw new ArgumentOutOfRangeException(nameof(fragCharSize),
"fragCharSize(" + fragCharSize + ") is too small. It must be " +
minFragCharSize + " or higher."); // LUCENENET specific - changed from
IllegalArgumentException to ArgumentOutOfRangeException (.NET convention)
JCG.List<WeightedPhraseInfo> wpil = new
JCG.List<WeightedPhraseInfo>();
- using (IteratorQueue<WeightedPhraseInfo> queue = new
IteratorQueue<WeightedPhraseInfo>(fieldPhraseList.PhraseList.GetEnumerator()))
+ using (EnumeratorQueue<WeightedPhraseInfo> queue = new
EnumeratorQueue<WeightedPhraseInfo>(fieldPhraseList.PhraseList.GetEnumerator()))
{
WeightedPhraseInfo phraseInfo = null;
int startOffset = 0;
@@ -142,12 +142,12 @@ namespace Lucene.Net.Search.VectorHighlight
return info.TermsOffsets.Count <= 1 || matchLength <= fragCharSize;
}
- private sealed class IteratorQueue<T> : IDisposable // LUCENENET
specific - implemented IDisposable to dispose the IEnumerator<T>
+ private sealed class EnumeratorQueue<T> : IDisposable // LUCENENET
specific - implemented IDisposable to dispose the IEnumerator<T>
{
private readonly IEnumerator<T> iter;
private T top;
- public IteratorQueue(IEnumerator<T> iter)
+ public EnumeratorQueue(IEnumerator<T> iter)
{
this.iter = iter;
T removeTop = RemoveTop();
diff --git
a/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42DocValuesConsumer.cs
b/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42DocValuesConsumer.cs
index c5a86679a..8a39f51b8 100644
--- a/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42DocValuesConsumer.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42DocValuesConsumer.cs
@@ -5,6 +5,7 @@ using Lucene.Net.Util;
using Lucene.Net.Util.Fst;
using Lucene.Net.Util.Packed;
using System;
+using System.Collections;
using System.Collections.Generic;
using System.IO;
using JCG = J2N.Collections.Generic;
@@ -346,18 +347,18 @@ namespace Lucene.Net.Codecs.Lucene42
public override void AddSortedSetField(FieldInfo field,
IEnumerable<BytesRef> values, IEnumerable<long?> docToOrdCount,
IEnumerable<long?> ords)
{
// write the ordinals as a binary field
- AddBinaryField(field, new IterableAnonymousClass(docToOrdCount,
ords));
+ AddBinaryField(field, new EnumerableAnonymousClass(docToOrdCount,
ords));
// write the values as FST
WriteFST(field, values);
}
- private class IterableAnonymousClass : IEnumerable<BytesRef>
+ private class EnumerableAnonymousClass : IEnumerable<BytesRef>
{
private readonly IEnumerable<long?> docToOrdCount;
private readonly IEnumerable<long?> ords;
- public IterableAnonymousClass(IEnumerable<long?> docToOrdCount,
IEnumerable<long?> ords)
+ public EnumerableAnonymousClass(IEnumerable<long?> docToOrdCount,
IEnumerable<long?> ords)
{
this.docToOrdCount = docToOrdCount;
this.ords = ords;
@@ -365,17 +366,17 @@ namespace Lucene.Net.Codecs.Lucene42
public IEnumerator<BytesRef> GetEnumerator()
{
- return new SortedSetIterator(docToOrdCount.GetEnumerator(),
ords.GetEnumerator());
+ return new SortedSetEnumerator(docToOrdCount.GetEnumerator(),
ords.GetEnumerator());
}
- System.Collections.IEnumerator
System.Collections.IEnumerable.GetEnumerator()
+ IEnumerator IEnumerable.GetEnumerator()
{
return GetEnumerator();
}
}
// per-document vint-encoded byte[]
- internal class SortedSetIterator : IEnumerator<BytesRef>
+ internal class SortedSetEnumerator : IEnumerator<BytesRef>
{
internal byte[] buffer = new byte[10];
internal ByteArrayDataOutput @out = new ByteArrayDataOutput();
@@ -384,7 +385,7 @@ namespace Lucene.Net.Codecs.Lucene42
internal readonly IEnumerator<long?> counts;
internal readonly IEnumerator<long?> ords;
- internal SortedSetIterator(IEnumerator<long?> counts,
IEnumerator<long?> ords)
+ internal SortedSetEnumerator(IEnumerator<long?> counts,
IEnumerator<long?> ords)
{
this.counts = counts;
this.ords = ords;
@@ -422,7 +423,7 @@ namespace Lucene.Net.Codecs.Lucene42
public BytesRef Current => @ref;
- object System.Collections.IEnumerator.Current => Current;
+ object IEnumerator.Current => Current;
// encodes count values to buffer
internal virtual void EncodeValues(int count)
diff --git a/src/Lucene.Net.TestFramework/Codecs/MissingOrdRemapper.cs
b/src/Lucene.Net.TestFramework/Codecs/MissingOrdRemapper.cs
index 541febf69..9486871d8 100644
--- a/src/Lucene.Net.TestFramework/Codecs/MissingOrdRemapper.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/MissingOrdRemapper.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Util;
+using Lucene.Net.Util;
using System;
using System.Collections;
using System.Collections.Generic;
@@ -32,21 +32,21 @@ namespace Lucene.Net.Codecs
/// Insert an empty byte[] to the front of this enumerable.</summary>
public static IEnumerable<BytesRef>
InsertEmptyValue(IEnumerable<BytesRef> iterable)
{
- return new IterableAnonymousClass(iterable);
+ return new EnumerableAnonymousClass(iterable);
}
- private class IterableAnonymousClass : IEnumerable<BytesRef>
+ private class EnumerableAnonymousClass : IEnumerable<BytesRef>
{
private readonly IEnumerable<BytesRef> iterable;
- public IterableAnonymousClass(IEnumerable<BytesRef> iterable)
+ public EnumerableAnonymousClass(IEnumerable<BytesRef> iterable)
{
this.iterable = iterable;
}
public IEnumerator<BytesRef> GetEnumerator()
{
- return new IteratorAnonymousClass(this);
+ return new EnumeratorAnonymousClass(this);
}
IEnumerator IEnumerable.GetEnumerator()
@@ -54,9 +54,9 @@ namespace Lucene.Net.Codecs
return GetEnumerator();
}
- private class IteratorAnonymousClass : IEnumerator<BytesRef>
+ private class EnumeratorAnonymousClass : IEnumerator<BytesRef>
{
- public IteratorAnonymousClass(IterableAnonymousClass
outerInstance)
+ public EnumeratorAnonymousClass(EnumerableAnonymousClass
outerInstance)
{
seenEmpty = false;
@in = outerInstance.iterable.GetEnumerator();
@@ -100,29 +100,29 @@ namespace Lucene.Net.Codecs
/// Remaps ord -1 to ord 0 on this enumerable. </summary>
public static IEnumerable<long?> MapMissingToOrd0(IEnumerable<long?>
iterable)
{
- return new IterableAnonymousClass2(iterable);
+ return new EnumerableAnonymousClass2(iterable);
}
- private class IterableAnonymousClass2 : IEnumerable<long?>
+ private class EnumerableAnonymousClass2 : IEnumerable<long?>
{
private readonly IEnumerable<long?> iterable;
- public IterableAnonymousClass2(IEnumerable<long?> iterable)
+ public EnumerableAnonymousClass2(IEnumerable<long?> iterable)
{
this.iterable = iterable;
}
public IEnumerator<long?> GetEnumerator()
{
- return new IteratorAnonymousClass2(this);
+ return new EnumeratorAnonymousClass2(this);
}
IEnumerator IEnumerable.GetEnumerator()
=> GetEnumerator();
- private class IteratorAnonymousClass2 : IEnumerator<long?>
+ private class EnumeratorAnonymousClass2 : IEnumerator<long?>
{
- public IteratorAnonymousClass2(IterableAnonymousClass2
outerInstance)
+ public EnumeratorAnonymousClass2(EnumerableAnonymousClass2
outerInstance)
{
@in = outerInstance.iterable.GetEnumerator();
}
@@ -160,29 +160,29 @@ namespace Lucene.Net.Codecs
/// Remaps every ord+1 on this enumerable. </summary>
public static IEnumerable<long?> MapAllOrds(IEnumerable<long?>
iterable)
{
- return new IterableAnonymousClass3(iterable);
+ return new EnumerableAnonymousClass3(iterable);
}
- private class IterableAnonymousClass3 : IEnumerable<long?>
+ private class EnumerableAnonymousClass3 : IEnumerable<long?>
{
private readonly IEnumerable<long?> iterable;
- public IterableAnonymousClass3(IEnumerable<long?> iterable)
+ public EnumerableAnonymousClass3(IEnumerable<long?> iterable)
{
this.iterable = iterable;
}
public IEnumerator<long?> GetEnumerator()
{
- return new IteratorAnonymousClass3(this);
+ return new EnumeratorAnonymousClass3(this);
}
IEnumerator IEnumerable.GetEnumerator()
=> GetEnumerator();
- private class IteratorAnonymousClass3 : IEnumerator<long?>
+ private class EnumeratorAnonymousClass3 : IEnumerator<long?>
{
- public IteratorAnonymousClass3(IterableAnonymousClass3
outerInstance)
+ public EnumeratorAnonymousClass3(EnumerableAnonymousClass3
outerInstance)
{
@in = outerInstance.iterable.GetEnumerator();
}
diff --git a/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
b/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
index 783c15960..40deb9e34 100644
--- a/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
+++ b/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
@@ -138,7 +138,7 @@ namespace Lucene.Net.Index
// (but we need to clone them), and only when
// getReader, commit, etc. are called, we do an
// addDocuments? Would be better testing.
- IndexWriter.AddDocuments(new
IterableAnonymousClass<IIndexableField>(doc), a);
+ IndexWriter.AddDocuments(new
EnumerableAnonymousClass<IIndexableField>(doc), a);
}
else
{
@@ -148,18 +148,18 @@ namespace Lucene.Net.Index
MaybeCommit();
}
- private class IterableAnonymousClass<IndexableField> :
IEnumerable<IEnumerable<IndexableField>>
+ private class EnumerableAnonymousClass<IndexableField> :
IEnumerable<IEnumerable<IndexableField>>
{
private readonly IEnumerable<IndexableField> doc;
- public IterableAnonymousClass(IEnumerable<IndexableField> doc)
+ public EnumerableAnonymousClass(IEnumerable<IndexableField> doc)
{
this.doc = doc;
}
public IEnumerator<IEnumerable<IndexableField>> GetEnumerator()
{
- return new IteratorAnonymousClass(this);
+ return new EnumeratorAnonymousClass(this);
}
IEnumerator IEnumerable.GetEnumerator()
@@ -167,11 +167,11 @@ namespace Lucene.Net.Index
return GetEnumerator();
}
- private class IteratorAnonymousClass :
IEnumerator<IEnumerable<IndexableField>>
+ private class EnumeratorAnonymousClass :
IEnumerator<IEnumerable<IndexableField>>
{
- private readonly IterableAnonymousClass<IndexableField>
outerInstance;
+ private readonly EnumerableAnonymousClass<IndexableField>
outerInstance;
- public
IteratorAnonymousClass(IterableAnonymousClass<IndexableField> outerInstance)
+ public
EnumeratorAnonymousClass(EnumerableAnonymousClass<IndexableField> outerInstance)
{
this.outerInstance = outerInstance;
}
@@ -242,7 +242,7 @@ namespace Lucene.Net.Index
{
if (r.Next(5) == 3)
{
- IndexWriter.UpdateDocuments(t, new
IterableAnonymousClass2(doc));
+ IndexWriter.UpdateDocuments(t, new
EnumerableAnonymousClass2(doc));
}
else
{
@@ -251,28 +251,28 @@ namespace Lucene.Net.Index
MaybeCommit();
}
- private class IterableAnonymousClass2 :
IEnumerable<IEnumerable<IIndexableField>>
+ private class EnumerableAnonymousClass2 :
IEnumerable<IEnumerable<IIndexableField>>
{
private readonly IEnumerable<IIndexableField> doc;
- public IterableAnonymousClass2(IEnumerable<IIndexableField> doc)
+ public EnumerableAnonymousClass2(IEnumerable<IIndexableField> doc)
{
this.doc = doc;
}
public IEnumerator<IEnumerable<IIndexableField>> GetEnumerator()
{
- return new IteratorAnonymousClass2(this);
+ return new EnumeratorAnonymousClass2(this);
}
IEnumerator IEnumerable.GetEnumerator()
=> GetEnumerator();
- private class IteratorAnonymousClass2 :
IEnumerator<IEnumerable<IIndexableField>>
+ private class EnumeratorAnonymousClass2 :
IEnumerator<IEnumerable<IIndexableField>>
{
- private readonly IterableAnonymousClass2 outerInstance;
+ private readonly EnumerableAnonymousClass2 outerInstance;
- public IteratorAnonymousClass2(IterableAnonymousClass2
outerInstance)
+ public EnumeratorAnonymousClass2(EnumerableAnonymousClass2
outerInstance)
{
this.outerInstance = outerInstance;
}
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
index 88e452e13..1af788286 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
@@ -15,6 +15,7 @@ using Lucene.Net.Util;
using NUnit.Framework;
using RandomizedTesting.Generators;
using System;
+using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Text;
@@ -2601,7 +2602,7 @@ namespace Lucene.Net.Index
bool success = false;
try
{
- w.AddDocuments(new RandomFailingFieldIterable(docs,
Random));
+ w.AddDocuments(new RandomFailingFieldEnumerable(docs,
Random));
success = true;
}
catch (Exception e) when (e.IsRuntimeException())
@@ -2640,12 +2641,12 @@ namespace Lucene.Net.Index
IOUtils.Dispose(reader, w, dir);
}
- private class RandomFailingFieldIterable :
IEnumerable<IEnumerable<IIndexableField>>
+ private class RandomFailingFieldEnumerable :
IEnumerable<IEnumerable<IIndexableField>>
{
internal readonly IList<IEnumerable<IIndexableField>> docList;
internal readonly Random random;
- public
RandomFailingFieldIterable(IList<IEnumerable<IIndexableField>> docList, Random
random)
+ public
RandomFailingFieldEnumerable(IList<IEnumerable<IIndexableField>> docList,
Random random)
{
this.docList = docList;
this.random = random;
@@ -2654,22 +2655,22 @@ namespace Lucene.Net.Index
public virtual IEnumerator<IEnumerable<IIndexableField>>
GetEnumerator()
{
return docList.GetEnumerator();
- //return new IteratorAnonymousClass(this, docIter);
+ //return new EnumeratorAnonymousClass(this, docIter);
}
- System.Collections.IEnumerator
System.Collections.IEnumerable.GetEnumerator()
+ IEnumerator IEnumerable.GetEnumerator()
{
return GetEnumerator();
}
/*
- private class IteratorAnonymousClass :
IEnumerator<IEnumerable<IndexableField>>
+ private class EnumeratorAnonymousClass :
IEnumerator<IEnumerable<IndexableField>>
{
- private readonly RandomFailingFieldIterable outerInstance;
+ private readonly RandomFailingFieldEnumerable outerInstance;
private IEnumerator<IEnumerable<IndexableField>> DocIter;
- public IteratorAnonymousClass(RandomFailingFieldIterable
outerInstance, IEnumerator<IEnumerable<IndexableField>> docIter)
+ public EnumeratorAnonymousClass(RandomFailingFieldEnumerable
outerInstance, IEnumerator<IEnumerable<IndexableField>> docIter)
{
this.outerInstance = outerInstance;
this.DocIter = docIter;
diff --git a/src/Lucene.Net.Tests/Index/TestIndexableField.cs
b/src/Lucene.Net.Tests/Index/TestIndexableField.cs
index fb3a8234c..3b1839b60 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexableField.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexableField.cs
@@ -257,7 +257,7 @@ namespace Lucene.Net.Index
int finalBaseCount = baseCount;
baseCount += fieldCount - 1;
- w.AddDocument(new IterableAnonymousClass(this, fieldCount,
finalDocCount, finalBaseCount));
+ w.AddDocument(new EnumerableAnonymousClass(this, fieldCount,
finalDocCount, finalBaseCount));
}
IndexReader r = w.GetReader();
@@ -375,7 +375,7 @@ namespace Lucene.Net.Index
dir.Dispose();
}
- private class IterableAnonymousClass : IEnumerable<IIndexableField>
+ private class EnumerableAnonymousClass : IEnumerable<IIndexableField>
{
private readonly TestIndexableField outerInstance;
@@ -383,7 +383,7 @@ namespace Lucene.Net.Index
private int finalDocCount;
private int finalBaseCount;
- public IterableAnonymousClass(TestIndexableField outerInstance,
int fieldCount, int finalDocCount, int finalBaseCount)
+ public EnumerableAnonymousClass(TestIndexableField outerInstance,
int fieldCount, int finalDocCount, int finalBaseCount)
{
this.outerInstance = outerInstance;
this.fieldCount = fieldCount;
@@ -403,10 +403,10 @@ namespace Lucene.Net.Index
private class IteratorAnonymousClass : IEnumerator<IIndexableField>
{
- private readonly IterableAnonymousClass outerInstance;
+ private readonly EnumerableAnonymousClass outerInstance;
private readonly TestIndexableField outerTextIndexableField;
- public IteratorAnonymousClass(IterableAnonymousClass
outerInstance, TestIndexableField outerTextIndexableField)
+ public IteratorAnonymousClass(EnumerableAnonymousClass
outerInstance, TestIndexableField outerTextIndexableField)
{
this.outerInstance = outerInstance;
this.outerTextIndexableField = outerTextIndexableField;
diff --git a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs
b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs
index 7e4c7b101..f4ee4a403 100644
--- a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs
+++ b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs
@@ -277,17 +277,17 @@ namespace Lucene.Net.Codecs.Lucene3x
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public override IEnumerator<string> GetEnumerator()
{
- return new IteratorAnonymousClass(this);
+ return new EnumeratorAnonymousClass(this);
}
- private class IteratorAnonymousClass : IEnumerator<string>
+ private class EnumeratorAnonymousClass : IEnumerator<string>
{
private readonly TVFields outerInstance;
private string current;
private int i;
private readonly int upTo;
- public IteratorAnonymousClass(TVFields outerInstance)
+ public EnumeratorAnonymousClass(TVFields outerInstance)
{
this.outerInstance = outerInstance;
upTo = this.outerInstance.fieldNumbers.Length;
diff --git a/src/Lucene.Net/Index/BufferedUpdatesStream.cs
b/src/Lucene.Net/Index/BufferedUpdatesStream.cs
index 52c75061c..f95ba7094 100644
--- a/src/Lucene.Net/Index/BufferedUpdatesStream.cs
+++ b/src/Lucene.Net/Index/BufferedUpdatesStream.cs
@@ -266,8 +266,8 @@ namespace Lucene.Net.Index
if (coalescedUpdates != null)
{
//System.out.println(" del coalesced");
- delCount +=
(int)ApplyTermDeletes(coalescedUpdates.TermsIterable(), rld, reader);
- delCount +=
(int)ApplyQueryDeletes(coalescedUpdates.QueriesIterable(), rld, reader);
+ delCount +=
(int)ApplyTermDeletes(coalescedUpdates.GetTermsEnumerable(), rld, reader);
+ delCount +=
(int)ApplyQueryDeletes(coalescedUpdates.GetQueriesEnumerable(), rld, reader);
ApplyDocValuesUpdates(coalescedUpdates.numericDVUpdates, rld, reader,
dvUpdates);
ApplyDocValuesUpdates(coalescedUpdates.binaryDVUpdates, rld, reader, dvUpdates);
}
@@ -334,8 +334,8 @@ namespace Lucene.Net.Index
bool segAllDeletes;
try
{
- delCount +=
(int)ApplyTermDeletes(coalescedUpdates.TermsIterable(), rld, reader);
- delCount +=
(int)ApplyQueryDeletes(coalescedUpdates.QueriesIterable(), rld, reader);
+ delCount +=
(int)ApplyTermDeletes(coalescedUpdates.GetTermsEnumerable(), rld, reader);
+ delCount +=
(int)ApplyQueryDeletes(coalescedUpdates.GetQueriesEnumerable(), rld, reader);
DocValuesFieldUpdates.Container dvUpdates =
new DocValuesFieldUpdates.Container();
ApplyDocValuesUpdates(coalescedUpdates.numericDVUpdates, rld, reader,
dvUpdates);
ApplyDocValuesUpdates(coalescedUpdates.binaryDVUpdates, rld, reader, dvUpdates);
diff --git a/src/Lucene.Net/Index/CoalescedUpdates.cs
b/src/Lucene.Net/Index/CoalescedUpdates.cs
index c5acb888c..68bf88be1 100644
--- a/src/Lucene.Net/Index/CoalescedUpdates.cs
+++ b/src/Lucene.Net/Index/CoalescedUpdates.cs
@@ -64,16 +64,19 @@ namespace Lucene.Net.Index
}
}
- public virtual IEnumerable<Term> TermsIterable()
+ /// <summary>
+ /// This was termsIterable() in Lucene.
+ /// </summary>
+ public virtual IEnumerable<Term> GetTermsEnumerable()
{
- return new IterableAnonymousClass(this);
+ return new EnumerableAnonymousClass(this);
}
- private class IterableAnonymousClass : IEnumerable<Term>
+ private class EnumerableAnonymousClass : IEnumerable<Term>
{
private readonly CoalescedUpdates outerInstance;
- public IterableAnonymousClass(CoalescedUpdates outerInstance)
+ public EnumerableAnonymousClass(CoalescedUpdates outerInstance)
{
this.outerInstance = outerInstance;
}
@@ -94,23 +97,26 @@ namespace Lucene.Net.Index
}
}
- public virtual IEnumerable<QueryAndLimit> QueriesIterable()
+ /// <summary>
+ /// This was queriesIterable() in Lucene.
+ /// </summary>
+ public virtual IEnumerable<QueryAndLimit> GetQueriesEnumerable()
{
- return new IterableAnonymousClass2(this);
+ return new EnumerableAnonymousClass2(this);
}
- private class IterableAnonymousClass2 : IEnumerable<QueryAndLimit>
+ private class EnumerableAnonymousClass2 : IEnumerable<QueryAndLimit>
{
private readonly CoalescedUpdates outerInstance;
- public IterableAnonymousClass2(CoalescedUpdates outerInstance)
+ public EnumerableAnonymousClass2(CoalescedUpdates outerInstance)
{
this.outerInstance = outerInstance;
}
public virtual IEnumerator<QueryAndLimit> GetEnumerator()
{
- return new IteratorAnonymousClass(this);
+ return new EnumeratorAnonymousClass(this);
}
IEnumerator IEnumerable.GetEnumerator()
@@ -118,13 +124,13 @@ namespace Lucene.Net.Index
return GetEnumerator();
}
- private class IteratorAnonymousClass : IEnumerator<QueryAndLimit>
+ private class EnumeratorAnonymousClass : IEnumerator<QueryAndLimit>
{
- private readonly IterableAnonymousClass2 outerInstance;
+ private readonly EnumerableAnonymousClass2 outerInstance;
private readonly IEnumerator<KeyValuePair<Query, int>> iter;
private QueryAndLimit current;
- public IteratorAnonymousClass(IterableAnonymousClass2
outerInstance)
+ public EnumeratorAnonymousClass(EnumerableAnonymousClass2
outerInstance)
{
this.outerInstance = outerInstance;
iter =
this.outerInstance.outerInstance.queries.GetEnumerator();
diff --git a/src/Lucene.Net/Index/FrozenBufferedUpdates.cs
b/src/Lucene.Net/Index/FrozenBufferedUpdates.cs
index 68e9c8ae1..90eb2d688 100644
--- a/src/Lucene.Net/Index/FrozenBufferedUpdates.cs
+++ b/src/Lucene.Net/Index/FrozenBufferedUpdates.cs
@@ -139,14 +139,14 @@ namespace Lucene.Net.Index
// LUCENENET NOTE: This was termsIterable() in Lucene
public virtual IEnumerable<Term> GetTermsEnumerable()
{
- return new IterableAnonymousClass(this);
+ return new EnumerableAnonymousClass(this);
}
- private class IterableAnonymousClass : IEnumerable<Term>
+ private class EnumerableAnonymousClass : IEnumerable<Term>
{
private readonly FrozenBufferedUpdates outerInstance;
- public IterableAnonymousClass(FrozenBufferedUpdates outerInstance)
+ public EnumerableAnonymousClass(FrozenBufferedUpdates
outerInstance)
{
this.outerInstance = outerInstance;
}
@@ -156,7 +156,7 @@ namespace Lucene.Net.Index
return outerInstance.terms.GetEnumerator();
}
- System.Collections.IEnumerator
System.Collections.IEnumerable.GetEnumerator()
+ IEnumerator IEnumerable.GetEnumerator()
{
return GetEnumerator();
}
@@ -165,21 +165,21 @@ namespace Lucene.Net.Index
// LUCENENET NOTE: This was queriesIterable() in Lucene
public virtual IEnumerable<QueryAndLimit> GetQueriesEnumerable()
{
- return new IterableAnonymousClass2(this);
+ return new EnumerableAnonymousClass2(this);
}
- private class IterableAnonymousClass2 : IEnumerable<QueryAndLimit>
+ private class EnumerableAnonymousClass2 : IEnumerable<QueryAndLimit>
{
private readonly FrozenBufferedUpdates outerInstance;
- public IterableAnonymousClass2(FrozenBufferedUpdates outerInstance)
+ public EnumerableAnonymousClass2(FrozenBufferedUpdates
outerInstance)
{
this.outerInstance = outerInstance;
}
public virtual IEnumerator<QueryAndLimit> GetEnumerator()
{
- return new IteratorAnonymousClass(this);
+ return new EnumeratorAnonymousClass(this);
}
IEnumerator IEnumerable.GetEnumerator()
@@ -187,14 +187,14 @@ namespace Lucene.Net.Index
return GetEnumerator();
}
- private class IteratorAnonymousClass : IEnumerator<QueryAndLimit>
+ private class EnumeratorAnonymousClass : IEnumerator<QueryAndLimit>
{
- private readonly IterableAnonymousClass2 outerInstance;
+ private readonly EnumerableAnonymousClass2 outerInstance;
private readonly int upto;
private int i;
private QueryAndLimit current;
- public IteratorAnonymousClass(IterableAnonymousClass2
outerInstance)
+ public EnumeratorAnonymousClass(EnumerableAnonymousClass2
outerInstance)
{
this.outerInstance = outerInstance;
upto = this.outerInstance.outerInstance.queries.Length;
@@ -214,7 +214,7 @@ namespace Lucene.Net.Index
public virtual QueryAndLimit Current => current;
- object System.Collections.IEnumerator.Current => Current;
+ object IEnumerator.Current => Current;
public virtual void Reset()
{
diff --git a/src/Lucene.Net/Util/AttributeSource.cs
b/src/Lucene.Net/Util/AttributeSource.cs
index 25c9e0eab..06a9b892d 100644
--- a/src/Lucene.Net/Util/AttributeSource.cs
+++ b/src/Lucene.Net/Util/AttributeSource.cs
@@ -273,7 +273,7 @@ namespace Lucene.Net.Util
State initState = GetCurrentState();
if (initState != null)
{
- return new IteratorAnonymousClass(initState);
+ return new EnumeratorAnonymousClass(initState);
}
else
{
@@ -281,9 +281,9 @@ namespace Lucene.Net.Util
}
}
- private class IteratorAnonymousClass : IEnumerator<Attribute>
+ private class EnumeratorAnonymousClass : IEnumerator<Attribute>
{
- public IteratorAnonymousClass(AttributeSource.State initState)
+ public EnumeratorAnonymousClass(AttributeSource.State initState)
{
state = initState;
}
diff --git a/src/Lucene.Net/Util/RamUsageEstimator.cs
b/src/Lucene.Net/Util/RamUsageEstimator.cs
index ce2dd0051..b0ec85dc5 100644
--- a/src/Lucene.Net/Util/RamUsageEstimator.cs
+++ b/src/Lucene.Net/Util/RamUsageEstimator.cs
@@ -3,6 +3,7 @@ using J2N.Runtime.CompilerServices;
using Lucene.Net.Diagnostics;
using Lucene.Net.Support;
using System;
+using System.Collections;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
@@ -984,19 +985,19 @@ namespace Lucene.Net.Util
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public IEnumerator<KType> GetEnumerator()
{
- return new IteratorAnonymousClass(this);
+ return new EnumeratorAnonymousClass(this);
}
- System.Collections.IEnumerator
System.Collections.IEnumerable.GetEnumerator()
+ IEnumerator IEnumerable.GetEnumerator()
{
return GetEnumerator();
}
- private class IteratorAnonymousClass : IEnumerator<KType>
+ private class EnumeratorAnonymousClass : IEnumerator<KType>
{
private readonly IdentityHashSet<KType> outerInstance;
- public IteratorAnonymousClass(IdentityHashSet<KType>
outerInstance)
+ public EnumeratorAnonymousClass(IdentityHashSet<KType>
outerInstance)
{
this.outerInstance = outerInstance;
pos = -1;
@@ -1022,7 +1023,7 @@ namespace Lucene.Net.Util
public KType Current => current;
- object System.Collections.IEnumerator.Current => Current;
+ object IEnumerator.Current => Current;
private object FetchNext()
{
diff --git a/src/Lucene.Net/Util/WeakIdentityMap.cs
b/src/Lucene.Net/Util/WeakIdentityMap.cs
index 375d6aab3..5da58dcdb 100644
--- a/src/Lucene.Net/Util/WeakIdentityMap.cs
+++ b/src/Lucene.Net/Util/WeakIdentityMap.cs
@@ -1,4 +1,4 @@
-// LUCENENET specific - factored out this class and replaced it with
ConditionalWeakTable<TKey, TValue>.
+// LUCENENET specific - factored out this class and replaced it with
ConditionalWeakTable<TKey, TValue>.
// ConditionalWeakTable<TKey, TValue> is thread-safe and internally uses
RuntimeHelpers.GetHashCode()
// to lookup the key, so it can be used as a direct replacement for
WeakIdentityMap<TKey, TValue>
// in most cases.
@@ -192,7 +192,7 @@
// public IEnumerator<TKey> GetEnumerator()
// {
// outerInstance.Reap();
-// return new IteratorAnonymousClass(outerInstance);
+// return new EnumeratorAnonymousClass(outerInstance);
// }
// IEnumerator IEnumerable.GetEnumerator()
@@ -259,12 +259,12 @@
// }
// }
-// private class IteratorAnonymousClass : IEnumerator<TKey>
+// private class EnumeratorAnonymousClass : IEnumerator<TKey>
// {
// private readonly WeakIdentityMap<TKey, TValue> outerInstance;
// private readonly IEnumerator<KeyValuePair<IdentityWeakReference,
TValue>> enumerator;
-// public IteratorAnonymousClass(WeakIdentityMap<TKey, TValue>
outerInstance)
+// public EnumeratorAnonymousClass(WeakIdentityMap<TKey, TValue>
outerInstance)
// {
// this.outerInstance = outerInstance;
// enumerator = outerInstance.backingStore.GetEnumerator();
