Move into shared for SqlCachedBuffer.cs

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

@@ -196,6 +196,9 @@
     <Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHintCollection.cs">
       <Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHintCollection.cs</Link>
     </Compile>
+    <Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlCachedBuffer.cs">
+      <Link>Microsoft\Data\SqlClient\SqlCachedBuffer.cs</Link>
+    </Compile>
     <Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithm.cs">
       <Link>Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithm.cs</Link>
     </Compile>
@@ -481,7 +484,6 @@
     <Compile Include="Microsoft\Data\SqlClient\SqlBuffer.cs" />
     <Compile Include="Microsoft\Data\SqlClient\SqlBulkCopy.cs" />
     <Compile Include="Microsoft\Data\SqlClient\SqlBulkCopyColumnMappingCollection.cs" />
-    <Compile Include="Microsoft\Data\SqlClient\SqlCachedBuffer.cs" />
     <Compile Include="Microsoft\Data\SqlClient\SqlClientDiagnosticListenerExtensions.cs" />
     <Compile Include="Microsoft\Data\SqlClient\SqlClientFactory.cs" />
     <Compile Include="Microsoft\Data\SqlClient\SqlCommand.cs" />

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

@@ -267,6 +267,9 @@
     <Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHintCollection.cs">
       <Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHintCollection.cs</Link>
     </Compile>
+    <Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlCachedBuffer.cs">
+      <Link>Microsoft\Data\SqlClient\SqlCachedBuffer.cs</Link>
+    </Compile>
     <Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithm.cs">
       <Link>Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithm.cs</Link>
     </Compile>
@@ -438,7 +441,6 @@
     <Compile Include="Microsoft\Data\SqlClient\SqlBuffer.cs" />
     <Compile Include="Microsoft\Data\SqlClient\SqlBulkCopy.cs" />
     <Compile Include="Microsoft\Data\SqlClient\SqlBulkCopyColumnMappingCollection.cs" />
-    <Compile Include="Microsoft\Data\SqlClient\SqlCachedBuffer.cs" />
     <Compile Include="Microsoft\Data\SqlClient\SqlCertificateCallbacks.cs" />
     <Compile Include="Microsoft\Data\SqlClient\SqlClientFactory.cs" />
     <Compile Include="Microsoft\Data\SqlClient\SqlClientOriginalAddressInfo.cs" />

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCachedBuffer.cs → src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCachedBuffer.cs

@@ -15,10 +15,10 @@ namespace Microsoft.Data.SqlClient
     // Caches the bytes returned from partial length prefixed datatypes, like XML
     sealed internal class SqlCachedBuffer : System.Data.SqlTypes.INullable
     {
-        public static readonly SqlCachedBuffer Null = new SqlCachedBuffer();
-        private const int _maxChunkSize = 2048; // Arbitrary value for chunk size. Revisit this later for better perf
+        public static readonly SqlCachedBuffer Null = new();
+        private const int MaxChunkSize = 2048; // Arbitrary value for chunk size. Revisit this later for better perf
 
-        private List<byte[]> _cachedBytes;
+        private readonly List<byte[]> _cachedBytes;
 
         private SqlCachedBuffer()
         {
@@ -32,21 +32,19 @@ private SqlCachedBuffer(List<byte[]> cachedBytes)
 
         internal List<byte[]> CachedBytes
         {
-            get { return _cachedBytes; }
+            get => _cachedBytes;
         }
 
         // Reads off from the network buffer and caches bytes. Only reads one column value in the current row.
         internal static bool TryCreate(SqlMetaDataPriv metadata, TdsParser parser, TdsParserStateObject stateObj, out SqlCachedBuffer buffer)
         {
-            int cb = 0;
-            ulong plplength;
             byte[] byteArr;
 
-            List<byte[]> cachedBytes = new List<byte[]>();
+            List<byte[]> cachedBytes = new();
             buffer = null;
 
             // the very first length is already read.
-            if (!parser.TryPlpBytesLeft(stateObj, out plplength))
+            if (!parser.TryPlpBytesLeft(stateObj, out ulong plplength))
             {
                 return false;
             }
@@ -58,7 +56,7 @@ internal static bool TryCreate(SqlMetaDataPriv metadata, TdsParser parser, TdsPa
                     break;
                 do
                 {
-                    cb = (plplength > (ulong)_maxChunkSize) ? _maxChunkSize : (int)plplength;
+                    int cb = (plplength > (ulong)MaxChunkSize) ? MaxChunkSize : (int)plplength;
                     byteArr = new byte[cb];
                     if (!stateObj.TryReadPlpBytes(ref byteArr, 0, cb, out cb))
                     {
@@ -111,7 +109,7 @@ override public string ToString()
             {
                 return string.Empty;
             }
-            SqlXml sxml = new SqlXml(ToStream());
+            SqlXml sxml = new(ToStream());
             return sxml.Value;
         }
 
@@ -125,23 +123,13 @@ internal SqlString ToSqlString()
 
         internal SqlXml ToSqlXml()
         {
-            SqlXml sx = new SqlXml(ToStream());
+            SqlXml sx = new(ToStream());
             return sx;
         }
 
-        // Prevent inlining so that reflection calls are not moved to caller that may be in a different assembly that may have a different grant set.
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        internal XmlReader ToXmlReader()
-        {
-            return SqlTypeWorkarounds.SqlXmlCreateSqlXmlReader(ToStream(), closeInput: false);
-        }
-
         public bool IsNull
         {
-            get
-            {
-                return (_cachedBytes == null) ? true : false;
-            }
+            get => _cachedBytes == null;
         }