feature: tcc-mode commit and rollback method support `@BusinessActionContextParameter("opId") long opId` #3823

yujianfei1986 · 2021-06-11T15:28:48Z

Ⅰ. Describe what this PR did

tcc模式，commit和rollback方法，支持 @BusinessActionContextParameter("opId") long opId方式

Ⅱ. Does this pull request fix one issue?

Some improvments abount TCC are in planning or in progress?
fixes #2421

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

不需要

Ⅳ. Describe how to verify it

新feature

Ⅴ. Special notes for reviews

codecov-commenter · 2021-06-11T23:16:09Z

Codecov Report

Merging #3823 (9582afa) into develop (4038168) will increase coverage by 0.04%.
The diff coverage is 22.64%.

@@              Coverage Diff              @@
##             develop    #3823      +/-   ##
=============================================
+ Coverage      40.67%   40.72%   +0.04%     
- Complexity      2991     3007      +16     
=============================================
  Files            676      676              
  Lines          22614    22660      +46     
  Branches        2808     2813       +5     
=============================================
+ Hits            9199     9228      +29     
- Misses         12564    12581      +17     
  Partials         851      851

Impacted Files	Coverage Δ
...src/main/java/io/seata/rm/tcc/TCCFenceHandler.java	`0.00% <0.00%> (ø)`
tcc/src/main/java/io/seata/rm/tcc/TCCResource.java	`0.00% <0.00%> (ø)`
.../main/java/io/seata/rm/tcc/TCCResourceManager.java	`0.00% <0.00%> (ø)`
.../rm/tcc/remoting/parser/DefaultRemotingParser.java	`23.80% <60.00%> (+23.80%)`	⬆️
...ta/rm/tcc/remoting/parser/DubboRemotingParser.java	`3.84% <0.00%> (+3.84%)`	⬆️
.../rm/tcc/remoting/parser/SofaRpcRemotingParser.java	`4.54% <0.00%> (+4.54%)`	⬆️
...n/src/main/java/io/seata/common/util/IdWorker.java	`83.33% <0.00%> (+6.25%)`	⬆️
...eata/rm/tcc/remoting/parser/HSFRemotingParser.java	`7.69% <0.00%> (+7.69%)`	⬆️

wangliang181230 · 2021-06-15T07:35:55Z

想了下，Commit和Rollback方法的入参是否可以不同？如果肯定相同的话，请忽略我的这个疑问。

tcc/src/main/java/io/seata/rm/tcc/api/TwoPhaseBusinessAction.java

tcc/src/main/java/io/seata/rm/tcc/TCCResourceManager.java

yujianfei1986 · 2021-06-17T14:07:02Z

想了下，Commit和Rollback方法的入参是否可以不同？如果肯定相同的话，请忽略我的这个疑问。

暂时是不是先考虑二阶段方法参数列表保持一致。如果以后有场景或是明确需求，再考虑？？如果二阶段方法参数还不一样，那TwoPhaseBusinessAction注解里加的定义参数类型的数组，意义好像也不大了？或是还需要定义更多的数组，commit方法参数的数组，rollback方法参数的数组，使用起来好像就更麻烦了

tcc/src/main/java/io/seata/rm/tcc/remoting/parser/DefaultRemotingParser.java

tcc/src/main/java/io/seata/rm/tcc/TCCResourceManager.java

wangliang181230

LGTM

一处代码重构一下。
1.5.0.md补充一下PR信息。

其他我没问题了。

tcc/src/main/java/io/seata/rm/tcc/remoting/parser/DefaultRemotingParser.java

wangliang181230

LGTM

apache#3823-tcc-parameters

tanzzj

LGTM

tcc/src/main/java/io/seata/rm/tcc/TCCFenceHandler.java

caohdgege · 2021-07-03T17:13:31Z

tcc/src/main/java/io/seata/rm/tcc/TCCFenceHandler.java

@@ -192,11 +195,15 @@ private static boolean insertTCCFenceLog(Connection conn, String xid, Long branc
     * @param status                the tcc fence status


@param args

caohdgege · 2021-07-03T17:14:13Z

tcc/src/test/java/io/seata/rm/tcc/TccAction.java

@@ -51,13 +53,14 @@ boolean prepare(BusinessActionContext actionContext,
     * @param actionContext the action context
     * @return the boolean
     */
-    boolean commit(BusinessActionContext actionContext);
+    boolean commit(BusinessActionContext actionContext,
+                   @BusinessActionContextParameter("tccParam") TccParam param, @Param("a") Integer a);

    /**
     * Rollback boolean.
     *
     * @param actionContext the action context


@param param

tcc/src/test/java/io/seata/rm/tcc/TccAction.java

caohdgege · 2021-07-03T17:33:34Z

麻烦处理一下代码冲突

# Conflicts: # changes/1.5.0.md # changes/en-us/1.5.0.md # tcc/src/main/java/io/seata/rm/tcc/TCCFenceHandler.java # tcc/src/main/java/io/seata/rm/tcc/TCCResourceManager.java

yujianfei1986 · 2021-07-06T15:03:40Z

麻烦处理一下代码冲突

done

caohdgege

LGTM for @tanzzj

tcc/src/main/java/io/seata/rm/tcc/TCCFenceHandler.java

tcc/src/main/java/io/seata/rm/tcc/TCCResourceManager.java

tcc/src/main/java/io/seata/rm/tcc/remoting/parser/DefaultRemotingParser.java

funky-eyes

LGTM

yujianfei1986 added 2 commits June 11, 2021 23:25

tcc模式commit和rollback方法支持"@XxxParameter("opId") long opId"方式

e034194

tcc模式commit和rollback方法支持"@XxxParameter("opId") long opId"方式

337e7ab

caohdgege added mode: TCC TCC transaction mode module/tcc tcc module labels Jun 12, 2021

wangliang181230 changed the title ~~feature: tcc-mode commit and rollback method support "@BusinessActionContextParameter"opId") long opId"~~ feature: tcc-mode commit and rollback method support @BusinessActionContextParameter("opId") long opId Jun 12, 2021

wangliang181230 reviewed Jun 15, 2021

View reviewed changes

tcc/src/main/java/io/seata/rm/tcc/TCCResourceManager.java Outdated Show resolved Hide resolved

wangliang181230 reviewed Jun 15, 2021

View reviewed changes

tcc/src/main/java/io/seata/rm/tcc/TCCResourceManager.java Outdated Show resolved Hide resolved

yujianfei1986 added 5 commits June 15, 2021 22:42

按照建议修改相关代码

ac78b72

按照建议修改相关代码

58a602b

resovle keys at phase one

2ddb33b

resovle keys at phase one

45f5dd3

resovle keys at phase one

1d73749

wangliang181230 reviewed Jun 17, 2021

View reviewed changes

tcc/src/main/java/io/seata/rm/tcc/TCCResourceManager.java Show resolved Hide resolved

Merge branch 'develop' into tcc-parameters

7be4cbd

yujianfei1986 and others added 4 commits June 19, 2021 14:36

二阶段方法参数列表，如果不是BusinessActionContext,则必须添加注解，否则抛出异常

849d765

Merge remote-tracking branch 'origin/tcc-parameters' into tcc-parameters

fc3b74a

二阶段方法参数列表，commit和rollback方法参数列表可以不同

7f3f19d

Merge branch 'develop' into tcc-parameters

ce72ad2

wangliang181230 reviewed Jun 19, 2021

View reviewed changes

tcc/src/main/java/io/seata/rm/tcc/remoting/parser/DefaultRemotingParser.java Outdated Show resolved Hide resolved

yujianfei1986 added 3 commits June 20, 2021 07:39

二阶段方法参数列表，commit和rollback方法参数列表可以不同

082f584

Merge remote-tracking branch 'origin/tcc-parameters' into tcc-parameters

2b49e3c

二阶段方法参数列表，commit和rollback方法参数列表可以不同

11d761a

yujianfei1986 requested a review from wangliang181230 June 20, 2021 01:00

yujianfei1986 added 3 commits June 20, 2021 09:21

二阶段方法参数列表，commit和rollback方法参数列表可以不同

496a2e2

添加针对getTwoPhaseArgs方法的单元测试

1b699f7

添加针对getTwoPhaseArgs方法的单元测试

ba368bf

wangliang181230 added this to the 1.5.0 milestone Jun 20, 2021

wangliang181230 reviewed Jun 20, 2021

View reviewed changes

tcc/src/main/java/io/seata/rm/tcc/TCCResourceManager.java Show resolved Hide resolved

wangliang181230 approved these changes Jun 20, 2021

View reviewed changes

wangliang181230 reviewed Jun 21, 2021

View reviewed changes

tcc/src/main/java/io/seata/rm/tcc/remoting/parser/DefaultRemotingParser.java Show resolved Hide resolved

yujianfei1986 added 2 commits June 22, 2021 16:48

按照建议修改代码

d04411c

按照建议修改代码

6cda46d

wangliang181230 approved these changes Jun 22, 2021

View reviewed changes

wangliang181230 added a commit to wangliang181230/seata that referenced this pull request Jun 22, 2021

Merge branch 'p-yujianfei1986/apache#3823/tcc-parameters' into optimize/

aec48e0

apache#3823-tcc-parameters

bugfix

70f8343

wangliang181230 added a commit to wangliang181230/seata that referenced this pull request Jun 23, 2021

Merge branch 'p-yujianfei1986/apache#3823/tcc-parameters' into optimize/

171ec8f

apache#3823-tcc-parameters

tanzzj approved these changes Jun 29, 2021

View reviewed changes

caohdgege reviewed Jul 3, 2021

View reviewed changes

yujianfei1986 added 4 commits July 6, 2021 19:02

Merge branch 'develop' into tcc-parameters

27fe8d6

# Conflicts: # changes/1.5.0.md # changes/en-us/1.5.0.md # tcc/src/main/java/io/seata/rm/tcc/TCCFenceHandler.java # tcc/src/main/java/io/seata/rm/tcc/TCCResourceManager.java

解决冲突

6b8ef0c

解决冲突

663335d

添加注释

05e4b28

yujianfei1986 closed this Jul 6, 2021

yujianfei1986 reopened this Jul 6, 2021

commitFence/rollbackFence method add notes

496b7bc

caohdgege approved these changes Jul 8, 2021

View reviewed changes

funky-eyes requested changes Jul 8, 2021

View reviewed changes

tcc/src/main/java/io/seata/rm/tcc/TCCFenceHandler.java Outdated Show resolved Hide resolved

tcc/src/main/java/io/seata/rm/tcc/TCCResourceManager.java Show resolved Hide resolved

tcc/src/main/java/io/seata/rm/tcc/remoting/parser/DefaultRemotingParser.java Show resolved Hide resolved

TCCFenceHandler去掉@author

7906b2a

yujianfei1986 requested a review from funky-eyes July 11, 2021 11:44

Merge branch 'develop' into tcc-parameters

7270706

funky-eyes approved these changes Jul 12, 2021

View reviewed changes

1.5.0 markdown更新

9582afa

wangliang181230 merged commit 119f6eb into apache:develop Jul 12, 2021

PeppaO mentioned this pull request Mar 23, 2023

【Help】TCC 最佳实践及一些困惑 #5465

Open

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feature: tcc-mode commit and rollback method support `@BusinessActionContextParameter("opId") long opId` #3823

feature: tcc-mode commit and rollback method support `@BusinessActionContextParameter("opId") long opId` #3823

yujianfei1986 commented Jun 11, 2021 •

edited by wangliang181230

codecov-commenter commented Jun 11, 2021 •

edited

wangliang181230 commented Jun 15, 2021

yujianfei1986 commented Jun 17, 2021

wangliang181230 left a comment •

edited

wangliang181230 left a comment

tanzzj left a comment

caohdgege Jul 3, 2021

caohdgege Jul 3, 2021

caohdgege commented Jul 3, 2021

yujianfei1986 commented Jul 6, 2021

caohdgege left a comment

funky-eyes left a comment

		@@ -192,11 +195,15 @@ private static boolean insertTCCFenceLog(Connection conn, String xid, Long branc
		* @param status the tcc fence status

feature: tcc-mode commit and rollback method support @BusinessActionContextParameter("opId") long opId #3823

feature: tcc-mode commit and rollback method support @BusinessActionContextParameter("opId") long opId #3823

Conversation

yujianfei1986 commented Jun 11, 2021 • edited by wangliang181230

Ⅰ. 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-commenter commented Jun 11, 2021 • edited

Codecov Report

wangliang181230 commented Jun 15, 2021

yujianfei1986 commented Jun 17, 2021

wangliang181230 left a comment • edited

Choose a reason for hiding this comment

wangliang181230 left a comment

Choose a reason for hiding this comment

tanzzj left a comment

Choose a reason for hiding this comment

caohdgege Jul 3, 2021

Choose a reason for hiding this comment

caohdgege Jul 3, 2021

Choose a reason for hiding this comment

caohdgege commented Jul 3, 2021

yujianfei1986 commented Jul 6, 2021

caohdgege left a comment

Choose a reason for hiding this comment

funky-eyes left a comment

Choose a reason for hiding this comment

feature: tcc-mode commit and rollback method support `@BusinessActionContextParameter("opId") long opId` #3823

feature: tcc-mode commit and rollback method support `@BusinessActionContextParameter("opId") long opId` #3823

yujianfei1986 commented Jun 11, 2021 •

edited by wangliang181230

codecov-commenter commented Jun 11, 2021 •

edited

wangliang181230 left a comment •

edited