Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

@ZhangShiYeChina
Copy link
Contributor

@ZhangShiYeChina ZhangShiYeChina commented Feb 3, 2023

Ⅰ. Describe what this PR did

  1. Correct the comment on MySQLUndoUpdateExecutor#UPDATE_SQL_TEMPLATE (MySQLUndoUpdateExecutor中UPDATE_SQL_TEMPLATE的注释不正确 #5297)
  2. 事务回滚重试超时后,DB会话存储的模式下会将全局事务删除掉,接下来还有修改事务状态的逻辑 #5295

Ⅱ. Does this pull request fix one issue?

fixes #5297
fixes #5295

1. Correct the comment on MySQLUndoUpdateExecutor#UPDATE_SQL_TEMPLATE (apache#5297)
2. Do not remove GlobalSession when retry rollback or retry commit timeout (apache#5293)
@codecov-commenter
Copy link

codecov-commenter commented Feb 3, 2023

Codecov Report

Merging #5299 (8eac140) into develop (01a1ff9) will decrease coverage by 0.04%.
The diff coverage is n/a.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #5299      +/-   ##
=============================================
- Coverage      48.83%   48.80%   -0.04%     
+ Complexity      4182     4178       -4     
=============================================
  Files            743      743              
  Lines          26626    26622       -4     
  Branches        3333     3333              
=============================================
- Hits           13002    12992      -10     
- Misses         12219    12225       +6     
  Partials        1405     1405              
Impacted Files Coverage Δ
...datasource/undo/mysql/MySQLUndoUpdateExecutor.java 87.50% <ø> (ø)
...o/seata/server/coordinator/DefaultCoordinator.java 46.15% <ø> (-0.07%) ⬇️
...er/src/main/java/io/seata/server/ServerRunner.java 50.00% <0.00%> (-15.39%) ⬇️
...torage/file/store/FileTransactionStoreManager.java 59.16% <0.00%> (-1.29%) ⬇️

@ZhangShiYeChina ZhangShiYeChina changed the title bugfix: bugfix: Do not remove GlobalSession when retry rollback or retry commit timeout Feb 3, 2023
Copy link
Contributor

@funky-eyes funky-eyes left a comment

Choose a reason for hiding this comment

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

LGTM

@funky-eyes funky-eyes added this to the 1.7.0 milestone Feb 4, 2023
@funky-eyes funky-eyes added type: bug Category issues or prs related to bug. first-time contributor first-time contributor module/server server module labels Feb 4, 2023
1. update change log
1. update change log
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.

add change in develop.md not inn 1.6.1.md

1. update change log
@funky-eyes funky-eyes removed the first-time contributor first-time contributor label Feb 6, 2023
@funky-eyes funky-eyes requested a review from slievrly February 6, 2023 03:09

/**
* UPDATE a SET x = ?, y = ?, z = ? WHERE pk1 in (?) pk2 in (?)
* UPDATE a SET x = ?, y = ?, z = ? WHERE pk1 =? and pk2 =?
Copy link
Contributor

Choose a reason for hiding this comment

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

强迫症表示,等号后面加个空格吧。

Copy link
Member

Choose a reason for hiding this comment

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

This will be fix in the next pr.

@slievrly slievrly changed the title bugfix: Do not remove GlobalSession when retry rollback or retry commit timeout bugfix: don't remove GlobalSession when retry rollback or retry commit timeout Feb 7, 2023
Copy link
Contributor

@wangliang181230 wangliang181230 left a comment

Choose a reason for hiding this comment

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

LGTM

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

@slievrly slievrly merged commit 83db274 into apache:develop Feb 7, 2023
l81893521 pushed a commit to l81893521/seata that referenced this pull request Mar 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

module/server server module type: bug Category issues or prs related to bug.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants