bugfix: fix could not rollback when insert the table with multiple key #6077
Conversation
This file contains hidden or 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
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## 2.x #6077 +/- ##
============================================
+ Coverage 49.29% 49.38% +0.09%
- Complexity 4800 4805 +5
============================================
Files 913 913
Lines 31677 31678 +1
Branches 3825 3826 +1
============================================
+ Hits 15614 15645 +31
+ Misses 14514 14487 -27
+ Partials 1549 1546 -3
|
funky-eyes
reviewed
Nov 23, 2023
rm-datasource/src/main/java/io/seata/rm/datasource/exec/BaseTransactionalExecutor.java
Outdated
Show resolved
Hide resolved
rm-datasource/src/main/java/io/seata/rm/datasource/exec/BaseTransactionalExecutor.java
Outdated
Show resolved
Hide resolved
funky-eyes
reviewed
Nov 23, 2023
rm-datasource/src/main/java/io/seata/rm/datasource/exec/BaseTransactionalExecutor.java
Outdated
Show resolved
Hide resolved
funky-eyes
reviewed
Nov 24, 2023
| * @param columnName the column name | ||
| * @return the column name in sql | ||
| */ | ||
| protected String getColumnNameInSQL(String columnName) { |
Contributor
There was a problem hiding this comment.
为什么要移动这段代码位置？而不是在它后面增加新方法？
Why move this piece of code instead of adding the new method after it?
Contributor
Author
There was a problem hiding this comment.
because reordering the type of method it looks more beautiful.
Contributor
There was a problem hiding this comment.
because reordering the type of method it looks more beautiful.
那为什么不是将getColumnNamesInSQLList 挪到上面?
So why not move getColumnNamesInSQLList to the top?
Contributor
Author
There was a problem hiding this comment.
3 method of getColumnNamesWithTablePrefix and 3 method of getColumnNameInSQL. I just put it together
funky-eyes
added
type: bug
funky-eyes
requested changes
Nov 26, 2023
rm-datasource/src/main/java/io/seata/rm/datasource/exec/BaseTransactionalExecutor.java
Outdated
Show resolved
Hide resolved
rm-datasource/src/main/java/io/seata/rm/datasource/exec/BaseTransactionalExecutor.java
Outdated
Show resolved
Hide resolved
funky-eyes
reviewed
Nov 27, 2023
| return limitCondition; | ||
| } | ||
|
|
||
| /** |
Contributor
There was a problem hiding this comment.
Suggested change
| /** | |
| /** | |
| * Gets column name in sql. | |
| * | |
| * @param columnName the column name | |
| * @return the column name in sql | |
| */ | |
| protected String getColumnNameInSQL(String columnName) { | |
| String tableAlias = sqlRecognizer.getTableAlias(); | |
| return tableAlias == null ? columnName : tableAlias + "." + columnName; | |
| } | |
| /** | |
| * Gets column names in sql. | |
| * | |
| * @param columnNames the column names | |
| * @return | |
| */ | |
| protected List<String> getColumnNamesInSQLList(List<String> columnNames) { | |
| List<String> columnNameWithTableAlias = new ArrayList<>(); | |
| for (String columnName : columnNames) { | |
| columnNameWithTableAlias.add(this.getColumnNameInSQL(columnName)); | |
| } | |
| return columnNameWithTableAlias; | |
| } | |
Comment on lines
+245
to
+257
| /** | ||
| * Gets column name in sql. | ||
| * | ||
| * @param columnName the column name | ||
| * @return the column name in sql | ||
| */ | ||
| protected String getColumnNameInSQL(String columnName) { | ||
| String tableAlias = sqlRecognizer.getTableAlias(); | ||
| return tableAlias == null ? columnName : tableAlias + "." + columnName; | ||
| } |
Contributor
There was a problem hiding this comment.
Suggested change
| /** | |
| * Gets column name in sql. | |
| * | |
| * @param columnName the column name | |
| * @return the column name in sql | |
| */ | |
| protected String getColumnNameInSQL(String columnName) { | |
| String tableAlias = sqlRecognizer.getTableAlias(); | |
| return tableAlias == null ? columnName : tableAlias + "." + columnName; | |
| } |
Comment on lines
+256
to
+272
| /** | ||
| * Gets column names in sql. | ||
| * | ||
| * @param columnNames the column names | ||
| * @return | ||
| */ | ||
| protected List<String> getColumnNamesInSQLList(List<String> columnNames) { | ||
| List<String> columnNameWithTableAlias = new ArrayList<>(); | ||
| for (String columnName : columnNames) { | ||
| columnNameWithTableAlias.add(this.getColumnNameInSQL(columnName)); | ||
| } | ||
| return columnNameWithTableAlias; | ||
| } | ||
|
|
Contributor
There was a problem hiding this comment.
Suggested change
| /** | |
| * Gets column names in sql. | |
| * | |
| * @param columnNames the column names | |
| * @return | |
| */ | |
| protected List<String> getColumnNamesInSQLList(List<String> columnNames) { | |
| List<String> columnNameWithTableAlias = new ArrayList<>(); | |
| for (String columnName : columnNames) { | |
| columnNameWithTableAlias.add(this.getColumnNameInSQL(columnName)); | |
| } | |
| return columnNameWithTableAlias; | |
| } |
l81893521
force-pushed
the
bugfix_repeated_insert_columns
branch
from
4e1d3c9 to
f00d469
Compare
funky-eyes
reviewed
Dec 4, 2023
rm-datasource/src/main/java/io/seata/rm/datasource/exec/BaseTransactionalExecutor.java
Outdated
Show resolved
Hide resolved
funky-eyes
reviewed
Dec 4, 2023
rm-datasource/src/test/java/io/seata/rm/datasource/exec/UpdateExecutorTest.java
Outdated
Show resolved
Hide resolved
rm-datasource/src/test/java/io/seata/rm/datasource/exec/UpdateExecutorTest.java
Outdated
Show resolved
Hide resolved
rm-datasource/src/test/java/io/seata/rm/datasource/exec/UpdateExecutorTest.java
Outdated
Show resolved
Hide resolved
rm-datasource/src/main/java/io/seata/rm/datasource/exec/BaseTransactionalExecutor.java
Outdated
Show resolved
Hide resolved
Co-authored-by: funkye <[email protected]>
…ExecutorTest.java Co-authored-by: funkye <[email protected]>
…ansactionalExecutor.java Co-authored-by: funkye <[email protected]>
…ExecutorTest.java Co-authored-by: funkye <[email protected]>
…ExecutorTest.java Co-authored-by: funkye <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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
Ⅱ. Does this pull request fix one issue?
fixes #6076
Ⅲ. Why don't you add test cases (unit test/integration test)?
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews