refactor : separate the different transaction pattern processing logic #2134

ph3636 · 2020-01-04T08:21:41Z

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

codecov-io · 2020-01-04T08:29:18Z

Codecov Report

Merging #2134 into develop will increase coverage by <.01%.
The diff coverage is 100%.

@@              Coverage Diff              @@
##             develop    #2134      +/-   ##
=============================================
+ Coverage      53.04%   53.05%   +<.01%     
  Complexity      2518     2518              
=============================================
  Files            488      488              
  Lines          15341    15341              
  Branches        1749     1749              
=============================================
+ Hits            8138     8139       +1     
+ Misses          6426     6425       -1     
  Partials         777      777

Impacted Files	Coverage Δ	Complexity Δ
.../java/io/seata/core/context/ContextCoreLoader.java	`100% <100%> (ø)`	`1 <1> (ø)`	⬇️
...in/java/io/seata/server/session/GlobalSession.java	`84% <0%> (ø)`	`72% <0%> (ø)`	⬇️
...java/io/seata/spring/tcc/TccActionInterceptor.java	`13.15% <0%> (ø)`	`2% <0%> (ø)`	⬇️
...n/java/io/seata/rm/datasource/ConnectionProxy.java	`26.05% <0%> (ø)`	`12% <0%> (ø)`	⬇️
...a/io/seata/core/rpc/netty/AbstractRpcRemoting.java	`9.35% <0%> (ø)`	`3% <0%> (ø)`	⬇️
...ing/annotation/GlobalTransactionalInterceptor.java	`10% <0%> (ø)`	`2% <0%> (ø)`	⬇️
...in/java/io/seata/server/session/BranchSession.java	`78.1% <0%> (ø)`	`44% <0%> (ø)`	⬇️
...va/io/seata/core/store/db/LogStoreDataBaseDAO.java	`55.92% <0%> (ø)`	`21% <0%> (ø)`	⬇️
...very/registry/zk/ZookeeperRegisterServiceImpl.java	`63.11% <0%> (+0.81%)`	`24% <0%> (ø)`	⬇️
...ain/java/io/seata/config/ConfigurationFactory.java	`53.06% <0%> (ø)`	`4% <0%> (ø)`	⬇️
... and 21 more

long187 · 2020-01-06T04:05:19Z

Are all three models regression tested with unit tests?

ph3636 · 2020-01-06T04:10:08Z

Are all three models regression tested with unit tests?

Yes, I can add more if it's not enough

long187

I have cloned you branch and tested SagaCore. It works OK

ph3636 · 2020-01-07T08:42:41Z

I have cloned you branch and tested SagaCore. It works OK

ok,thanks

server/src/main/java/io/seata/server/coordinator/DefaultCoordinator.java

server/src/main/java/io/seata/server/transaction/saga/SagaCore.java

server/src/main/java/io/seata/server/coordinator/AbstractCore.java

…ransaction

… RefactorServer_transaction

zjinlei · 2020-01-23T16:10:40Z

please resolve conflicts

server/src/main/java/io/seata/server/coordinator/Core.java

slievrly · 2020-02-04T02:24:46Z

server/src/main/java/io/seata/server/coordinator/DefaultCore.java

+     * @return the core
+     */
+    public AbstractCore getCore(BranchType branchType) {
+        AbstractCore rm = coreMap.get(branchType);


What does rm mean？

slievrly · 2020-02-04T03:10:55Z

@ph3636 DefaultCoordinatorTest test failed.

slievrly · 2020-02-04T03:16:59Z

server/src/main/java/io/seata/server/coordinator/AbstractCore.java

+        this.messageSender = messageSender;
+    }
+
+    public abstract BranchType getBranchType();


getHandleBranchType

ph3636 · 2020-02-04T09:25:01Z

@ph3636 DefaultCoordinatorTest test failed.

done

slievrly

LGTM

apache#2134)

Refactor : Server_transaction

504c8e4

long187 approved these changes Jan 7, 2020

View reviewed changes

ph3636 and others added 2 commits January 7, 2020 17:01

Resolving conflicts

3b7e23f

Merge branch 'develop' into RefactorServer_transaction

a059f5e

ph3636 mentioned this pull request Jan 8, 2020

Refactor : Server (This needs to be divided into several parts) #2100

Closed

Merge branch 'develop' into RefactorServer_transaction

bb6f60a

EZKAYOTWJPRKXWCUYEEB suggested changes Jan 14, 2020

View reviewed changes

server/src/main/java/io/seata/server/coordinator/DefaultCoordinator.java Outdated Show resolved Hide resolved

EZKAYOTWJPRKXWCUYEEB reviewed Jan 14, 2020

View reviewed changes

server/src/main/java/io/seata/server/transaction/saga/SagaCore.java Outdated Show resolved Hide resolved

server/src/main/java/io/seata/server/coordinator/AbstractCore.java Outdated Show resolved Hide resolved

ph3636 and others added 4 commits January 14, 2020 11:26

Merge remote-tracking branch 'upstream/develop' into RefactorServer_t…

7d4ff4a

…ransaction

Merge remote-tracking branch 'origin/RefactorServer_transaction' into…

0ffbc78

… RefactorServer_transaction

keep jdk related import classes at the forefront

19458a2

Merge branch 'develop' into RefactorServer_transaction

e177f71

zjinlei added this to the 1.1.0 milestone Jan 22, 2020

zjinlei added the status: merge-conflict Category prs with merge conflict. label Jan 24, 2020

ph3636 and others added 2 commits February 3, 2020 13:06

Merge branch 'develop' into RefactorServer_transaction

b7b7c05

Merge branch 'develop' into RefactorServer_transaction

5d17f4e

slievrly reviewed Feb 4, 2020

View reviewed changes

server/src/main/java/io/seata/server/coordinator/Core.java Show resolved Hide resolved

zjinlei removed the status: merge-conflict Category prs with merge conflict. label Feb 4, 2020

slievrly reviewed Feb 4, 2020

View reviewed changes

slievrly mentioned this pull request Feb 4, 2020

optimize: add transaction outbound interface. #2117

Closed

ph3636 and others added 3 commits February 4, 2020 16:48

pass compile

9655931

pass compile

931e78b

Merge branch 'develop' into RefactorServer_transaction

590d146

slievrly approved these changes Feb 4, 2020

View reviewed changes

slievrly changed the title ~~Refactor : Server_transaction~~ Refactor : separate the different transaction pattern processing logic Feb 4, 2020

slievrly changed the title ~~Refactor : separate the different transaction pattern processing logic~~ refactor : separate the different transaction pattern processing logic Feb 4, 2020

slievrly merged commit 738bf70 into apache:develop Feb 4, 2020

booogu pushed a commit to booogu/seata that referenced this pull request Feb 12, 2020

refactor : separate the different transaction pattern processing logic (

b3fb999

apache#2134)

ph3636 deleted the RefactorServer_transaction branch March 11, 2020 10:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor : separate the different transaction pattern processing logic #2134

refactor : separate the different transaction pattern processing logic #2134

ph3636 commented Jan 4, 2020

codecov-io commented Jan 4, 2020 •

edited

long187 commented Jan 6, 2020

ph3636 commented Jan 6, 2020

long187 left a comment

ph3636 commented Jan 7, 2020

zjinlei commented Jan 23, 2020

slievrly Feb 4, 2020

slievrly commented Feb 4, 2020

slievrly Feb 4, 2020

ph3636 commented Feb 4, 2020

slievrly left a comment

refactor : separate the different transaction pattern processing logic #2134

refactor : separate the different transaction pattern processing logic #2134

Conversation

ph3636 commented Jan 4, 2020

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

codecov-io commented Jan 4, 2020 • edited

Codecov Report

long187 commented Jan 6, 2020

ph3636 commented Jan 6, 2020

long187 left a comment

Choose a reason for hiding this comment

ph3636 commented Jan 7, 2020

zjinlei commented Jan 23, 2020

slievrly Feb 4, 2020

Choose a reason for hiding this comment

slievrly commented Feb 4, 2020

slievrly Feb 4, 2020

Choose a reason for hiding this comment

ph3636 commented Feb 4, 2020

slievrly left a comment

Choose a reason for hiding this comment

codecov-io commented Jan 4, 2020 •

edited