bugfix: undolog rollback info more than 64MB #6483

jsbxyyx · 2024-04-17T09:46:35Z

I have registered the PR changes.

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

fixes #6451

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

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

…6451

codecov · 2024-07-10T02:04:36Z

Codecov Report

Attention: Patch coverage is 30.40541% with 103 lines in your changes missing coverage. Please review.

Project coverage is 50.24%. Comparing base (522d46e) to head (3ff8876).

Files	Patch %	Lines
.../rm/datasource/undo/mysql/MySQLUndoLogManager.java	11.66%	50 Missing and 3 partials ⚠️
...ata/rm/datasource/undo/AbstractUndoLogManager.java	50.00%	27 Missing and 5 partials ⚠️
...rg/apache/seata/rm/datasource/DataSourceProxy.java	33.33%	10 Missing and 2 partials ⚠️
...seata/rm/datasource/undo/AbstractUndoExecutor.java	0.00%	5 Missing and 1 partial ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##                2.x    #6483      +/-   ##
============================================
- Coverage     50.32%   50.24%   -0.08%     
- Complexity     5851     5854       +3     
============================================
  Files          1058     1058              
  Lines         36586    36707     +121     
  Branches       4347     4364      +17     
============================================
+ Hits          18412    18444      +32     
- Misses        16350    16430      +80     
- Partials       1824     1833       +9

Files	Coverage Δ
.../org/apache/seata/common/util/CollectionUtils.java	`76.85% <ø> (ø)`
...va/org/apache/seata/common/util/UUIDGenerator.java	`0.00% <ø> (ø)`
...che/seata/rm/datasource/undo/UndoLogConstants.java	`100.00% <ø> (ø)`
.../src/main/java/org/apache/seata/server/Server.java	`38.88% <ø> (ø)`
...org/apache/seata/server/session/GlobalSession.java	`69.37% <ø> (ø)`
...org/apache/seata/server/session/SessionHelper.java	`48.12% <ø> (ø)`
...seata/rm/datasource/undo/AbstractUndoExecutor.java	`66.66% <0.00%> (-2.78%)`	⬇️
...rg/apache/seata/rm/datasource/DataSourceProxy.java	`69.56% <33.33%> (-1.63%)`	⬇️
...ata/rm/datasource/undo/AbstractUndoLogManager.java	`52.91% <50.00%> (-0.25%)`	⬇️
.../rm/datasource/undo/mysql/MySQLUndoLogManager.java	`30.00% <11.66%> (-38.75%)`	⬇️

... and 1 file with indirect coverage changes

funky-eyes · 2024-07-10T07:24:41Z

rm-datasource/src/main/java/org/apache/seata/rm/datasource/DataSourceProxy.java

-                } else {
-                    kernelVersion = version;
-                    productVersion = version;
+        try (PreparedStatement preparedStatement = connection.prepareStatement("SHOW VARIABLES");


是不是应该弄一个variables的元数据存储的类，否则都放在datasourceproxy里，有点臃肿
Should I get a metadata storage class for variables, otherwise it will be put in datasourceproxy, which is a bit bloated?

rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/mysql/MySQLUndoLogManager.java

funky-eyes · 2024-07-10T07:37:28Z

rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/AbstractUndoLogManager.java

-        try (PreparedStatement deletePST = conn.prepareStatement(batchDeleteSql)) {
+        String batchDeleteSubSql = toBatchDeleteSubUndoLogSql(xidSize, branchIdSize);
+        try (PreparedStatement deletePST = conn.prepareStatement(batchDeleteSql);
+             PreparedStatement deleteSubPST = conn.prepareStatement(batchDeleteSubSql)) {


为什么不在上面的batch delete sql中直接增加删除sub的条件？
Why not add the condition to delete sub directly in the batch delete sql above?

主log和子log的条件不一样

The conditions for the main log and the sub-log are different.

主log和子log的条件不一样

The conditions for the main log and the sub-log are different.

为什么我们不能将其合并成一个sql？虽然条件不一样，可以是or的关系不是吗？
Why can't we merge it into one sql? Although the conditions are different, it can be an or relationship, right?

一个是走索引，一个不走索引的
One is indexed, and the other is not indexed.

common/src/test/resources/io/TestFile.txt

funky-eyes

LGTM

.asf.yaml

big undolog insert.

62a9b6f

jsbxyyx changed the title ~~[WIP] bugfix: undolog longblob more than 40MB~~ [WIP] bugfix: undolog rollback info more than 40MB Apr 17, 2024

jsbxyyx added 2 commits April 17, 2024 18:03

variables

92ec64d

merge undo log rollback info.

57424d8

jsbxyyx changed the title ~~[WIP] bugfix: undolog rollback info more than 40MB~~ bugfix: undolog rollback info more than 40MB Apr 18, 2024

jsbxyyx added 2 commits April 18, 2024 11:42

revert txt

6b4e095

fix: tests

3913f8b

jsbxyyx changed the title ~~bugfix: undolog rollback info more than 40MB~~ bugfix: undolog rollback info more than 64MB Apr 18, 2024

jsbxyyx added 3 commits April 19, 2024 11:25

rename

d154ba5

Merge branch '2.x' of github.com:apache/incubator-seata into undolog_…

9d09203

…6451

changes

64633be

funky-eyes added this to the 2.x Backlog milestone Apr 24, 2024

Merge branch '2.x' into undolog_6451

1de1158

funky-eyes modified the milestones: 2.x Backlog, 2.2.0 May 7, 2024

funky-eyes added type: bug Category issues or prs related to bug. module/rm-datasource rm-datasource module labels May 7, 2024

jsbxyyx and others added 3 commits May 8, 2024 17:05

Merge branch '2.x' into undolog_6451

7dd35e9

Update MySQLUndoLogManager.java

eaf2636

Merge branch '2.x' into undolog_6451

542697c

funky-eyes reviewed Jul 10, 2024

View reviewed changes

jsbxyyx added 3 commits July 11, 2024 11:05

fix: review

e24facf

Merge branch '2.x' into undolog_6451

fe6d273

Merge branch '2.x' into undolog_6451

32f9dfd

l81893521 reviewed Jul 20, 2024

View reviewed changes

common/src/test/resources/io/TestFile.txt Outdated Show resolved Hide resolved

jsbxyyx and others added 3 commits July 22, 2024 11:58

Update TestFile.txt

a877832

Merge branch '2.x' into undolog_6451

bbc28be

Merge branch '2.x' into undolog_6451

ab1d584

funky-eyes requested a review from l81893521 July 30, 2024 06:10

funky-eyes added 2 commits July 30, 2024 14:10

Merge branch '2.x' into undolog_6451

d1f3ab0

Merge branch '2.x' into undolog_6451

3ff8876

funky-eyes approved these changes Jul 31, 2024

View reviewed changes

funky-eyes reviewed Jul 31, 2024

View reviewed changes

.asf.yaml Outdated Show resolved Hide resolved

Update .asf.yaml

48ef6f2

funky-eyes merged commit 864348a into apache:2.x Jul 31, 2024
5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bugfix: undolog rollback info more than 64MB #6483

bugfix: undolog rollback info more than 64MB #6483

jsbxyyx commented Apr 17, 2024

codecov bot commented Jul 10, 2024 •

edited

Loading

funky-eyes Jul 10, 2024

funky-eyes Jul 10, 2024

jsbxyyx Jul 11, 2024

funky-eyes Jul 29, 2024

jsbxyyx Jul 30, 2024

funky-eyes Jul 31, 2024

funky-eyes left a comment

bugfix: undolog rollback info more than 64MB #6483

bugfix: undolog rollback info more than 64MB #6483

Conversation

jsbxyyx commented Apr 17, 2024

Ⅰ. 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 bot commented Jul 10, 2024 • edited Loading

Codecov Report

funky-eyes Jul 10, 2024

Choose a reason for hiding this comment

funky-eyes Jul 10, 2024

Choose a reason for hiding this comment

jsbxyyx Jul 11, 2024

Choose a reason for hiding this comment

funky-eyes Jul 29, 2024

Choose a reason for hiding this comment

jsbxyyx Jul 30, 2024

Choose a reason for hiding this comment

funky-eyes Jul 31, 2024

Choose a reason for hiding this comment

funky-eyes left a comment

Choose a reason for hiding this comment

codecov bot commented Jul 10, 2024 •

edited

Loading