Merge | DbConnectionInternal (Merge Only) #2910
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* netcore/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs * netcore/src/Common/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs * netfx/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
* Just use a bool as the lock token
…the basic merge process)
benrr101
requested review from
VladimirReshetnikov,
saurabh500,
mdaigle,
cheenamalhotra and
samsharma2700
edwardneal
reviewed
Oct 11, 2024
There was a problem hiding this comment.
I'm leaving my comments here, but they should all apply to #2909 too.
The merge looks correct to me - I didn't see any logic change between the files, there are no missing/extra members. There's one logical difference between netfx and netcore though, which might be the result of a bugfix not being ported from netfx.
src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
Outdated
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionPoolCounters.netfx.cs
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlInternalConnectionSmi.stub.cs
Show resolved
Hide resolved
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #2910 +/- ##
==========================================
- Coverage 71.92% 71.87% -0.05%
==========================================
Files 294 292 -2
Lines 60342 60100 -242
==========================================
- Hits 43398 43197 -201
+ Misses 16944 16903 -41
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
David-Engel
approved these changes
Oct 14, 2024
cheenamalhotra
approved these changes
Oct 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description: This PR aims to merge
DbConnectionInternalfrom the netfx and netcore projects. The strategy for this merge is to move the netfx version of the class over (since it has the entire class in one file) and do a two-step merge of the two netcore files. Once combined, the bulk of the code has no differences between the netfx and netcore implementations. The only major difference is that netfx has a collection of performance counters that are updated in certain scenarios.The commits are broken up into fairly digestible chunks that explain each step along the process. I'd recommend reviewing the PR by stepping through the commits and seeing if you agree with the changes. This version of the PR only contains the merge, no cleanup changes were made.
Testing: Most of the functional tests run locally, though I'm having some difficulty with getting all tests to work. These issues happen main branch as well, so I assume it is unrelated to the code changes.