Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions csharp.test/TestLogicalTypeRoundtrip.cs
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,49 @@ public static void TestNestedStructArray([Values(Repetition.Required, Repetition
fileReader.Close();
}

[Test]
public static void TestLargeArraysEnumerator()
{
CheckEnumerator(Enumerable.Range(0, 4100).ToArray());
CheckEnumerator(Enumerable.Range(0, 4100).Select(i => new[] {$"row {i}"}).ToArray());
Comment thread
philjdf marked this conversation as resolved.
Outdated
}

private static void CheckEnumerator<T>(T[] values)
{
using var buffer = new ResizableBuffer();

using (var output = new BufferOutputStream(buffer))
{
var columns = new Column[] {new Column<T>("col0")};

using var fileWriter = new ParquetFileWriter(output, columns);
using var rowGroupWriter = fileWriter.AppendBufferedRowGroup();

using var col = rowGroupWriter.Column(0).LogicalWriter<T>();
col.WriteBatch(values);

fileWriter.Close();
}

using (var input = new BufferReader(buffer))
{
using var fileReader = new ParquetFileReader(input);
using var rowGroupReader = fileReader.RowGroup(0);

using var col = rowGroupReader.Column(0).LogicalReader<T>();

var enumerator = col.GetEnumerator();
for (var i = 0; i < values.Length; i++)
{
Assert.IsTrue(enumerator.MoveNext());
Assert.AreEqual(values[i], enumerator.Current);
}
Assert.IsFalse(enumerator.MoveNext());

fileReader.Close();
}
}

[Test]
public static void TestBigArrayRoundtrip()
{
Expand Down
4 changes: 3 additions & 1 deletion csharp/LogicalColumnReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ internal static LogicalColumnReader<TElement> Create<TElement>(ColumnReader colu
}
}

public bool HasNext => Source.HasNext;
public abstract bool HasNext { get; }

public abstract TReturn Apply<TReturn>(ILogicalColumnReaderVisitor<TReturn> visitor);

Expand Down Expand Up @@ -153,6 +153,8 @@ private static (short definitionLevelDelta, int schemaSlice) StructSkip(ReadOnly
return (definitionLevel, schemaSlice);
}

public override bool HasNext => !_bufferedReader.IsEofDefinition;

public override int ReadBatch(Span<TElement> destination)
{
short definitionLevel = 0;
Expand Down