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

bugfix: fix TCC and Saga branches will also parse SQL in AbsConnectionProxy #2650

Merged
merged 7 commits into from Jun 30, 2020

Conversation

booogu
Copy link
Contributor

@booogu booogu commented May 2, 2020

Ⅰ. Describe what this PR did

BugFix: fix TCC and saga branches also parse SQL in AbsConnnectionProxy

Ⅱ. Does this pull request fix one issue?

Ⅲ. Why don't you add test cases (unit test/integration test)?

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@codecov-io
Copy link

codecov-io commented May 2, 2020

Codecov Report

Merging #2650 into develop will increase coverage by 0.01%.
The diff coverage is 0.00%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #2650      +/-   ##
=============================================
+ Coverage      50.90%   50.91%   +0.01%     
- Complexity      2814     2815       +1     
=============================================
  Files            558      558              
  Lines          17941    17936       -5     
  Branches        2129     2126       -3     
=============================================
  Hits            9132     9132              
+ Misses          7939     7937       -2     
+ Partials         870      867       -3     
Impacted Files Coverage Δ Complexity Δ
...c/main/java/io/seata/core/context/RootContext.java 45.23% <0.00%> (-4.77%) 12.00 <1.00> (ø)
...o/seata/rm/datasource/AbstractConnectionProxy.java 11.45% <0.00%> (ø) 5.00 <0.00> (ø)
...a/io/seata/rm/datasource/exec/ExecuteTemplate.java 6.45% <0.00%> (-1.45%) 2.00 <1.00> (-1.00)
...in/java/io/seata/server/session/GlobalSession.java 84.16% <0.00%> (+0.45%) 72.00% <0.00%> (+1.00%)
...o/seata/server/coordinator/DefaultCoordinator.java 55.15% <0.00%> (+0.51%) 29.00% <0.00%> (+1.00%)

@zjinlei zjinlei added this to the 1.3.0 milestone May 2, 2020
@slievrly slievrly self-requested a review May 4, 2020 14:09
zjinlei
zjinlei previously approved these changes May 13, 2020
Copy link
Contributor

@zjinlei zjinlei left a comment

Choose a reason for hiding this comment

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

LGTM

@zjinlei zjinlei dismissed their stale review May 13, 2020 10:41

SuspendedResourcesHolder should need to handle branchType

@l81893521 l81893521 added module/rm-datasource rm-datasource module module/integration integration module labels May 20, 2020
Copy link
Contributor

@long187 long187 left a comment

Choose a reason for hiding this comment

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

LGTM

@booogu booogu changed the title bugfix: fix that TCC and Saga branches will alse parse SQL in AbsConnectionProxy optimize: optimize that TCC and Saga branches will also parse SQL in AbsConnectionProxy Jun 30, 2020
@slievrly slievrly changed the title optimize: optimize that TCC and Saga branches will also parse SQL in AbsConnectionProxy bugfix: fix TCC and Saga branches will also parse SQL in AbsConnectionProxy Jun 30, 2020
Copy link
Member

@slievrly slievrly left a comment

Choose a reason for hiding this comment

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

LGTM, pls resolve conflicts.

@codecov-commenter
Copy link

codecov-commenter commented Jun 30, 2020

Codecov Report

Merging #2650 into develop will decrease coverage by 0.00%.
The diff coverage is 0.00%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #2650      +/-   ##
=============================================
- Coverage      50.03%   50.03%   -0.01%     
+ Complexity      2955     2951       -4     
=============================================
  Files            592      592              
  Lines          18995    18990       -5     
  Branches        2290     2288       -2     
=============================================
- Hits            9505     9501       -4     
+ Misses          8547     8545       -2     
- Partials         943      944       +1     
Impacted Files Coverage Δ Complexity Δ
...c/main/java/io/seata/core/context/RootContext.java 45.23% <0.00%> (-4.77%) 12.00 <1.00> (ø)
...o/seata/rm/datasource/AbstractConnectionProxy.java 11.45% <0.00%> (ø) 5.00 <0.00> (ø)
...a/io/seata/rm/datasource/exec/ExecuteTemplate.java 6.45% <0.00%> (-1.45%) 2.00 <1.00> (-1.00)
...o/seata/server/coordinator/DefaultCoordinator.java 54.63% <0.00%> (-0.52%) 28.00% <0.00%> (-2.00%)
...in/java/io/seata/server/session/GlobalSession.java 83.71% <0.00%> (-0.46%) 71.00% <0.00%> (-1.00%)

@booogu
Copy link
Contributor Author

booogu commented Jun 30, 2020

LGTM, pls resolve conflicts.

Ok,resolved.

@slievrly slievrly merged commit 4f3eddc into apache:develop Jun 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
module/integration integration module module/rm-datasource rm-datasource module
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants