Get rid of provider-specific values (#4980)

roji · web-flow · commit 57f09d026c32 · 2023-03-07T20:29:35.000+01:00
Closes #4977
diff --git a/src/Npgsql.NodaTime/Internal/DateMultirangeHandler.cs b/src/Npgsql.NodaTime/Internal/DateMultirangeHandler.cs
@@ -22,7 +22,6 @@ public DateMultirangeHandler(PostgresMultirangeType multirangePostgresType, Date
         => _dateIntervalHandler = rangeHandler;
 
     public override Type GetFieldType(FieldDescription? fieldDescription = null) => typeof(DateInterval[]);
-    public override Type GetProviderSpecificFieldType(FieldDescription? fieldDescription = null) => typeof(DateInterval[]);
 
     public override async ValueTask<object> ReadAsObject(NpgsqlReadBuffer buf, int len, bool async,
         FieldDescription? fieldDescription = null)
diff --git a/src/Npgsql.NodaTime/Internal/DateRangeHandler.cs b/src/Npgsql.NodaTime/Internal/DateRangeHandler.cs
@@ -24,7 +24,6 @@ public DateRangeHandler(PostgresType rangePostgresType, NpgsqlTypeHandler subtyp
     }
 
     public override Type GetFieldType(FieldDescription? fieldDescription = null) => typeof(DateInterval);
-    public override Type GetProviderSpecificFieldType(FieldDescription? fieldDescription = null) => typeof(DateInterval);
 
     public override async ValueTask<object> ReadAsObject(NpgsqlReadBuffer buf, int len, bool async,
         FieldDescription? fieldDescription = null)
diff --git a/src/Npgsql.NodaTime/Internal/TimestampTzMultirangeHandler.cs b/src/Npgsql.NodaTime/Internal/TimestampTzMultirangeHandler.cs
@@ -22,7 +22,6 @@ public partial class TimestampTzMultirangeHandler : MultirangeHandler<Instant>,
     readonly INpgsqlTypeHandler<Interval> _intervalHandler;
 
     public override Type GetFieldType(FieldDescription? fieldDescription = null) => typeof(Interval[]);
-    public override Type GetProviderSpecificFieldType(FieldDescription? fieldDescription = null) => typeof(Interval[]);
 
     public TimestampTzMultirangeHandler(PostgresMultirangeType pgMultirangeType, TimestampTzRangeHandler rangeHandler)
         : base(pgMultirangeType, rangeHandler)
diff --git a/src/Npgsql.NodaTime/Internal/TimestampTzRangeHandler.cs b/src/Npgsql.NodaTime/Internal/TimestampTzRangeHandler.cs
@@ -16,7 +16,6 @@ public partial class TimestampTzRangeHandler : RangeHandler<Instant>,
     INpgsqlTypeHandler<NpgsqlRange<DateTime>>, INpgsqlTypeHandler<NpgsqlRange<DateTimeOffset>>
 {
     public override Type GetFieldType(FieldDescription? fieldDescription = null) => typeof(Interval);
-    public override Type GetProviderSpecificFieldType(FieldDescription? fieldDescription = null) => typeof(Interval);
 
     public TimestampTzRangeHandler(PostgresType rangePostgresType, NpgsqlTypeHandler subtypeHandler)
         : base(rangePostgresType, subtypeHandler)
diff --git a/src/Npgsql/Internal/TypeHandlers/ArrayHandler.cs b/src/Npgsql/Internal/TypeHandlers/ArrayHandler.cs
@@ -26,7 +26,6 @@ namespace Npgsql.Internal.TypeHandlers;
 public class ArrayHandler : NpgsqlTypeHandler
 {
     readonly Type _defaultArrayType;
-    readonly Type _psvArrayType;
     readonly ConcurrentDictionary<Type, ArrayHandlerCore> _concreteHandlers = new();
     protected int LowerBound { get; }
     protected NpgsqlTypeHandler ElementHandler { get; }
@@ -37,12 +36,10 @@ public ArrayHandler(PostgresType arrayPostgresType, NpgsqlTypeHandler elementHan
         LowerBound = lowerBound;
         ElementHandler = elementHandler;
         ArrayNullabilityMode = arrayNullabilityMode;
-        _psvArrayType = elementHandler.GetProviderSpecificFieldType().MakeArrayType();
         _defaultArrayType = elementHandler.GetFieldType().MakeArrayType();
     }
 
     public override Type GetFieldType(FieldDescription? fieldDescription = null) => typeof(Array);
-    public override Type GetProviderSpecificFieldType(FieldDescription? fieldDescription = null) => typeof(Array);
 
     /// <inheritdoc />
     public override NpgsqlTypeHandler CreateArrayHandler(PostgresArrayType pgArrayType, ArrayNullabilityMode arrayNullabilityMode)
@@ -59,13 +56,6 @@ public override NpgsqlTypeHandler CreateMultirangeHandler(PostgresMultirangeType
     ArrayHandlerCore CreateHandler(Type elementType)
         => (ArrayHandlerCore)Activator.CreateInstance(typeof(ArrayHandlerCore<>).MakeGenericType(elementType), ElementHandler, ArrayNullabilityMode, LowerBound)!;
 
-    internal override ValueTask<object> ReadPsvAsObject(NpgsqlReadBuffer buf, int len, bool async,
-        FieldDescription? fieldDescription = null)
-    {
-        var handler = _concreteHandlers.GetOrAdd(_psvArrayType, static (_, instance) => instance.CreateHandler(instance.ElementHandler.GetProviderSpecificFieldType()), this);
-        return handler.ReadArrayAsObject(buf, async);
-    }
-
     /// <inheritdoc />
     protected internal override async ValueTask<TArray> ReadCustom<TArray>(NpgsqlReadBuffer buf, int len, bool async,
         FieldDescription? fieldDescription)
diff --git a/src/Npgsql/Internal/TypeHandlers/BitStringHandler.cs b/src/Npgsql/Internal/TypeHandlers/BitStringHandler.cs
@@ -32,9 +32,6 @@ public BitStringHandler(PostgresType pgType) : base(pgType) {}
     public override Type GetFieldType(FieldDescription? fieldDescription = null)
         => fieldDescription != null && fieldDescription.TypeModifier == 1 ? typeof(bool) : typeof(BitArray);
 
-    public override Type GetProviderSpecificFieldType(FieldDescription? fieldDescription = null)
-        => GetFieldType(fieldDescription);
-
     // BitString requires a special array handler which returns bool or BitArray
     /// <inheritdoc />
     public override NpgsqlTypeHandler CreateArrayHandler(PostgresArrayType pgArrayType, ArrayNullabilityMode arrayNullabilityMode)
diff --git a/src/Npgsql/Internal/TypeHandlers/MultirangeHandler.cs b/src/Npgsql/Internal/TypeHandlers/MultirangeHandler.cs
@@ -130,7 +130,6 @@ public async Task WriteMultirange<TAnySubtype>(
     }
 
     public override Type GetFieldType(FieldDescription? fieldDescription = null) => typeof(NpgsqlRange<TSubtype>[]);
-    public override Type GetProviderSpecificFieldType(FieldDescription? fieldDescription = null) => typeof(NpgsqlRange<TSubtype>[]);
 
     /// <inheritdoc />
     public override NpgsqlTypeHandler CreateArrayHandler(PostgresArrayType pgArrayType, ArrayNullabilityMode arrayNullabilityMode)
diff --git a/src/Npgsql/Internal/TypeHandlers/NetworkHandlers/InetHandler.cs b/src/Npgsql/Internal/TypeHandlers/NetworkHandlers/InetHandler.cs
@@ -21,7 +21,8 @@ namespace Npgsql.Internal.TypeHandlers.NetworkHandlers;
 /// should be considered somewhat unstable, and may change in breaking ways, including in non-major releases.
 /// Use it at your own risk.
 /// </remarks>
-public partial class InetHandler : NpgsqlSimpleTypeHandlerWithPsv<IPAddress, (IPAddress Address, int Subnet)>,
+public partial class InetHandler : NpgsqlSimpleTypeHandler<IPAddress>,
+    INpgsqlSimpleTypeHandler<(IPAddress Address, int Subnet)>,
     INpgsqlSimpleTypeHandler<NpgsqlInet>
 {
     // ReSharper disable InconsistentNaming
@@ -58,7 +59,8 @@ internal static (IPAddress Address, int Subnet) DoRead(
 #pragma warning restore CA1801 // Review unused parameters
 
     /// <inheritdoc />
-    protected override (IPAddress Address, int Subnet) ReadPsv(NpgsqlReadBuffer buf, int len, FieldDescription? fieldDescription = null)
+    (IPAddress Address, int Subnet) INpgsqlSimpleTypeHandler<(IPAddress Address, int Subnet)>.Read(
+        NpgsqlReadBuffer buf, int len, FieldDescription? fieldDescription)
         => DoRead(buf, len, fieldDescription, false);
 
     NpgsqlInet INpgsqlSimpleTypeHandler<NpgsqlInet>.Read(NpgsqlReadBuffer buf, int len, FieldDescription? fieldDescription)
@@ -76,7 +78,7 @@ public override int ValidateAndGetLength(IPAddress value, NpgsqlParameter? param
         => GetLength(value);
 
     /// <inheritdoc />
-    public override int ValidateAndGetLength((IPAddress Address, int Subnet) value, NpgsqlParameter? parameter)
+    public int ValidateAndGetLength((IPAddress Address, int Subnet) value, NpgsqlParameter? parameter)
         => GetLength(value.Address);
 
     /// <inheritdoc />
@@ -88,7 +90,7 @@ public override void Write(IPAddress value, NpgsqlWriteBuffer buf, NpgsqlParamet
         => DoWrite(value, -1, buf, false);
 
     /// <inheritdoc />
-    public override void Write((IPAddress Address, int Subnet) value, NpgsqlWriteBuffer buf, NpgsqlParameter? parameter)
+    public void Write((IPAddress Address, int Subnet) value, NpgsqlWriteBuffer buf, NpgsqlParameter? parameter)
         => DoWrite(value.Address, value.Subnet, buf, false);
 
     /// <inheritdoc />
diff --git a/src/Npgsql/Internal/TypeHandlers/RangeHandler.cs b/src/Npgsql/Internal/TypeHandlers/RangeHandler.cs
@@ -34,7 +34,6 @@ public RangeHandler(PostgresType rangePostgresType, NpgsqlTypeHandler subtypeHan
         => SubtypeHandler = subtypeHandler;
 
     public override Type GetFieldType(FieldDescription? fieldDescription = null) => typeof(NpgsqlRange<TSubtype>);
-    public override Type GetProviderSpecificFieldType(FieldDescription? fieldDescription = null) => typeof(NpgsqlRange<TSubtype>);
 
     /// <inheritdoc />
     public override NpgsqlTypeHandler CreateArrayHandler(PostgresArrayType pgArrayType, ArrayNullabilityMode arrayNullabilityMode)
diff --git a/src/Npgsql/Internal/TypeHandling/NpgsqlSimpleTypeHandlerWithPsv.cs b/src/Npgsql/Internal/TypeHandling/NpgsqlSimpleTypeHandlerWithPsv.cs
diff --git a/src/Npgsql/Internal/TypeHandling/NpgsqlTypeHandler.cs b/src/Npgsql/Internal/TypeHandling/NpgsqlTypeHandler.cs
@@ -91,24 +91,6 @@ internal object ReadAsObject(NpgsqlReadBuffer buf, int len, FieldDescription? fi
         return ReadAsObject(buf, len, async: false, fieldDescription).Result;
     }
 
-    /// <summary>
-    /// Reads a column as the type handler's provider-specific type. If it is not already entirely in
-    /// memory, sync or async I/O will be performed as specified by <paramref name="async"/>.
-    /// </summary>
-    internal virtual ValueTask<object> ReadPsvAsObject(NpgsqlReadBuffer buf, int len, bool async, FieldDescription? fieldDescription = null)
-        => ReadAsObject(buf, len, async, fieldDescription);
-
-    /// <summary>
-    /// Version of <see cref="ReadPsvAsObject(NpgsqlReadBuffer,int,bool,FieldDescription?)"/> that's called when we know the entire value
-    /// is already buffered in memory (i.e. in non-sequential mode).
-    /// </summary>
-    internal virtual object ReadPsvAsObject(NpgsqlReadBuffer buf, int len, FieldDescription? fieldDescription = null)
-    {
-        Debug.Assert(buf.ReadBytesLeft >= len);
-
-        return ReadPsvAsObject(buf, len, async: false, fieldDescription).Result;
-    }
-
     /// <summary>
     /// Reads a value from the buffer, assuming our read position is at the value's preceding length.
     /// If the length is -1 (null), this method will return the default value.
@@ -259,7 +241,6 @@ protected virtual Task WriteWithLengthCustom<TAny>(
     #region Misc
 
     public abstract Type GetFieldType(FieldDescription? fieldDescription = null);
-    public abstract Type GetProviderSpecificFieldType(FieldDescription? fieldDescription = null);
 
     internal virtual bool PreferTextWrite => false;
 
diff --git a/src/Npgsql/Internal/TypeHandling/NpgsqlTypeHandler`.cs b/src/Npgsql/Internal/TypeHandling/NpgsqlTypeHandler`.cs
@@ -61,7 +61,6 @@ public override async ValueTask<object> ReadAsObject(NpgsqlReadBuffer buf, int l
     #region Misc
 
     public override Type GetFieldType(FieldDescription? fieldDescription = null) => typeof(TDefault);
-    public override Type GetProviderSpecificFieldType(FieldDescription? fieldDescription = null) => typeof(TDefault);
 
     /// <inheritdoc />
     public override NpgsqlTypeHandler CreateArrayHandler(PostgresArrayType pgArrayType, ArrayNullabilityMode arrayNullabilityMode)
diff --git a/src/Npgsql/NpgsqlDataReader.cs b/src/Npgsql/NpgsqlDataReader.cs
@@ -1833,51 +1833,6 @@ public override object GetValue(int ordinal)
         return result;
     }
 
-    /// <summary>
-    /// Gets the value of the specified column as an instance of <see cref="object"/>.
-    /// </summary>
-    /// <param name="ordinal">The zero-based column ordinal.</param>
-    /// <returns>The value of the specified column.</returns>
-    public override object GetProviderSpecificValue(int ordinal)
-    {
-        var fieldDescription = CheckRowAndGetField(ordinal);
-
-        if (_isSequential)
-        {
-            SeekToColumnSequential(ordinal, false).GetAwaiter().GetResult();
-            CheckColumnStart();
-        }
-        else
-            SeekToColumnNonSequential(ordinal);
-
-        if (ColumnLen == -1)
-            return DBNull.Value;
-
-        var position = Buffer.ReadPosition;
-        try
-        {
-            return _isSequential
-                ? fieldDescription.Handler.ReadPsvAsObject(Buffer, ColumnLen, false, fieldDescription).GetAwaiter().GetResult()
-                : fieldDescription.Handler.ReadPsvAsObject(Buffer, ColumnLen, fieldDescription);
-        }
-        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;
-        }
-    }
-
     /// <summary>
     /// Gets the value of the specified column as an instance of <see cref="object"/>.
     /// </summary>
@@ -1988,39 +1943,6 @@ public override Type GetFieldType(int ordinal)
         => Command.ObjectResultTypes?[ordinal]
            ?? GetField(ordinal).FieldType;
 
-    /// <summary>
-    /// Returns the provider-specific field type of the specified column.
-    /// </summary>
-    /// <param name="ordinal">The zero-based column ordinal.</param>
-    /// <returns>The Type object that describes the data type of the specified column.</returns>
-    public override Type GetProviderSpecificFieldType(int ordinal)
-    {
-        var fieldDescription = GetField(ordinal);
-        return fieldDescription.Handler.GetProviderSpecificFieldType(fieldDescription);
-    }
-
-    /// <summary>
-    /// Gets all provider-specific attribute columns in the collection for the current row.
-    /// </summary>
-    /// <param name="values">An array of Object into which to copy the attribute columns.</param>
-    /// <returns>The number of instances of <see cref="object"/> in the array.</returns>
-    public override int GetProviderSpecificValues(object[] values)
-    {
-        if (values == null)
-            throw new ArgumentNullException(nameof(values));
-        if (State != ReaderState.InResult)
-        {
-            throw State == ReaderState.Disposed
-                ? new ObjectDisposedException(nameof(NpgsqlDataReader))
-                : new InvalidOperationException("No row is available");
-        }
-
-        var count = Math.Min(FieldCount, values.Length);
-        for (var i = 0; i < count; i++)
-            values[i] = GetProviderSpecificValue(i);
-        return count;
-    }
-
     /// <summary>
     /// Returns an <see cref="IEnumerator"/> that can be used to iterate through the rows in the data reader.
     /// </summary>
diff --git a/src/Npgsql/NpgsqlNestedDataReader.cs b/src/Npgsql/NpgsqlNestedDataReader.cs
@@ -348,35 +348,6 @@ public override T GetFieldValue<T>(int ordinal)
                 : field.Handler.Read<T>(Buffer, field.Length, fieldDescription: null);
     }
 
-    /// <inheritdoc />
-    public override Type GetProviderSpecificFieldType(int ordinal)
-    {
-        var column = CheckRowAndColumn(ordinal);
-        return column.TypeHandler.GetProviderSpecificFieldType();
-    }
-
-    /// <inheritdoc />
-    public override object GetProviderSpecificValue(int ordinal)
-    {
-        var column = CheckRowAndColumnAndSeek(ordinal);
-        if (column.Length == -1)
-            return DBNull.Value;
-        return column.Handler.ReadPsvAsObject(Buffer, column.Length);
-    }
-
-    /// <inheritdoc />
-    public override int GetProviderSpecificValues(object[] values)
-    {
-        if (values == null)
-            throw new ArgumentNullException(nameof(values));
-        CheckOnRow();
-
-        var count = Math.Min(FieldCount, values.Length);
-        for (var i = 0; i < count; i++)
-            values[i] = GetProviderSpecificValue(i);
-        return count;
-    }
-
     /// <inheritdoc />
     public override bool Read()
     {
diff --git a/src/Npgsql/PublicAPI.Unshipped.txt b/src/Npgsql/PublicAPI.Unshipped.txt

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ public DateRangeHandler(PostgresType rangePostgresType, NpgsqlTypeHandler subtyp`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public override Type GetFieldType(FieldDescription? fieldDescription = null) => typeof(DateInterval);`
`27`		`- public override Type GetProviderSpecificFieldType(FieldDescription? fieldDescription = null) => typeof(DateInterval);`
`28`	`27`
`29`	`28`	`public override async ValueTask<object> ReadAsObject(NpgsqlReadBuffer buf, int len, bool async,`
`30`	`29`	`FieldDescription? fieldDescription = null)`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ public partial class TimestampTzRangeHandler : RangeHandler<Instant>,`
`16`	`16`	`INpgsqlTypeHandler<NpgsqlRange<DateTime>>, INpgsqlTypeHandler<NpgsqlRange<DateTimeOffset>>`
`17`	`17`	`{`
`18`	`18`	`public override Type GetFieldType(FieldDescription? fieldDescription = null) => typeof(Interval);`
`19`		`- public override Type GetProviderSpecificFieldType(FieldDescription? fieldDescription = null) => typeof(Interval);`
`20`	`19`
`21`	`20`	`public TimestampTzRangeHandler(PostgresType rangePostgresType, NpgsqlTypeHandler subtypeHandler)`
`22`	`21`	`: base(rangePostgresType, subtypeHandler)`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,6 @@ public async Task WriteMultirange<TAnySubtype>(`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`public override Type GetFieldType(FieldDescription? fieldDescription = null) => typeof(NpgsqlRange<TSubtype>[]);`
`133`		`- public override Type GetProviderSpecificFieldType(FieldDescription? fieldDescription = null) => typeof(NpgsqlRange<TSubtype>[]);`
`134`	`133`
`135`	`134`	`/// <inheritdoc />`
`136`	`135`	`public override NpgsqlTypeHandler CreateArrayHandler(PostgresArrayType pgArrayType, ArrayNullabilityMode arrayNullabilityMode)`