From 5218b98fd250705c61a4d18486b09070dae27325 Mon Sep 17 00:00:00 2001 From: Javad Rahnama Date: Thu, 5 Mar 2020 13:09:44 -0800 Subject: [PATCH 1/2] SqlBulkCopy ArrayList to List in NetFx --- .../netfx/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs index c6a922f454..005d8e4fc7 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs @@ -71,12 +71,12 @@ internal object this[int index] sealed internal class Result { private _SqlMetaDataSet _metadata; - private ArrayList _rowset; + private List _rowset; internal Result(_SqlMetaDataSet metadata) { this._metadata = metadata; - this._rowset = new ArrayList(); + this._rowset = new List(); } internal int Count @@ -113,7 +113,7 @@ internal void AddRow(Row row) // sealed internal class BulkCopySimpleResultSet { - private ArrayList _results; // the list of results + private List _results; // the list of results private Result resultSet; // the current result private int[] indexmap; // associates columnids with indexes in the rowarray @@ -121,7 +121,7 @@ sealed internal class BulkCopySimpleResultSet // internal BulkCopySimpleResultSet() { - _results = new ArrayList(); + _results = new List(); } // indexer From 30ec0829a5c48880503ab482e9aeacf974d877f6 Mon Sep 17 00:00:00 2001 From: Javad Rahnama Date: Thu, 5 Mar 2020 14:20:44 -0800 Subject: [PATCH 2/2] BulkCopy EventSource --- .../netfx/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs index 15b2803f94..4c7ad34547 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs @@ -153,7 +153,6 @@ internal int ObjectID internal byte[] _bShortBytes = null; // scratch buffer to serialize Short values (2 bytes). internal byte[] _bDecimalBytes = null; // scratch buffer to serialize decimal values (17 bytes). - // // DO NOT USE THIS BUFFER FOR OTHER THINGS. // ProcessHeader can be called ANYTIME while doing network reads. private byte[] _partialHeaderBuffer = new byte[TdsEnums.HEADER_LEN]; // Scratch buffer for ProcessHeader