- Notifications
You must be signed in to change notification settings - Fork311
Merge | DbConnectionInternal (Merge Only)#2910
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Uh oh!
There was an error while loading.Please reload this page.
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)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
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 OutdatedShow resolvedHide resolved
Uh oh!
There was an error while loading.Please reload this page.
src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionPoolCounters.netfx.csShow resolvedHide resolved
Uh oh!
There was an error while loading.Please reload this page.
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlInternalConnectionSmi.stub.csShow resolvedHide resolved
Uh oh!
There was an error while loading.Please reload this page.
codecovbot commentedOct 11, 2024 • edited
Loading Uh oh!
There was an error while loading.Please reload this page.
edited
Uh oh!
There was an error while loading.Please reload this page.
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. |
ac1b3fb
intodotnet:mainUh oh!
There was an error while loading.Please reload this page.
Description: This PR aims to merge
DbConnectionInternal
from 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.