Skip to content

Cleanup | Remove SmiEventSink_Default #3438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jun 26, 2025
Merged

Cleanup | Remove SmiEventSink_Default #3438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
12bf53f
Stage 1: _errors and _warnings are always null, so HasMessages will a…
edwardneal Jun 24, 2025
f73d649
Initial cleanup of ProcessMessages and ProcessMessagesAndThrow
edwardneal Jun 24, 2025
a17a414
Stub now-empty methods
edwardneal Jun 24, 2025
e9a3377
Remove ProcessMessagesAndThrow (and all references.)
edwardneal Jun 24, 2025
9f37e93
Remove first pass of SmiEventSink_Default parameters
edwardneal Jun 24, 2025
0ed9572
Complete removal of SmiEventSink_Default from setters
edwardneal Jun 24, 2025
8160a12
Remove SmiEventSink_Default from SmiGettersStream, follow through
edwardneal Jun 24, 2025
945d4eb
Remove circular references from GetValue and GetSqlValue200
edwardneal Jun 24, 2025
36e89cb
Remove unused SmiEventSink_Default parameters, follow through
edwardneal Jun 24, 2025
d3ee330
Remove lingering SmiEventSink_Default file
edwardneal Jun 24, 2025
910abed
Clean up _recordBuffer assignment
edwardneal Jun 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,9 +423,6 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs">
<Link>Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiEventSink_Default.cs">
<Link>Microsoft\Data\SqlClient\Server\SmiEventSink_Default.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiGettersStream.cs">
<Link>Microsoft\Data\SqlClient\Server\SmiGettersStream.cs</Link>
</Compile>
Expand Down
1 change: 0 additions & 1 deletion src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10291,7 +10291,6 @@ private void WriteSmiParameter(SqlParameter param, int paramIndex, bool sendDefa
//
TdsParameterSetter paramSetter = new TdsParameterSetter(stateObj, metaData);
ValueUtilsSmi.SetCompatibleValueV200(
new SmiEventSink_Default(), // TDS Errors/events dealt with at lower level for now, just need an object for processing
paramSetter,
0, // ordinal. TdsParameterSetter only handles one parameter at a time
metaData,
Expand Down
3 changes: 0 additions & 3 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,9 +534,6 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs">
<Link>Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiEventSink_Default.cs">
<Link>Microsoft\Data\SqlClient\Server\SmiEventSink_Default.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiGettersStream.cs">
<Link>Microsoft\Data\SqlClient\Server\SmiGettersStream.cs</Link>
</Compile>
Expand Down
1 change: 0 additions & 1 deletion src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10482,7 +10482,6 @@ private void WriteSmiParameter(SqlParameter param, int paramIndex, bool sendDefa
//
TdsParameterSetter paramSetter = new TdsParameterSetter(stateObj, metaData);
ValueUtilsSmi.SetCompatibleValueV200(
new SmiEventSink_Default(), // TDS Errors/events dealt with at lower level for now, just need an object for processing
paramSetter,
0, // ordinal. TdsParameterSetter only handles one parameter at a time
metaData,
Expand Down
123 changes: 0 additions & 123 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SmiEventSink_Default.cs
View file
Open in desktop

This file was deleted.

9 changes: 3 additions & 6 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SmiGettersStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,17 @@ namespace Microsoft.Data.SqlClient.Server
{
internal class SmiGettersStream : Stream
{
private SmiEventSink_Default _sink;
private ITypedGettersV3 _getters;
private int _ordinal;
private long _readPosition;
private SmiMetaData _metaData;

internal SmiGettersStream(SmiEventSink_Default sink, ITypedGettersV3 getters, int ordinal, SmiMetaData metaData)
internal SmiGettersStream(ITypedGettersV3 getters, int ordinal, SmiMetaData metaData)
{
Debug.Assert(sink != null);
Debug.Assert(getters != null);
Debug.Assert(0 <= ordinal);
Debug.Assert(metaData != null);

_sink = sink;
_getters = getters;
_ordinal = ordinal;
_readPosition = 0;
Expand Down Expand Up @@ -58,7 +55,7 @@ public override long Length
{
get
{
return ValueUtilsSmi.GetBytesInternal(_sink, _getters, _ordinal, _metaData, 0, null, 0, 0, false);
return ValueUtilsSmi.GetBytesInternal(_getters, _ordinal, _metaData, 0, null, 0, 0, false);
}
}

Expand Down Expand Up @@ -91,7 +88,7 @@ public override void SetLength(long value)

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

return checked((int)bytesRead);
Expand Down
11 changes: 4 additions & 7 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SmiSettersStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,17 @@ namespace Microsoft.Data.SqlClient.Server
{
internal class SmiSettersStream : Stream
{
private SmiEventSink_Default _sink;
private ITypedSettersV3 _setters;
private int _ordinal;
private long _lengthWritten;
private SmiMetaData _metaData;

internal SmiSettersStream(SmiEventSink_Default sink, ITypedSettersV3 setters, int ordinal, SmiMetaData metaData)
internal SmiSettersStream(ITypedSettersV3 setters, int ordinal, SmiMetaData metaData)
{
Debug.Assert(sink != null);
Debug.Assert(setters != null);
Debug.Assert(0 <= ordinal);
Debug.Assert(metaData != null);

_sink = sink;
_setters = setters;
_ordinal = ordinal;
_lengthWritten = 0;
Expand Down Expand Up @@ -77,7 +74,7 @@ public override long Position

public override void Flush()
{
_lengthWritten = ValueUtilsSmi.SetBytesLength(_sink, _setters, _ordinal, _metaData, _lengthWritten);
_lengthWritten = ValueUtilsSmi.SetBytesLength(_setters, _ordinal, _metaData, _lengthWritten);
}

public override long Seek(long offset, SeekOrigin origin)
Expand All @@ -91,7 +88,7 @@ public override void SetLength(long value)
{
throw ADP.ArgumentOutOfRange(nameof(value));
}
ValueUtilsSmi.SetBytesLength(_sink, _setters, _ordinal, _metaData, value);
ValueUtilsSmi.SetBytesLength(_setters, _ordinal, _metaData, value);
}

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

public override void Write(byte[] buffer, int offset, int count)
{
_lengthWritten += ValueUtilsSmi.SetBytes(_sink, _setters, _ordinal, _metaData, _lengthWritten, buffer, offset, count);
_lengthWritten += ValueUtilsSmi.SetBytes(_setters, _ordinal, _metaData, _lengthWritten, buffer, offset, count);
}
}
}
Loading
Loading