Move into shared for SqlCachedBuffer.cs (#1280)

Author: lcheunglci

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

@@ -205,6 +205,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>
@@ -499,7 +502,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

@@ -276,6 +276,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>
@@ -462,7 +465,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/netfx/src/Microsoft/Data/SqlClient/SqlCachedBuffer.cs

@@ -13,12 +13,12 @@
 namespace Microsoft.Data.SqlClient
 {
     // Caches the bytes returned from partial length prefixed datatypes, like XML
-    sealed internal class SqlCachedBuffer : System.Data.SqlTypes.INullable
+    internal sealed class SqlCachedBuffer : 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()
         {
@@ -30,23 +30,20 @@ private SqlCachedBuffer(List<byte[]> cachedBytes)
             _cachedBytes = cachedBytes;
         }
 
-        internal List<byte[]> CachedBytes
-        {
-            get { return _cachedBytes; }
-        }
+        internal List<byte[]> CachedBytes =>_cachedBytes;
 
-        // Reads off from the network buffer and caches bytes. Only reads one column value in the current row.
+        /// <summary>
+        /// Reads off from the network buffer and caches bytes. Only reads one column value in the current row.
+        /// </summary>
         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;
             }
@@ -55,10 +52,12 @@ internal static bool TryCreate(SqlMetaDataPriv metadata, TdsParser parser, TdsPa
             do
             {
                 if (plplength == 0)
+                {
                     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))
                     {
@@ -105,27 +104,32 @@ internal Stream ToStream()
         override public string ToString()
         {
             if (IsNull)
+            {
                 throw new SqlNullValueException();
+            }
 
             if (_cachedBytes.Count == 0)
             {
                 return string.Empty;
             }
-            SqlXml sxml = new SqlXml(ToStream());
+            SqlXml sxml = new(ToStream());
             return sxml.Value;
         }
 
         internal SqlString ToSqlString()
         {
             if (IsNull)
+            {
                 return SqlString.Null;
+            }
+
             string str = ToString();
             return new SqlString(str);
         }
 
         internal SqlXml ToSqlXml()
         {
-            SqlXml sx = new SqlXml(ToStream());
+            SqlXml sx = new(ToStream());
             return sx;
         }
 
@@ -136,14 +140,6 @@ internal XmlReader ToXmlReader()
             return SqlTypeWorkarounds.SqlXmlCreateSqlXmlReader(ToStream(), closeInput: false, async: false);
         }
 
-        public bool IsNull
-        {
-            get
-            {
-                return (_cachedBytes == null) ? true : false;
-            }
-        }
-
-
+        public bool IsNull => _cachedBytes == null;
     }
 }