Skip to content

Commit cf5fe30

Browse files
committed
PR feedback
1 parent 7884c64 commit cf5fe30

4 files changed

Lines changed: 14 additions & 6 deletions

File tree

src/Lucene.Net/Index/BinaryDocValuesWriter.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using Lucene.Net.Diagnostics;
12
using System;
23
using System.Collections.Generic;
34

@@ -147,7 +148,8 @@ private IEnumerable<BytesRef> GetBytesIterator(int maxDocParam)
147148
BytesRef v = null;
148149
if (upto < size)
149150
{
150-
lengthsEnumerator.MoveNext();
151+
bool moved = lengthsEnumerator.MoveNext();
152+
if (Debugging.AssertsEnabled) Debugging.Assert(moved);
151153
int length = (int)lengthsEnumerator.Current;
152154
value.Grow(length);
153155
value.Length = length;

src/Lucene.Net/Index/NumericDocValuesWriter.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using Lucene.Net.Diagnostics;
12
using Lucene.Net.Util.Packed;
23
using System;
34
using System.Collections.Generic;
@@ -111,7 +112,8 @@ public override void Flush(SegmentWriteState state, DocValuesConsumer dvConsumer
111112
long? value;
112113
if (upto < size)
113114
{
114-
enumerator.MoveNext();
115+
bool moved = enumerator.MoveNext();
116+
if (Debugging.AssertsEnabled) Debugging.Assert(moved);
115117
var v = enumerator.Current;
116118
if (docsWithField is null || docsWithField.Get(upto))
117119
{

src/Lucene.Net/Index/SortedDocValuesWriter.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@ private IEnumerable<BytesRef> GetBytesRefEnumerable(int valueCount, int[] sorted
149149

150150
for (int i = 0; i < maxDoc; ++i)
151151
{
152-
enumerator.MoveNext();
152+
bool moved = enumerator.MoveNext();
153+
if (Debugging.AssertsEnabled) Debugging.Assert(moved);
153154
int ord = (int)enumerator.Current;
154155
yield return ord == -1 ? ord : ordMap[ord];
155156
}

src/Lucene.Net/Index/SortedSetDocValuesWriter.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,8 @@ private IEnumerable<BytesRef> GetValuesEnumerable(int valueCount, int[] sortedVa
208208

209209
for (int docUpto = 0; docUpto < maxDoc; ++docUpto)
210210
{
211-
enumerator.MoveNext();
211+
bool moved = enumerator.MoveNext();
212+
if (Debugging.AssertsEnabled) Debugging.Assert(moved);
212213
yield return enumerator.Current;
213214
}
214215
}
@@ -227,11 +228,13 @@ private IEnumerable<BytesRef> GetValuesEnumerable(int valueCount, int[] sortedVa
227228
{
228229
// refill next doc, and sort remapped ords within the doc.
229230
currentUpTo = 0;
230-
counts.MoveNext();
231+
bool countsMoved = counts.MoveNext();
232+
if (Debugging.AssertsEnabled) Debugging.Assert(countsMoved);
231233
currentLength = (int)counts.Current;
232234
for (int j = 0; j < currentLength; j++)
233235
{
234-
enumerator.MoveNext();
236+
bool moved = enumerator.MoveNext();
237+
if (Debugging.AssertsEnabled) Debugging.Assert(moved);
235238
cd[j] = ordMap[(int)enumerator.Current];
236239
}
237240
Array.Sort(cd, 0, currentLength);

0 commit comments

Comments
 (0)