Merge ReadAsync, ReadSyncOverAsync

Also move ReadSyncOverAsync down in netcore's TdsParserStateObjectNative to aid later merge

Author: edwardneal

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObject.netcore.cs

@@ -100,10 +100,6 @@ internal abstract void CreatePhysicalSNIHandle(
 
         internal abstract void DisposePacketCache();
 
-        internal abstract PacketHandle ReadSyncOverAsync(int timeoutRemaining, out uint error);
-
-        internal abstract PacketHandle ReadAsync(SessionHandle handle, out uint error);
-
         internal abstract uint CheckConnection();
 
         protected abstract uint SniPacketGetData(PacketHandle packet, byte[] _inBuff, ref uint dataSize);

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObjectNative.cs

@@ -256,18 +256,6 @@ protected override void FreeGcHandle(int remaining, bool release)
 
         internal override bool IsFailedHandle() => _sessionHandle.Status != TdsEnums.SNI_SUCCESS;
 
-        internal override PacketHandle ReadSyncOverAsync(int timeoutRemaining, out uint error)
-        {
-            SNIHandle handle = Handle;
-            if (handle == null)
-            {
-                throw ADP.ClosedConnectionError();
-            }
-            IntPtr readPacketPtr = IntPtr.Zero;
-            error = SniNativeWrapper.SniReadSyncOverAsync(handle, ref readPacketPtr, GetTimeoutRemaining());
-            return PacketHandle.FromNativePointer(readPacketPtr);
-        }
-
         protected override PacketHandle EmptyReadPacket => PacketHandle.FromNativePointer(default);
 
         internal override Guid? SessionId => default;
@@ -298,6 +286,14 @@ internal override PacketHandle ReadAsync(SessionHandle handle, out uint error)
             return PacketHandle.FromNativePointer(readPacketPtr);
         }
 
+        internal override PacketHandle ReadSyncOverAsync(int timeoutRemaining, out uint error)
+        {
+            SNIHandle handle = Handle ?? throw ADP.ClosedConnectionError();
+            IntPtr readPacketPtr = IntPtr.Zero;
+            error = SniNativeWrapper.SniReadSyncOverAsync(handle, ref readPacketPtr, GetTimeoutRemaining());
+            return PacketHandle.FromNativePointer(readPacketPtr);
+        }
+
         internal override PacketHandle CreateAndSetAttentionPacket()
         {
             SNIHandle handle = Handle;

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObject.netfx.cs

@@ -136,21 +136,6 @@ internal void CreatePhysicalSNIHandle(
                 ipPreference, cachedDNSInfo, hostNameInCertificate);
         }
 
-        internal PacketHandle ReadSyncOverAsync(int timeoutRemaining, out uint error)
-        {
-            SNIHandle handle = Handle ?? throw ADP.ClosedConnectionError();
-            IntPtr readPacketPtr = IntPtr.Zero;
-            error = SniNativeWrapper.SniReadSyncOverAsync(handle, ref readPacketPtr, timeoutRemaining);
-            return PacketHandle.FromNativePointer(readPacketPtr);
-        }
-
-        internal PacketHandle ReadAsync(SessionHandle handle, out uint error)
-        {
-            IntPtr readPacketPtr = IntPtr.Zero;
-            error = SniNativeWrapper.SniReadAsync(handle.NativeHandle, ref readPacketPtr);
-            return PacketHandle.FromNativePointer(readPacketPtr);
-        }
-
         internal uint CheckConnection() => SniNativeWrapper.SniCheckConnection(Handle);
 
         [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObjectNative.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Diagnostics;
 using Interop.Windows.Sni;
+using Microsoft.Data.Common;
 
 namespace Microsoft.Data.SqlClient
 {
@@ -42,6 +43,21 @@ internal override void ReleasePacket(PacketHandle syncReadPacket)
             SniNativeWrapper.SniPacketRelease(syncReadPacket.NativePointer);
         }
 
+        internal override PacketHandle ReadAsync(SessionHandle handle, out uint error)
+        {
+            IntPtr readPacketPtr = IntPtr.Zero;
+            error = SniNativeWrapper.SniReadAsync(handle.NativeHandle, ref readPacketPtr);
+            return PacketHandle.FromNativePointer(readPacketPtr);
+        }
+
+        internal override PacketHandle ReadSyncOverAsync(int timeoutRemaining, out uint error)
+        {
+            SNIHandle handle = Handle ?? throw ADP.ClosedConnectionError();
+            IntPtr readPacketPtr = IntPtr.Zero;
+            error = SniNativeWrapper.SniReadSyncOverAsync(handle, ref readPacketPtr, timeoutRemaining);
+            return PacketHandle.FromNativePointer(readPacketPtr);
+        }
+
         internal override uint SniGetConnectionId(ref Guid clientConnectionId)
             => SniNativeWrapper.SniGetConnectionId(Handle, ref clientConnectionId);
 

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs

@@ -485,6 +485,10 @@ internal long TimeoutTime
 
         internal abstract void ReleasePacket(PacketHandle syncReadPacket);
 
+        internal abstract PacketHandle ReadSyncOverAsync(int timeoutRemaining, out uint error);
+
+        internal abstract PacketHandle ReadAsync(SessionHandle handle, out uint error);
+
         internal abstract uint SniGetConnectionId(ref Guid clientConnectionId);
 
         internal abstract uint DisableSsl();