Skip to content
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.

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

Code Merge | TdsParserStateObject alignment #2073

Merged
merged 2 commits into from Jul 6, 2023

Conversation

David-Engel
Copy link
Contributor

@David-Engel David-Engel commented Jun 28, 2023

Making TdsParserStateObject.cs look closer between netcore and netfx prior to actual merge.

This was done by going through a diff between netfx and netcore TdsParserStateObject.cs and merging the easy items like code formatting, typos, white space, trace messages, simple variable refactor.

This diff should be easy to digest for PR reviewers. 5-10 minutes.

AddError(_parser.ProcessSNIError(this));
ThrowExceptionAndWarning(callerHasConnectionLock, false);
ThrowExceptionAndWarning(callerHasConnectionLock, asyncClose);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this was a bug introduced in 1766.

Copy link
Contributor

@Wraith2 Wraith2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@codecov
Copy link

codecov bot commented Jun 29, 2023

Codecov Report

Patch coverage: 82.75% and project coverage change: +0.71 🎉

Comparison is base (bcba97c) 69.89% compared to head (c6737a3) 70.61%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2073      +/-   ##
==========================================
+ Coverage   69.89%   70.61%   +0.71%     
==========================================
  Files         305      305              
  Lines       61944    61950       +6     
==========================================
+ Hits        43297    43743     +446     
+ Misses      18647    18207     -440     
Flag Coverage Δ
addons 92.88% <ø> (ø)
netcore 73.34% <90.90%> (-0.02%) ⬇️
netfx 69.26% <80.85%> (+1.11%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...c/Microsoft/Data/SqlClient/TdsParserSessionPool.cs 86.25% <ø> (ø)
...c/Microsoft/Data/SqlClient/TdsParserStateObject.cs 64.53% <68.18%> (+38.34%) ⬆️
...nt/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs 70.94% <87.50%> (ø)
...c/Microsoft/Data/SqlClient/TdsParserStateObject.cs 80.14% <90.90%> (-0.04%) ⬇️
...etfx/src/Microsoft/Data/SqlClient/SqlDataReader.cs 68.46% <100.00%> (ø)
...crosoft/Data/SqlClient/SqlInternalConnectionTds.cs 68.33% <100.00%> (ø)

... and 4 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@DavoudEshtehari DavoudEshtehari added the ➕ Code Health Changes related to source code improvements label Jul 5, 2023
@DavoudEshtehari DavoudEshtehari added this to the 5.2.0-preview3 milestone Jul 5, 2023
Copy link
Member

@DavoudEshtehari DavoudEshtehari left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Kaur-Parminder Kaur-Parminder merged commit ae9dada into dotnet:main Jul 6, 2023
132 checks passed
@David-Engel David-Engel deleted the merge branch July 6, 2023 22:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
➕ Code Health Changes related to source code improvements
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants