Use Buffer.BlockCopy with byte[] (#1366)

Kaur-Parminder · web-flow · commit 8202268230bd · 2022-01-25T16:21:19.000-08:00
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlDataReader.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlDataReader.cs
@@ -2046,7 +2046,7 @@ private bool TryGetBytesInternal(int i, long dataIndex, byte[] buffer, int buffe
                                 cbytes = length;
                         }
 
-                        Array.Copy(data, ndataIndex, buffer, bufferIndex, cbytes);
+                        Buffer.BlockCopy(data, ndataIndex, buffer, bufferIndex, cbytes);
                     }
                     catch (Exception e)
                     {
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlDelegatedTransaction.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlDelegatedTransaction.cs
@@ -585,7 +585,7 @@ private void ValidateActiveOnConnection(SqlInternalConnection connection)
         private Guid GetGlobalTxnIdentifierFromToken()
         {
             byte[] txnGuid = new byte[16];
-            Array.Copy(_connection.PromotedDTCToken, _globalTransactionsTokenVersionSizeInBytes /* Skip the version */, txnGuid, 0, txnGuid.Length);
+            Buffer.BlockCopy(_connection.PromotedDTCToken, _globalTransactionsTokenVersionSizeInBytes /* Skip the version */, txnGuid, 0, txnGuid.Length);
             return new Guid(txnGuid);
         }
     }
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlSequentialTextReader.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlSequentialTextReader.cs
@@ -372,7 +372,7 @@ private byte[] PrepareByteBuffer(int numberOfChars, out int byteBufferUsed)
                     {
                         // Otherwise, copy over the leftover buffer
                         byteBuffer = new byte[byteBufferSize];
-                        Array.Copy(_leftOverBytes, byteBuffer, _leftOverBytes.Length);
+                        Buffer.BlockCopy(_leftOverBytes, 0, byteBuffer, 0,_leftOverBytes.Length);
                         byteBufferUsed = _leftOverBytes.Length;
                     }
                 }
@@ -411,7 +411,7 @@ private int DecodeBytesToChars(byte[] inBuffer, int inBufferCount, char[] outBuf
             if ((!completed) && (bytesUsed < inBufferCount))
             {
                 _leftOverBytes = new byte[inBufferCount - bytesUsed];
-                Array.Copy(inBuffer, bytesUsed, _leftOverBytes, 0, _leftOverBytes.Length);
+                Buffer.BlockCopy(inBuffer, bytesUsed, _leftOverBytes, 0, _leftOverBytes.Length);
             }
             else
             {
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlStream.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlStream.cs
@@ -452,7 +452,7 @@ override public int Read(byte[] buffer, int offset, int count)
                 cb = _cachedBytes[_currentArrayIndex].Length - _currentPosition;
                 if (cb > count)
                     cb = count;
-                Array.Copy(_cachedBytes[_currentArrayIndex], _currentPosition, buffer, offset, cb);
+                Buffer.BlockCopy(_cachedBytes[_currentArrayIndex], _currentPosition, buffer, offset, cb);
 
                 _currentPosition += cb;
                 count -= (int)cb;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlMetaData.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlMetaData.cs
@@ -1285,7 +1285,7 @@ public SqlBinary Adjust(SqlBinary value)
                     {
                         byte[] rgbValue = value.Value;
                         byte[] rgbNewValue = new byte[MaxLength];
-                        Array.Copy(rgbValue, rgbNewValue, rgbValue.Length);
+                        Buffer.BlockCopy(rgbValue, 0, rgbNewValue, 0, rgbValue.Length);
                         Array.Clear(rgbNewValue, rgbValue.Length, rgbNewValue.Length - rgbValue.Length);
                         return new SqlBinary(rgbNewValue);
                     }
@@ -1307,7 +1307,7 @@ public SqlBinary Adjust(SqlBinary value)
             {
                 byte[] rgbValue = value.Value;
                 byte[] rgbNewValue = new byte[MaxLength];
-                Array.Copy(rgbValue, rgbNewValue, (int)MaxLength);
+                Buffer.BlockCopy(rgbValue,0, rgbNewValue,0, (int)MaxLength);
                 value = new SqlBinary(rgbNewValue);
             }
 
@@ -1399,7 +1399,7 @@ public SqlBytes Adjust(SqlBytes value)
                         if (value.MaxLength < MaxLength)
                         {
                             byte[] rgbNew = new byte[MaxLength];
-                            Array.Copy(value.Buffer, rgbNew, (int)oldLength);
+                            Buffer.BlockCopy(value.Buffer, 0,rgbNew,0, (int)oldLength);
                             value = new SqlBytes(rgbNew);
                         }
 
@@ -1928,7 +1928,7 @@ public byte[] Adjust(byte[] value)
                     if (value.Length < MaxLength)
                     {
                         byte[] rgbNewValue = new byte[MaxLength];
-                        Array.Copy(value, rgbNewValue, value.Length);
+                        Buffer.BlockCopy(value, 0, rgbNewValue, 0, value.Length);
                         Array.Clear(rgbNewValue, value.Length, (int)rgbNewValue.Length - value.Length);
                         return rgbNewValue;
                     }
@@ -1949,7 +1949,7 @@ public byte[] Adjust(byte[] value)
             if (value.Length > MaxLength && Max != MaxLength)
             {
                 byte[] rgbNewValue = new byte[MaxLength];
-                Array.Copy(value, rgbNewValue, (int)MaxLength);
+                Buffer.BlockCopy(value, 0, rgbNewValue, 0, (int)MaxLength);
                 value = rgbNewValue;
             }
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/ValueUtilsSmi.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/ValueUtilsSmi.cs
@@ -124,7 +124,7 @@ private static long GetBytesConversion(SmiEventSink_Default sink, ITypedGettersV
 
             length = CheckXetParameters(metaData.SqlDbType, metaData.MaxLength * sizeof(char), value.Length,
                         fieldOffset, buffer.Length, bufferOffset, length);
-            Array.Copy(value.Value, checked((int)fieldOffset), buffer, bufferOffset, length);
+            Buffer.BlockCopy(value.Value, checked((int)fieldOffset), buffer, bufferOffset, length);
             return length;
         }
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataStreamTest/DataStreamTest.cs
@@ -130,7 +130,7 @@ private static byte[] CreateBinaryTable(SqlConnection connection, string tableNa
             while (position < data.Length)
             {
                 int copyCount = Math.Min(pattern.Length, data.Length - position);
-                Array.Copy(pattern, 0, data, position, copyCount);
+                Buffer.BlockCopy(pattern, 0, data, position, copyCount);
                 position += copyCount;
             }
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/StreamInputParam.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/StreamInputParam.cs
@@ -93,7 +93,7 @@ private int ReadInternal(byte[] buffer, int offset, int count)
                 }
                 if (_errorPos >= _pos && _errorPos < _pos + nRead)
                     throw new CustomStreamException();
-                Array.Copy(_data, _pos, buffer, offset, nRead);
+                Buffer.BlockCopy(_data, _pos, buffer, offset, nRead);
                 _pos += nRead;
                 return nRead;
             }
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDSStream.cs b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDSStream.cs
@@ -349,7 +349,7 @@ public override void Write(byte[] buffer, int offset, int count)
                 if (packetDataToWrite > 0)
                 {
                     // Append new data to the end of the packet data
-                    Array.Copy(buffer, bufferWrittenPosition + offset, _outgoingPacket, OutgoingPacketHeader.Length, packetDataToWrite);
+                    Buffer.BlockCopy(buffer, bufferWrittenPosition + offset, _outgoingPacket, OutgoingPacketHeader.Length, packetDataToWrite);
 
                     // Register that we've written new data
                     bufferWrittenPosition += packetDataToWrite;

Original file line number	Diff line number	Diff line change
`@@ -2046,7 +2046,7 @@ private bool TryGetBytesInternal(int i, long dataIndex, byte[] buffer, int buffe`
`2046`	`2046`	`cbytes = length;`
`2047`	`2047`	`}`
`2048`	`2048`
`2049`		`- Array.Copy(data, ndataIndex, buffer, bufferIndex, cbytes);`
	`2049`	`+ Buffer.BlockCopy(data, ndataIndex, buffer, bufferIndex, cbytes);`
`2050`	`2050`	`}`
`2051`	`2051`	`catch (Exception e)`
`2052`	`2052`	`{`
Original file line number	Diff line number	Diff line change
`@@ -585,7 +585,7 @@ private void ValidateActiveOnConnection(SqlInternalConnection connection)`
`585`	`585`	`private Guid GetGlobalTxnIdentifierFromToken()`
`586`	`586`	`{`
`587`	`587`	`byte[] txnGuid = new byte[16];`
`588`		`- Array.Copy(_connection.PromotedDTCToken, _globalTransactionsTokenVersionSizeInBytes /* Skip the version */, txnGuid, 0, txnGuid.Length);`
	`588`	`+ Buffer.BlockCopy(_connection.PromotedDTCToken, _globalTransactionsTokenVersionSizeInBytes /* Skip the version */, txnGuid, 0, txnGuid.Length);`
`589`	`589`	`return new Guid(txnGuid);`
`590`	`590`	`}`
`591`	`591`	`}`
Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,7 @@ private byte[] PrepareByteBuffer(int numberOfChars, out int byteBufferUsed)`
`372`	`372`	`{`
`373`	`373`	`// Otherwise, copy over the leftover buffer`
`374`	`374`	`byteBuffer = new byte[byteBufferSize];`
`375`		`- Array.Copy(_leftOverBytes, byteBuffer, _leftOverBytes.Length);`
	`375`	`+ Buffer.BlockCopy(_leftOverBytes, 0, byteBuffer, 0,_leftOverBytes.Length);`
`376`	`376`	`byteBufferUsed = _leftOverBytes.Length;`
`377`	`377`	`}`
`378`	`378`	`}`
`@@ -411,7 +411,7 @@ private int DecodeBytesToChars(byte[] inBuffer, int inBufferCount, char[] outBuf`
`411`	`411`	`if ((!completed) && (bytesUsed < inBufferCount))`
`412`	`412`	`{`
`413`	`413`	`_leftOverBytes = new byte[inBufferCount - bytesUsed];`
`414`		`- Array.Copy(inBuffer, bytesUsed, _leftOverBytes, 0, _leftOverBytes.Length);`
	`414`	`+ Buffer.BlockCopy(inBuffer, bytesUsed, _leftOverBytes, 0, _leftOverBytes.Length);`
`415`	`415`	`}`
`416`	`416`	`else`
`417`	`417`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1285,7 +1285,7 @@ public SqlBinary Adjust(SqlBinary value)`
`1285`	`1285`	`{`
`1286`	`1286`	`byte[] rgbValue = value.Value;`
`1287`	`1287`	`byte[] rgbNewValue = new byte[MaxLength];`
`1288`		`- Array.Copy(rgbValue, rgbNewValue, rgbValue.Length);`
	`1288`	`+ Buffer.BlockCopy(rgbValue, 0, rgbNewValue, 0, rgbValue.Length);`
`1289`	`1289`	`Array.Clear(rgbNewValue, rgbValue.Length, rgbNewValue.Length - rgbValue.Length);`
`1290`	`1290`	`return new SqlBinary(rgbNewValue);`
`1291`	`1291`	`}`
`@@ -1307,7 +1307,7 @@ public SqlBinary Adjust(SqlBinary value)`
`1307`	`1307`	`{`
`1308`	`1308`	`byte[] rgbValue = value.Value;`
`1309`	`1309`	`byte[] rgbNewValue = new byte[MaxLength];`
`1310`		`- Array.Copy(rgbValue, rgbNewValue, (int)MaxLength);`
	`1310`	`+ Buffer.BlockCopy(rgbValue,0, rgbNewValue,0, (int)MaxLength);`
`1311`	`1311`	`value = new SqlBinary(rgbNewValue);`
`1312`	`1312`	`}`
`1313`	`1313`
`@@ -1399,7 +1399,7 @@ public SqlBytes Adjust(SqlBytes value)`
`1399`	`1399`	`if (value.MaxLength < MaxLength)`
`1400`	`1400`	`{`
`1401`	`1401`	`byte[] rgbNew = new byte[MaxLength];`
`1402`		`- Array.Copy(value.Buffer, rgbNew, (int)oldLength);`
	`1402`	`+ Buffer.BlockCopy(value.Buffer, 0,rgbNew,0, (int)oldLength);`
`1403`	`1403`	`value = new SqlBytes(rgbNew);`
`1404`	`1404`	`}`
`1405`	`1405`
`@@ -1928,7 +1928,7 @@ public byte[] Adjust(byte[] value)`
`1928`	`1928`	`if (value.Length < MaxLength)`
`1929`	`1929`	`{`
`1930`	`1930`	`byte[] rgbNewValue = new byte[MaxLength];`
`1931`		`- Array.Copy(value, rgbNewValue, value.Length);`
	`1931`	`+ Buffer.BlockCopy(value, 0, rgbNewValue, 0, value.Length);`
`1932`	`1932`	`Array.Clear(rgbNewValue, value.Length, (int)rgbNewValue.Length - value.Length);`
`1933`	`1933`	`return rgbNewValue;`
`1934`	`1934`	`}`
`@@ -1949,7 +1949,7 @@ public byte[] Adjust(byte[] value)`
`1949`	`1949`	`if (value.Length > MaxLength && Max != MaxLength)`
`1950`	`1950`	`{`
`1951`	`1951`	`byte[] rgbNewValue = new byte[MaxLength];`
`1952`		`- Array.Copy(value, rgbNewValue, (int)MaxLength);`
	`1952`	`+ Buffer.BlockCopy(value, 0, rgbNewValue, 0, (int)MaxLength);`
`1953`	`1953`	`value = rgbNewValue;`
`1954`	`1954`	`}`
`1955`	`1955`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ private static long GetBytesConversion(SmiEventSink_Default sink, ITypedGettersV`
`124`	`124`
`125`	`125`	`length = CheckXetParameters(metaData.SqlDbType, metaData.MaxLength * sizeof(char), value.Length,`
`126`	`126`	`fieldOffset, buffer.Length, bufferOffset, length);`
`127`		`- Array.Copy(value.Value, checked((int)fieldOffset), buffer, bufferOffset, length);`
	`127`	`+ Buffer.BlockCopy(value.Value, checked((int)fieldOffset), buffer, bufferOffset, length);`
`128`	`128`	`return length;`
`129`	`129`	`}`
`130`	`130`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ private static byte[] CreateBinaryTable(SqlConnection connection, string tableNa`
`130`	`130`	`while (position < data.Length)`
`131`	`131`	`{`
`132`	`132`	`int copyCount = Math.Min(pattern.Length, data.Length - position);`
`133`		`- Array.Copy(pattern, 0, data, position, copyCount);`
	`133`	`+ Buffer.BlockCopy(pattern, 0, data, position, copyCount);`
`134`	`134`	`position += copyCount;`
`135`	`135`	`}`
`136`	`136`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ private int ReadInternal(byte[] buffer, int offset, int count)`
`93`	`93`	`}`
`94`	`94`	`if (_errorPos >= _pos && _errorPos < _pos + nRead)`
`95`	`95`	`throw new CustomStreamException();`
`96`		`- Array.Copy(_data, _pos, buffer, offset, nRead);`
	`96`	`+ Buffer.BlockCopy(_data, _pos, buffer, offset, nRead);`
`97`	`97`	`_pos += nRead;`
`98`	`98`	`return nRead;`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,7 @@ public override void Write(byte[] buffer, int offset, int count)`
`349`	`349`	`if (packetDataToWrite > 0)`
`350`	`350`	`{`
`351`	`351`	`// Append new data to the end of the packet data`
`352`		`- Array.Copy(buffer, bufferWrittenPosition + offset, _outgoingPacket, OutgoingPacketHeader.Length, packetDataToWrite);`
	`352`	`+ Buffer.BlockCopy(buffer, bufferWrittenPosition + offset, _outgoingPacket, OutgoingPacketHeader.Length, packetDataToWrite);`
`353`	`353`
`354`	`354`	`// Register that we've written new data`
`355`	`355`	`bufferWrittenPosition += packetDataToWrite;`