Flatten | SqlInternalConnectionTds and SqlInternalConnection

src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

@@ -210,6 +210,9 @@
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs">
       <Link>Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs</Link>
     </Compile>
+    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\CachedContexts.cs">
+      <Link>Microsoft\Data\SqlClient\Connection\CachedContexts.cs</Link>
+    </Compile>
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\ServerInfo.cs">
       <Link>Microsoft\Data\SqlClient\Connection\ServerInfo.cs</Link>
     </Compile>
@@ -219,6 +222,9 @@
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\SessionStateRecord.cs">
       <Link>Microsoft\Data\SqlClient\Connection\SessionStateRecord.cs</Link>
     </Compile>
+    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs">
+      <Link>Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs</Link>
+    </Compile>
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\DataClassification\SensitivityClassification.cs">
       <Link>Microsoft\Data\SqlClient\DataClassification\SensitivityClassification.cs</Link>
     </Compile>
@@ -699,12 +705,6 @@
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs">
       <Link>Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs</Link>
     </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInternalConnection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlInternalConnection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs">
-      <Link>Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs</Link>
-    </Compile>
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInternalTransaction.cs">
       <Link>Microsoft\Data\SqlClient\SqlInternalTransaction.cs</Link>
     </Compile>

src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj

@@ -479,6 +479,9 @@
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs">
       <Link>Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs</Link>
     </Compile>
+    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\CachedContexts.cs">
+      <Link>Microsoft\Data\SqlClient\Connection\CachedContexts.cs</Link>
+    </Compile>
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\ServerInfo.cs">
       <Link>Microsoft\Data\SqlClient\Connection\ServerInfo.cs</Link>
     </Compile>
@@ -488,6 +491,9 @@
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\SessionStateRecord.cs">
       <Link>Microsoft\Data\SqlClient\Connection\SessionStateRecord.cs</Link>
     </Compile>
+    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs">
+      <Link>Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs</Link>
+    </Compile>
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\DataClassification\SensitivityClassification.cs">
       <Link>Microsoft\Data\SqlClient\DataClassification\SensitivityClassification.cs</Link>
     </Compile>
@@ -863,12 +869,6 @@
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs">
       <Link>Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs</Link>
     </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInternalConnection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlInternalConnection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs">
-      <Link>Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs</Link>
-    </Compile>
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInternalTransaction.cs">
       <Link>Microsoft\Data\SqlClient\SqlInternalTransaction.cs</Link>
     </Compile>

src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs

@@ -25,6 +25,7 @@
 using Microsoft.SqlServer.Server;
 using System.Security.Authentication;
 using System.Collections.Generic;
+using Microsoft.Data.SqlClient.Connection;
 
 #if NETFRAMEWORK
 using System.Reflection;
@@ -465,7 +466,11 @@ internal static ArgumentException InvalidArgumentLength(string argumentName, int
 
         internal static ArgumentException MustBeReadOnly(string argumentName) => Argument(StringsHelper.GetString(Strings.ADP_MustBeReadOnly, argumentName));
 
-        internal static Exception CreateSqlException(MsalException msalException, SqlConnectionString connectionOptions, SqlInternalConnectionTds sender, string username)
+        internal static Exception CreateSqlException(
+            MsalException msalException,
+            SqlConnectionString connectionOptions,
+            SqlConnectionInternal sender,
+            string username)
         {
             // Error[0]
             SqlErrorCollection sqlErs = new();

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/CachedContexts.cs

@@ -0,0 +1,168 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Threading;
+
+#nullable enable
+
+namespace Microsoft.Data.SqlClient.Connection
+{
+    /// <summary>
+    /// Provides cached asynchronous call contexts shared between objects in a connection's context.
+    /// </summary>
+    internal class CachedContexts
+    {
+        #region Fields
+
+        /// <summary>
+        /// Stores reusable context for ExecuteNonQueryAsync invocations.
+        /// </summary>
+        private SqlCommand.ExecuteNonQueryAsyncCallContext? _commandExecuteNonQueryAsyncContext;
+
+        /// <summary>
+        /// Stores reusable context for ExecuteReaderAsync invocations.
+        /// </summary>
+        private SqlCommand.ExecuteReaderAsyncCallContext? _commandExecuteReaderAsyncContext;
+
+        /// <summary>
+        /// Stores reusable context for ExecuteXmlReaderAsync invocations.
+        /// </summary>
+        private SqlCommand.ExecuteXmlReaderAsyncCallContext? _commandExecuteXmlReaderAsyncContext;
+
+        /// <summary>
+        /// Stores reusable context for IsDBNullAsync invocations.
+        /// </summary>
+        private SqlDataReader.IsDBNullAsyncCallContext? _dataReaderIsDbNullContext;
+
+        /// <summary>
+        /// Stores reusable context for ReadAsync invocations.
+        /// </summary>
+        private SqlDataReader.ReadAsyncCallContext? _dataReaderReadAsyncContext;
+
+        /// <summary>
+        /// Stores a data reader snapshot.
+        /// </summary>
+        private SqlDataReader.Snapshot? _dataReaderSnapshot;
+
+        #endregion
+
+        #region Access Methods
+
+        /// <summary>
+        /// Removes and returns the cached ExecuteNonQueryAsync context.
+        /// </summary>
+        /// <returns>The previously cached context or null when empty.</returns>
+        internal SqlCommand.ExecuteNonQueryAsyncCallContext? ClearCommandExecuteNonQueryAsyncContext() =>
+            Interlocked.Exchange(ref _commandExecuteNonQueryAsyncContext, null);
+
+        /// <summary>
+        /// Removes and returns the cached ExecuteReaderAsync context.
+        /// </summary>
+        /// <returns>The previously cached context or null when empty.</returns>
+        internal SqlCommand.ExecuteReaderAsyncCallContext? ClearCommandExecuteReaderAsyncContext() =>
+            Interlocked.Exchange(ref _commandExecuteReaderAsyncContext, null);
+
+        /// <summary>
+        /// Removes and returns the cached ExecuteXmlReaderAsync context.
+        /// </summary>
+        /// <returns>The previously cached context or null when empty.</returns>
+        internal SqlCommand.ExecuteXmlReaderAsyncCallContext? ClearCommandExecuteXmlReaderAsyncContext() =>
+            Interlocked.Exchange(ref _commandExecuteXmlReaderAsyncContext, null);
+
+        /// <summary>
+        /// Removes and returns the cached ReadAsync context.
+        /// </summary>
+        /// <returns>The previously cached context or null when empty.</returns>
+        internal SqlDataReader.ReadAsyncCallContext? ClearDataReaderReadAsyncContext() =>
+            Interlocked.Exchange(ref _dataReaderReadAsyncContext, null);
+
+        /// <summary>
+        /// Removes and returns the cached IsDBNullAsync context.
+        /// </summary>
+        /// <returns>The previously cached context or null when empty.</returns>
+        internal SqlDataReader.IsDBNullAsyncCallContext? ClearDataReaderIsDbNullContext() =>
+            Interlocked.Exchange(ref _dataReaderIsDbNullContext, null);
+
+        /// <summary>
+        /// Removes and returns the cached data reader snapshot.
+        /// </summary>
+        /// <returns>The previously cached snapshot or null when empty.</returns>
+        internal SqlDataReader.Snapshot? ClearDataReaderSnapshot() =>
+            Interlocked.Exchange(ref _dataReaderSnapshot, null);
+
+        /// <summary>
+        /// Attempts to cache the provided ExecuteNonQueryAsync context.
+        /// </summary>
+        /// <param name="value">Context instance to store.</param>
+        /// <returns>
+        /// True when the context is cached; false if an existing value is preserved.
+        /// </returns>
+        internal bool TrySetCommandExecuteNonQueryAsyncContext(SqlCommand.ExecuteNonQueryAsyncCallContext value) =>
+            TrySetContext(value, ref _commandExecuteNonQueryAsyncContext);
+
+        /// <summary>
+        /// Attempts to cache the provided ExecuteReaderAsync context.
+        /// </summary>
+        /// <param name="value">Context instance to store.</param>
+        /// <returns>
+        /// True when the context is cached; false if an existing value is preserved.
+        /// </returns>
+        internal bool TrySetCommandExecuteReaderAsyncContext(SqlCommand.ExecuteReaderAsyncCallContext value) =>
+            TrySetContext(value, ref _commandExecuteReaderAsyncContext);
+
+        /// <summary>
+        /// Attempts to cache the provided ExecuteXmlReaderAsync context.
+        /// </summary>
+        /// <param name="value">Context instance to store.</param>
+        /// <returns>
+        /// True when the context is cached; false if an existing value is preserved.
+        /// </returns>
+        internal bool TrySetCommandExecuteXmlReaderAsyncContext(SqlCommand.ExecuteXmlReaderAsyncCallContext value) =>
+            TrySetContext(value, ref _commandExecuteXmlReaderAsyncContext);
+
+        /// <summary>
+        /// Attempts to cache the provided ReadAsync context.
+        /// </summary>
+        /// <param name="value">Context instance to store.</param>
+        /// <returns>
+        /// True when the context is cached; false if an existing value is preserved.
+        /// </returns>
+        internal bool TrySetDataReaderReadAsyncContext(SqlDataReader.ReadAsyncCallContext value) =>
+            TrySetContext(value, ref _dataReaderReadAsyncContext);
+
+        /// <summary>
+        /// Attempts to cache the provided IsDBNullAsync context.
+        /// </summary>
+        /// <param name="value">Context instance to store.</param>
+        /// <returns>
+        /// True when the context is cached; false if an existing value is preserved.
+        /// </returns>
+        internal bool TrySetDataReaderIsDbNullContext(SqlDataReader.IsDBNullAsyncCallContext value) =>
+            TrySetContext(value, ref _dataReaderIsDbNullContext);
+
+        /// <summary>
+        /// Attempts to cache the provided data reader snapshot context.
+        /// </summary>
+        /// <param name="value">Context instance to store.</param>
+        /// <returns>
+        /// True when the snapshot is cached; false if an existing snapshot is preserved.
+        /// </returns>
+        internal bool TrySetDataReaderSnapshot(SqlDataReader.Snapshot value) =>
+            TrySetContext(value, ref _dataReaderSnapshot);
+
+        #endregion
+
+        private static bool TrySetContext<TContext>(TContext value, ref TContext? location)
+            where TContext : class
+        {
+            if (value is null)
+            {
+                throw new ArgumentNullException(nameof(value));
+            }
+
+            return Interlocked.CompareExchange(ref location, value, null) is null;
+        }
+    }
+}