feature: Reuse connection to merge branch transactions by PeppaO · Pull Request #7509 · apache/incubator-seata

PeppaO · 2025-07-09T05:42:03Z

I have registered the PR changes.

Ⅰ. Describe what this PR did

fixes #7357

Ⅱ. 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 · 2025-07-09T05:56:50Z

Codecov Report

❌ Patch coverage is 50.79365% with 62 lines in your changes missing coverage. Please review.
✅ Project coverage is 61.34%. Comparing base (f8e0bd5) to head (0883c9a).
⚠️ Report is 1 commits behind head on 2.x.

Files with missing lines	Patch %	Lines
...andler/CombineTransactionalInterceptorHandler.java	32.60%	27 Missing and 4 partials ⚠️
.../parser/CombineTransactionalInterceptorParser.java	56.66%	10 Missing and 3 partials ⚠️
...ache/seata/rm/datasource/xa/ConnectionProxyXA.java	27.27%	5 Missing and 3 partials ⚠️
...ache/seata/rm/datasource/xa/DataSourceProxyXA.java	41.66%	5 Missing and 2 partials ⚠️
...rm/datasource/combine/CombineConnectionHolder.java	89.47%	1 Missing and 1 partial ⚠️
...ava/org/apache/seata/core/context/RootContext.java	83.33%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##                2.x    #7509      +/-   ##
============================================
- Coverage     61.37%   61.34%   -0.04%     
- Complexity      658      662       +4     
============================================
  Files          1308     1311       +3     
  Lines         49443    49567     +124     
  Branches       5811     5834      +23     
============================================
+ Hits          30346    30406      +60     
- Misses        16390    16440      +50     
- Partials       2707     2721      +14

Files with missing lines	Coverage Δ
...tion/tx/api/interceptor/InvocationHandlerType.java	`100.00% <100.00%> (ø)`
...ava/org/apache/seata/core/context/RootContext.java	`82.35% <83.33%> (+0.09%)`	⬆️
...rm/datasource/combine/CombineConnectionHolder.java	`89.47% <89.47%> (ø)`
...ache/seata/rm/datasource/xa/DataSourceProxyXA.java	`69.49% <41.66%> (-7.60%)`	⬇️
...ache/seata/rm/datasource/xa/ConnectionProxyXA.java	`49.00% <27.27%> (-0.74%)`	⬇️
.../parser/CombineTransactionalInterceptorParser.java	`56.66% <56.66%> (ø)`
...andler/CombineTransactionalInterceptorHandler.java	`32.60% <32.60%> (ø)`

... and 11 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

YongGoose · 2025-07-10T03:45:51Z

Please update all comments written in Chinese to English.

# Conflicts: # changes/en-us/2.x.md # changes/zh-cn/2.x.md

PeppaO · 2025-07-10T05:36:12Z

Please update all comments written in Chinese to English.

done

mvn spotless:apply

done

funky-eyes · 2025-07-17T01:19:55Z

integration-tx-api/pom.xml

        </dependency>
-
+        <dependency>
+            <groupId>org.springframework</groupId>


It should not rely on Spring, but instead refer to the existing proxy approach and use byte-buddy for proxying.

# Conflicts: # changes/en-us/2.x.md # changes/zh-cn/2.x.md

...che/seata/integration/tx/api/interceptor/handler/CombineTransactionalInterceptorHandler.java

integration-tx-api/src/main/java/org/apache/seata/spring/annotation/CombineTransactional.java

rm-datasource/src/main/java/org/apache/seata/rm/datasource/combine/CombineContext.java

...che/seata/integration/tx/api/interceptor/handler/CombineTransactionalInterceptorHandler.java

funky-eyes · 2025-08-06T07:41:52Z

rm-datasource/src/main/java/org/apache/seata/rm/datasource/combine/CombineConnectionHolder.java

+import java.util.concurrent.ConcurrentHashMap;
+
+public class CombineConnectionHolder {
+    private static final ThreadLocal<Map<String, Map<Object, ConnectionProxyXA>>> CONNECTION_HOLDER =


Why use ConcurrentHashMap? Will there be concurrent situations?

I think there may be asynchronous or parallel branches.

rm-datasource/src/main/java/org/apache/seata/rm/datasource/combine/CombineConnectionHolder.java

funky-eyes · 2025-08-06T07:46:10Z

rm-datasource/src/main/java/org/apache/seata/rm/datasource/xa/ConnectionProxyXA.java


    @Override
    public void rollback() throws SQLException {
+        if (combine) {


If a rollback is issued during a two-phase commit, would there be any issues if the branch is still running?

There may be a situation where the connection is not reset and the process is automatically submitted. This has been resolved

funky-eyes

LGTM

chuzhe-as-a-dev · 2025-10-31T04:39:35Z

rm-datasource/src/main/java/org/apache/seata/rm/datasource/xa/ConnectionProxyXA.java

     * @throws XAException XAException
     */
    public void xaRollback(XAXid xaXid) throws XAException {
+        xaEnd(xaXid, XAResource.TMFAIL);


Hi! Can you explain a bit why this xaEnd() is added?

I'm experiencing issues with this line ending a MySQL branch, where the DB throws an exception saying that end is not allowed when the branch is in a NON-EXISTING state.
Without this line, everything works just fine since Seata 2.0.0.

feature: Reuse connection to merge branch transactions

f607ee1

mvn spotless:apply

4a16d62

PeppaO added 4 commits July 10, 2025 13:30

update all comments written in Chinese to English

78e5a17

Merge branch '2.x' into combine

2c2f612

# Conflicts: # changes/en-us/2.x.md # changes/zh-cn/2.x.md

merge 2.x

69d4a70

mvn spotless:apply

485b0b1

PeppaO requested a review from funky-eyes July 10, 2025 05:37

funky-eyes reviewed Jul 17, 2025

View reviewed changes

PeppaO and others added 4 commits July 27, 2025 17:19

proxy update as GlobalTransactionScanner

ac0fb1a

Merge branch '2.x' into combine

60846e0

# Conflicts: # changes/en-us/2.x.md # changes/zh-cn/2.x.md

changes

1b9dd78

Merge branch '2.x' into combine

6c97992

funky-eyes added this to the 2.6.0 milestone Aug 4, 2025

funky-eyes added type: feature Category issues or prs related to feature request. module/rm-datasource rm-datasource module module/intergration-tx-api intergration-tx-api labels Aug 4, 2025

funky-eyes reviewed Aug 4, 2025

View reviewed changes

PeppaO and others added 3 commits August 4, 2025 15:52

fix

db46bcd

Merge remote-tracking branch 'origin/combine' into combine

e41c083

Merge branch '2.x' into combine

a288913

funky-eyes reviewed Aug 6, 2025

View reviewed changes

PeppaO added 2 commits August 6, 2025 16:46

fix

341328e

Merge remote-tracking branch 'origin/combine' into combine

0ba84a9

funky-eyes approved these changes Aug 6, 2025

View reviewed changes

PeppaO and others added 3 commits August 7, 2025 10:59

fix

941776d

Merge branch '2.x' into combine

7880439

add testcase

a724c22

PeppaO added 4 commits August 13, 2025 10:51

Merge remote-tracking branch 'origin/combine' into combine

e57effa

add testcase

0b7b525

add testcase

e474563

mvn spotless:apply

0883c9a

funky-eyes merged commit a9e19b7 into apache:2.x Aug 13, 2025
12 of 14 checks passed

slievrly pushed a commit to slievrly/fescar that referenced this pull request Oct 21, 2025

feature: Reuse connection to merge branch transactions (apache#7509)

8058d1b

chuzhe-as-a-dev reviewed Oct 31, 2025

View reviewed changes

YvCeung pushed a commit to YvCeung/incubator-seata that referenced this pull request Dec 25, 2025

feature: Reuse connection to merge branch transactions (apache#7509)

7fc4bea

Conversation

PeppaO commented Jul 9, 2025 • edited by funky-eyes Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Ⅰ. Describe what this PR did

Ⅱ. 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

Uh oh!

codecov bot commented Jul 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

YongGoose commented Jul 10, 2025

Uh oh!

PeppaO commented Jul 10, 2025

Uh oh!

funky-eyes Jul 17, 2025

Choose a reason for hiding this comment

Uh oh!

PeppaO Jul 27, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

funky-eyes Aug 6, 2025

Choose a reason for hiding this comment

Uh oh!

PeppaO Aug 6, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

funky-eyes Aug 6, 2025

Choose a reason for hiding this comment

Uh oh!

PeppaO Aug 6, 2025

Choose a reason for hiding this comment

Uh oh!

funky-eyes left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

chuzhe-as-a-dev Oct 31, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

PeppaO commented Jul 9, 2025 •

edited by funky-eyes

Loading

codecov bot commented Jul 9, 2025 •

edited

Loading