Skip to content

Commit 100209d

Browse files
authored
Cleanup | Remove SmiEventSink_Default (#3438)
* Stage 1: _errors and _warnings are always null, so HasMessages will always be false * Initial cleanup of ProcessMessages and ProcessMessagesAndThrow * Stub now-empty methods * Remove ProcessMessagesAndThrow (and all references.) * Remove first pass of SmiEventSink_Default parameters * Complete removal of SmiEventSink_Default from setters * Remove SmiEventSink_Default from SmiGettersStream, follow through * Remove circular references from GetValue and GetSqlValue200 * Remove unused SmiEventSink_Default parameters, follow through * Remove lingering SmiEventSink_Default file * Clean up _recordBuffer assignment
1 parent 6d547d7 commit 100209d

File tree

11 files changed

+599
-856
lines changed

11 files changed

+599
-856
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -423,9 +423,6 @@
423423
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs">
424424
<Link>Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs</Link>
425425
</Compile>
426-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiEventSink_Default.cs">
427-
<Link>Microsoft\Data\SqlClient\Server\SmiEventSink_Default.cs</Link>
428-
</Compile>
429426
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiGettersStream.cs">
430427
<Link>Microsoft\Data\SqlClient\Server\SmiGettersStream.cs</Link>
431428
</Compile>

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10366,7 +10366,6 @@ private void WriteSmiParameter(SqlParameter param, int paramIndex, bool sendDefa
1036610366
//
1036710367
TdsParameterSetter paramSetter = new TdsParameterSetter(stateObj, metaData);
1036810368
ValueUtilsSmi.SetCompatibleValueV200(
10369-
new SmiEventSink_Default(), // TDS Errors/events dealt with at lower level for now, just need an object for processing
1037010369
paramSetter,
1037110370
0, // ordinal. TdsParameterSetter only handles one parameter at a time
1037210371
metaData,

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -534,9 +534,6 @@
534534
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs">
535535
<Link>Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs</Link>
536536
</Compile>
537-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiEventSink_Default.cs">
538-
<Link>Microsoft\Data\SqlClient\Server\SmiEventSink_Default.cs</Link>
539-
</Compile>
540537
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiGettersStream.cs">
541538
<Link>Microsoft\Data\SqlClient\Server\SmiGettersStream.cs</Link>
542539
</Compile>

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10558,7 +10558,6 @@ private void WriteSmiParameter(SqlParameter param, int paramIndex, bool sendDefa
1055810558
//
1055910559
TdsParameterSetter paramSetter = new TdsParameterSetter(stateObj, metaData);
1056010560
ValueUtilsSmi.SetCompatibleValueV200(
10561-
new SmiEventSink_Default(), // TDS Errors/events dealt with at lower level for now, just need an object for processing
1056210561
paramSetter,
1056310562
0, // ordinal. TdsParameterSetter only handles one parameter at a time
1056410563
metaData,

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SmiEventSink_Default.cs

Lines changed: 0 additions & 123 deletions
This file was deleted.

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SmiGettersStream.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,17 @@ namespace Microsoft.Data.SqlClient.Server
99
{
1010
internal class SmiGettersStream : Stream
1111
{
12-
private SmiEventSink_Default _sink;
1312
private ITypedGettersV3 _getters;
1413
private int _ordinal;
1514
private long _readPosition;
1615
private SmiMetaData _metaData;
1716

18-
internal SmiGettersStream(SmiEventSink_Default sink, ITypedGettersV3 getters, int ordinal, SmiMetaData metaData)
17+
internal SmiGettersStream(ITypedGettersV3 getters, int ordinal, SmiMetaData metaData)
1918
{
20-
Debug.Assert(sink != null);
2119
Debug.Assert(getters != null);
2220
Debug.Assert(0 <= ordinal);
2321
Debug.Assert(metaData != null);
2422

25-
_sink = sink;
2623
_getters = getters;
2724
_ordinal = ordinal;
2825
_readPosition = 0;
@@ -58,7 +55,7 @@ public override long Length
5855
{
5956
get
6057
{
61-
return ValueUtilsSmi.GetBytesInternal(_sink, _getters, _ordinal, _metaData, 0, null, 0, 0, false);
58+
return ValueUtilsSmi.GetBytesInternal(_getters, _ordinal, _metaData, 0, null, 0, 0, false);
6259
}
6360
}
6461

@@ -91,7 +88,7 @@ public override void SetLength(long value)
9188

9289
public override int Read(byte[] buffer, int offset, int count)
9390
{
94-
long bytesRead = ValueUtilsSmi.GetBytesInternal(_sink, _getters, _ordinal, _metaData, _readPosition, buffer, offset, count, false);
91+
long bytesRead = ValueUtilsSmi.GetBytesInternal(_getters, _ordinal, _metaData, _readPosition, buffer, offset, count, false);
9592
_readPosition += bytesRead;
9693

9794
return checked((int)bytesRead);

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SmiSettersStream.cs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,17 @@ namespace Microsoft.Data.SqlClient.Server
1010
{
1111
internal class SmiSettersStream : Stream
1212
{
13-
private SmiEventSink_Default _sink;
1413
private ITypedSettersV3 _setters;
1514
private int _ordinal;
1615
private long _lengthWritten;
1716
private SmiMetaData _metaData;
1817

19-
internal SmiSettersStream(SmiEventSink_Default sink, ITypedSettersV3 setters, int ordinal, SmiMetaData metaData)
18+
internal SmiSettersStream(ITypedSettersV3 setters, int ordinal, SmiMetaData metaData)
2019
{
21-
Debug.Assert(sink != null);
2220
Debug.Assert(setters != null);
2321
Debug.Assert(0 <= ordinal);
2422
Debug.Assert(metaData != null);
2523

26-
_sink = sink;
2724
_setters = setters;
2825
_ordinal = ordinal;
2926
_lengthWritten = 0;
@@ -77,7 +74,7 @@ public override long Position
7774

7875
public override void Flush()
7976
{
80-
_lengthWritten = ValueUtilsSmi.SetBytesLength(_sink, _setters, _ordinal, _metaData, _lengthWritten);
77+
_lengthWritten = ValueUtilsSmi.SetBytesLength(_setters, _ordinal, _metaData, _lengthWritten);
8178
}
8279

8380
public override long Seek(long offset, SeekOrigin origin)
@@ -91,7 +88,7 @@ public override void SetLength(long value)
9188
{
9289
throw ADP.ArgumentOutOfRange(nameof(value));
9390
}
94-
ValueUtilsSmi.SetBytesLength(_sink, _setters, _ordinal, _metaData, value);
91+
ValueUtilsSmi.SetBytesLength(_setters, _ordinal, _metaData, value);
9592
}
9693

9794
public override int Read(byte[] buffer, int offset, int count)
@@ -101,7 +98,7 @@ public override int Read(byte[] buffer, int offset, int count)
10198

10299
public override void Write(byte[] buffer, int offset, int count)
103100
{
104-
_lengthWritten += ValueUtilsSmi.SetBytes(_sink, _setters, _ordinal, _metaData, _lengthWritten, buffer, offset, count);
101+
_lengthWritten += ValueUtilsSmi.SetBytes(_setters, _ordinal, _metaData, _lengthWritten, buffer, offset, count);
105102
}
106103
}
107104
}

0 commit comments

Comments
 (0)