Merge | DbConnectionInternal (w/Cleaning)#2909
Closed
benrr101 wants to merge 21 commits intodotnet:mainfrom
Closed
Merge | DbConnectionInternal (w/Cleaning)#2909benrr101 wants to merge 21 commits intodotnet:mainfrom
benrr101 wants to merge 21 commits intodotnet:mainfrom
Conversation
* 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,
cheenamalhotra,
mdaigle,
samsharma2700 and
saurabh500
benrr101
changed the title
benrr101
changed the title
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #2909 +/- ##
==========================================
- Coverage 71.92% 70.60% -1.32%
==========================================
Files 294 216 -78
Lines 60342 40783 -19559
==========================================
- Hits 43398 28793 -14605
+ Misses 16944 11990 -4954
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
Contributor
Author
|
Moving back to draft to since the merge-only PR got merged. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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. Nevertheless, this PR has a lot of code cleanup changes at the end that make the overall PR fairly large. In anticipation of pushback on this, I will offer a separate PR that only contains the merge changes. If that one is accepted, I'll still send out the cleanup change on a separate PR. But, I think this option would be faster overall. Ideally there is some other cleanup tasks that could be done (public -> internal, protected -> private, etc), but those changes require larger picture understanding of the class hierarchy.
Behavioral Changes: The method
DbConnectionInternal.DoomThisConnection()logs a trace event, butDbConnectionInternal.UnDoomThisConnection()does not. I added a trace event of the same format toUnDoomThisConnectionto make it match.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.