-
Notifications
You must be signed in to change notification settings - Fork 8.7k
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: Saga can't be used when the dataSource is AT's dataSourceProxy #2551
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
先把缩进调整一下吧,没有改支的代码也显示修改了 |
好的,我给缩进调整好了,怎么重新提交啊?
…------------------ 原始邮件 ------------------
发件人: "leo"<notifications@github.com>;
发送时间: 2020年4月14日(星期二) 晚上7:50
收件人: "seata/seata"<seata@noreply.github.com>;
抄送: "王良"<841369634@qq.com>;"Author"<author@noreply.github.com>;
主题: Re: [seata/seata] 允许SAGA模式与AT模式在同一项目中使用,同时SAGA事务中,禁用AT和TCC模式。 (#2551)
先把缩进调整一下吧,没有改支的代码也显示修改了
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub, or unsubscribe.
|
已调整所有未做过调整的代码行的缩进。 |
RootContextTest.java:add test method testWithoutGlobalTransaction().
wangliang181230
changed the title
允许SAGA模式与AT模式在同一项目中使用,同时SAGA事务中,禁用AT和TCC模式。
SAGA mode is compatible with AT mode in same application.
Apr 15, 2020
wangliang181230
changed the title
SAGA mode is compatible with AT mode in same application.
optimize: SAGA mode is compatible with AT mode in same application.
Apr 15, 2020
代码格式化按照p3c规范. |
好像符合p3c规范的。我下了alibaba的idea插件了。 |
2.添加SeataSagaAutoConfiguration类(默认禁用). 3.代码按p3c规范调整.
wangliang181230
changed the title
optimize: SAGA mode is compatible with AT mode in same application.
optimize: SAGA mode is compatible with AT mode in same application, and added SeataSagaAutoConfiguration.class.
Apr 15, 2020
新修改: |
Codecov Report
@@ Coverage Diff @@
## develop #2551 +/- ##
==========================================
Coverage 50.67% 50.67%
Complexity 2813 2813
==========================================
Files 561 561
Lines 17983 17983
Branches 2128 2128
==========================================
Hits 9113 9113
Misses 8000 8000
Partials 870 870 |
wangliang181230
changed the title
optimize: SAGA is compatible with AT in the same application
bugfix: fix Saga can't be used, cause of AT's dataSourceProxy
Aug 21, 2020
wangliang181230
changed the title
bugfix: fix Saga can't be used, cause of AT's dataSourceProxy
bugfix: fix SAGA can't be used, cause of AT's dataSourceProxy
Aug 21, 2020
wangliang181230
changed the title
bugfix: fix SAGA can't be used, cause of AT's dataSourceProxy
bugfix: SAGA can't be used when the dataSource is AT's dataSourceProxy
Aug 21, 2020
# Conflicts: # core/src/main/java/io/seata/core/context/RootContext.java # spring/src/main/java/io/seata/spring/tcc/TccActionInterceptor.java
slievrly
reviewed
Sep 23, 2020
...aga-engine-store/src/main/java/io/seata/saga/engine/store/db/DbAndReportTcStateLogStore.java
Outdated
Show resolved
Hide resolved
slievrly
reviewed
Sep 23, 2020
...re/src/main/java/io/seata/saga/engine/pcext/interceptors/InSagaBranchHandlerInterceptor.java
Show resolved
Hide resolved
slievrly
reviewed
Sep 23, 2020
...re/src/main/java/io/seata/saga/engine/pcext/interceptors/InSagaBranchHandlerInterceptor.java
Show resolved
Hide resolved
slievrly
approved these changes
Sep 23, 2020
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.
LGTM
slievrly
changed the title
bugfix: SAGA can't be used when the dataSource is AT's dataSourceProxy
bugfix: Saga can't be used when the dataSource is AT's dataSourceProxy
Sep 23, 2020
wangliang181230
added
type: bug
Category issues or prs related to bug.
and removed
module/core
core module
module/script
script module
module/seata-spring-boot-starter
seata-spring-boot-starter module
module/spring
spring module
labels
Oct 19, 2020
l81893521
pushed a commit
to l81893521/seata
that referenced
this pull request
Oct 22, 2020
hicf
pushed a commit
to hicf/seata
that referenced
this pull request
Nov 15, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ⅰ. Describe what this PR did
bugfix: SAGA can't be used when the dataSource is AT's dataSourceProxy。
修复BUG:当数据源是AT数据源代理时,无法正常使用SAGA模式。
修复方式
模仿TCC模式,在SAGA事务内,
RootContext.bindBranchType(BranchType.SAGA)
,以此使AT模式无效化。Ⅱ. Does this pull request fix one issue?
fixes #2009
Ⅲ. Why don't you add test cases (unit test/integration test)?
Ⅳ. Describe how to verify it
测试以下三项内容,如果都正确,则说明此PR修复BUG成功。
Ⅴ. Special notes for reviews