Merge CreateSessionHandle

Author: edwardneal

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

@@ -31,7 +31,7 @@ internal static void PrepareConstrainedRegions()
         // Constructors //
         //////////////////
 
-        internal TdsParserStateObject(TdsParser parser, TdsParserStateObject physicalConnection, bool async)
+        protected TdsParserStateObject(TdsParser parser, TdsParserStateObject physicalConnection, bool async)
         {
             // Construct a MARS session
             Debug.Assert(parser != null, "no parser?");
@@ -86,8 +86,6 @@ internal abstract void CreatePhysicalSNIHandle(
 
         internal abstract void AssignPendingDNSInfo(string userProtocol, string DNSCacheKey, ref SQLDNSInfo pendingDNSInfo);
 
-        protected abstract void CreateSessionHandle(TdsParserStateObject physicalConnection, bool async);
-
         protected abstract void FreeGcHandle(int remaining, bool release);
 
         internal abstract uint EnableSsl(ref uint info, bool tlsFirst, string serverCertificateFilename);

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

@@ -39,7 +39,7 @@ internal partial class TdsParserStateObject
         // Constructors //
         //////////////////
 
-        protected TdsParserStateObject(TdsParser parser, SNIHandle physicalConnection, bool async)
+        protected TdsParserStateObject(TdsParser parser, TdsParserStateObject physicalConnection, bool async)
         {
             // Construct a MARS session
             Debug.Assert(parser != null, "no parser?");
@@ -56,12 +56,8 @@ protected TdsParserStateObject(TdsParser parser, SNIHandle physicalConnection, b
             // Determine packet size based on physical connection buffer lengths.
             SetPacketSize(_parser._physicalStateObj._outBuff.Length);
 
-            ConsumerInfo myInfo = CreateConsumerInfo(async);
-            SQLDNSInfo cachedDNSInfo;
-
-            SQLFallbackDNSCache.Instance.GetDNSInfo(_parser.FQDNforDNSCache, out cachedDNSInfo);
+            CreateSessionHandle(physicalConnection, async);
 
-            _sessionHandle = new SNIHandle(myInfo, physicalConnection, _parser.Connection.ConnectionOptions.IPAddressPreference, cachedDNSInfo);
             if (IsFailedHandle())
             {
                 AddError(parser.ProcessSNIError(this));
@@ -90,7 +86,7 @@ internal SNIHandle Handle
         // General methods //
         /////////////////////
 
-        private ConsumerInfo CreateConsumerInfo(bool async)
+        protected ConsumerInfo CreateConsumerInfo(bool async)
         {
             ConsumerInfo myInfo = new ConsumerInfo();
 

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

@@ -19,7 +19,7 @@ internal class TdsParserStateObjectNative : TdsParserStateObject
         private readonly Dictionary<IntPtr, SNIPacket> _pendingWritePackets = new Dictionary<IntPtr, SNIPacket>(); // Stores write packets that have been sent to SNI, but have not yet finished writing (i.e. we are waiting for SNI's callback)
 
         internal TdsParserStateObjectNative(TdsParser parser, TdsParserStateObject physicalConnection, bool async)
-            : base(parser, physicalConnection.Handle, async)
+            : base(parser, physicalConnection, async)
         {
         }
 
@@ -40,6 +40,18 @@ public TdsParserStateObjectNative(TdsParser parser)
 
         internal override Guid? SessionId => default;
 
+        protected override void CreateSessionHandle(TdsParserStateObject physicalConnection, bool async)
+        {
+            Debug.Assert(physicalConnection is TdsParserStateObjectNative, "Expected a stateObject of type " + this.GetType());
+            TdsParserStateObjectNative nativeSNIObject = physicalConnection as TdsParserStateObjectNative;
+            ConsumerInfo myInfo = CreateConsumerInfo(async);
+
+            SQLDNSInfo cachedDNSInfo;
+            bool ret = SQLFallbackDNSCache.Instance.GetDNSInfo(_parser.FQDNforDNSCache, out cachedDNSInfo);
+
+            _sessionHandle = new SNIHandle(myInfo, nativeSNIObject.Handle, _parser.Connection.ConnectionOptions.IPAddressPreference, cachedDNSInfo);
+        }
+
         protected override uint SniPacketGetData(PacketHandle packet, byte[] _inBuff, ref uint dataSize)
         {
             Debug.Assert(packet.Type == PacketHandle.NativePointerType, "unexpected packet type when requiring NativePointer");

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

@@ -483,6 +483,8 @@ internal long TimeoutTime
 
         protected abstract PacketHandle EmptyReadPacket { get; }
 
+        protected abstract void CreateSessionHandle(TdsParserStateObject physicalConnection, bool async);
+
         internal abstract PacketHandle GetResetWritePacket(int dataSize);
 
         protected abstract uint SniPacketGetData(PacketHandle packet, byte[] _inBuff, ref uint dataSize);