Skip to content

[Backport 7.x] Avoid multiple enumeration of IEnumerable PostData #4432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 24, 2020
Merged

[Backport 7.x] Avoid multiple enumeration of IEnumerable PostData #4432

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
62 changes: 44 additions & 18 deletions src/Elasticsearch.Net/Transport/PostData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,28 +187,41 @@ public override void Write(Stream writableStream, IConnectionConfigurationValues
break;

case PostType.EnumerableOfString:
if (!_enumerableOfStrings.HasAny()) return;
{
if (_enumerableOfStrings == null)
return;

using var enumerator = _enumerableOfStrings.GetEnumerator();
if (!enumerator.MoveNext())
return;

BufferIfNeeded(settings, ref buffer, ref stream);
foreach (var s in _enumerableOfStrings)
do
{
var bytes = s.Utf8Bytes();
var bytes = enumerator.Current.Utf8Bytes();
stream.Write(bytes, 0, bytes.Length);
stream.Write(NewLineByteArray, 0, 1);
}
} while (enumerator.MoveNext());
break;

}
case PostType.EnumerableOfObject:
if (!_enumerableOfObject.HasAny()) return;
{
if (_enumerableOfObject == null)
return;

using var enumerator = _enumerableOfObject.GetEnumerator();
if (!enumerator.MoveNext())
return;

BufferIfNeeded(settings, ref buffer, ref stream);
foreach (var o in _enumerableOfObject)
do
{
var o = enumerator.Current;
settings.RequestResponseSerializer.Serialize(o, stream, SerializationFormatting.None);
stream.Write(NewLineByteArray, 0, 1);
}
} while (enumerator.MoveNext());
break;

}
case PostType.StreamHandler:
var streamHandlerException = $"{nameof(PostData)} cannot handle {nameof(PostType.StreamHandler)} data. "
+ $"Use {typeof(StreamableData<>).FullName} through {nameof(PostData)}.{nameof(StreamHandler)}<T>() for streamable data";
Expand Down Expand Up @@ -267,29 +280,42 @@ public override async Task WriteAsync(Stream writableStream, IConnectionConfigur
break;

case PostType.EnumerableOfString:
if (!_enumerableOfStrings.HasAny()) return;
{
if (_enumerableOfStrings == null)
return;

using var enumerator = _enumerableOfStrings.GetEnumerator();
if (!enumerator.MoveNext())
return;

BufferIfNeeded(settings, ref buffer, ref stream);
foreach (var s in _enumerableOfStrings)
do
{
var bytes = s.Utf8Bytes();
var bytes = enumerator.Current.Utf8Bytes();
await stream.WriteAsync(bytes, 0, bytes.Length, cancellationToken).ConfigureAwait(false);
await stream.WriteAsync(NewLineByteArray, 0, 1, cancellationToken).ConfigureAwait(false);
}
} while (enumerator.MoveNext());
break;

}
case PostType.EnumerableOfObject:
if (!_enumerableOfObject.HasAny()) return;
{
if (_enumerableOfObject == null)
return;

using var enumerator = _enumerableOfObject.GetEnumerator();
if (!enumerator.MoveNext())
return;

BufferIfNeeded(settings, ref buffer, ref stream);
foreach (var o in _enumerableOfObject)
do
{
var o = enumerator.Current;
await settings.RequestResponseSerializer.SerializeAsync(o, stream, SerializationFormatting.None, cancellationToken)
.ConfigureAwait(false);
await stream.WriteAsync(NewLineByteArray, 0, 1, cancellationToken).ConfigureAwait(false);
}
} while (enumerator.MoveNext());
break;

}
case PostType.StreamHandler:
throw new Exception("PostData is not expected/capable to handle streamable data, use StreamableData instead");

Expand Down