Skip to content

Remove excessive try/catch from GetFieldValue<T> #4868

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
vonzshik merged 1 commit into from
Jan 12, 2023
Merged

Remove excessive try/catch from GetFieldValue<T> #4868

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
32 changes: 7 additions & 25 deletions src/Npgsql/NpgsqlDataReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1715,31 +1715,13 @@ public override T GetFieldValue<T>(int ordinal)
ThrowHelper.ThrowInvalidCastException_NoValue(field);
}

var position = Buffer.ReadPosition;
try
{
return NullableHandler<T>.Exists
? NullableHandler<T>.Read(field.Handler, Buffer, ColumnLen, field)
: typeof(T) == typeof(object)
? (T)field.Handler.ReadAsObject(Buffer, ColumnLen, field)
: field.Handler.Read<T>(Buffer, ColumnLen, field);
}
catch
{
if (Connector.State != ConnectorState.Broken)
{
var writtenBytes = Buffer.ReadPosition - position;
var remainingBytes = ColumnLen - writtenBytes;
if (remainingBytes > 0)
Buffer.Skip(remainingBytes, false).GetAwaiter().GetResult();
}
throw;
}
finally
{
// Important: position must still be updated
PosInColumn += ColumnLen;
}
// We don't handle exceptions or update PosInColumn
// As with non-sequential reads we always just move to the start/end of the column
return NullableHandler<T>.Exists
? NullableHandler<T>.Read(field.Handler, Buffer, ColumnLen, field)
: typeof(T) == typeof(object)
? (T)field.Handler.ReadAsObject(Buffer, ColumnLen, field)
: field.Handler.Read<T>(Buffer, ColumnLen, field);
}

async ValueTask<T> GetFieldValueSequential<T>(int column, bool async, CancellationToken cancellationToken = default)
Expand Down