bugfix: fix undo_log id repeat

all/pom.xml

@@ -26,7 +26,6 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>seata-all</artifactId>
-
     <name>Seata All-in-one ${project.version}</name>
     <description>Seata is an easy-to-use, high-performance, java based, open source distributed transaction solution.</description>
 

rm-datasource/src/main/java/io/seata/rm/datasource/exec/BaseTransactionalExecutor.java

@@ -431,8 +431,11 @@ protected TableRecords buildTableRecords(Map<String, List<Object>> pkValuesMap)
         StringJoiner selectSQLJoin = new StringJoiner(", ", prefix.toString(), suffix.toString());
         List<String> insertColumns = recognizer.getInsertColumns();
         if (ONLY_CARE_UPDATE_COLUMNS && CollectionUtils.isNotEmpty(insertColumns)) {
+            for (String insertColumn : insertColumns) {
+                org.apache.commons.lang.StringUtils.replace(insertColumn, "`", "");
+            }
             Set<String> columns = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
-            columns.addAll(recognizer.getInsertColumns());
+            columns.addAll(insertColumns);
             columns.addAll(pkColumnNameList);
             for (String columnName : columns) {
                 selectSQLJoin.add(columnName);

rm-datasource/src/main/java/io/seata/rm/datasource/exec/MultiUpdateExecutor.java

@@ -89,6 +89,9 @@ protected TableRecords beforeImage() throws SQLException {
             }
 
             List<String> updateColumns = sqlUpdateRecognizer.getUpdateColumns();
+            for (String updateColumn : updateColumns) {
+                org.apache.commons.lang.StringUtils.replace(updateColumn, "`", "");
+            }
             updateColumnsSet.addAll(updateColumns);
             if (noWhereCondition) {
                 continue;
@@ -155,7 +158,11 @@ private String buildAfterImageSQL(TableMeta tableMeta, TableRecords beforeImage)
         for (SQLRecognizer recognizer : sqlRecognizers) {
             sqlRecognizer = recognizer;
             SQLUpdateRecognizer sqlUpdateRecognizer = (SQLUpdateRecognizer) sqlRecognizer;
-            updateColumnsSet.addAll(sqlUpdateRecognizer.getUpdateColumns());
+            List<String> updateColumns = sqlUpdateRecognizer.getUpdateColumns();
+            for (String updateColumn : updateColumns) {
+                org.apache.commons.lang.StringUtils.replace(updateColumn, "`", "");
+            }
+            updateColumnsSet.addAll(updateColumns);
         }
         StringBuilder prefix = new StringBuilder("SELECT ");
         String suffix = " FROM " + getFromTableInSQL() + " WHERE " + SqlGenerateUtils.buildWhereConditionByPKs(tableMeta.getPrimaryKeyOnlyName(), beforeImage.pkRows().size(), getDbType());

rm-datasource/src/main/java/io/seata/rm/datasource/exec/UpdateExecutor.java

@@ -91,6 +91,9 @@ private String buildBeforeImageSQL(TableMeta tableMeta, ArrayList<List<Object>>
         suffix.append(" FOR UPDATE");
         StringJoiner selectSQLJoin = new StringJoiner(", ", prefix.toString(), suffix.toString());
         if (ONLY_CARE_UPDATE_COLUMNS) {
+            for (String updateColumn : updateColumns) {
+                org.apache.commons.lang.StringUtils.replace(updateColumn, "`", "");
+            }
             if (!containsPK(updateColumns)) {
                 selectSQLJoin.add(getColumnNamesInSQL(tableMeta.getEscapePkNameList(getDbType())));
             }
@@ -137,6 +140,9 @@ private String buildAfterImageSQL(TableMeta tableMeta, TableRecords beforeImage)
         if (ONLY_CARE_UPDATE_COLUMNS) {
             SQLUpdateRecognizer recognizer = (SQLUpdateRecognizer) sqlRecognizer;
             List<String> updateColumns = recognizer.getUpdateColumns();
+            for (String updateColumn : updateColumns) {
+                org.apache.commons.lang.StringUtils.replace(updateColumn, "`", "");
+            }
             if (!containsPK(updateColumns)) {
                 selectSQLJoiner.add(getColumnNamesInSQL(tableMeta.getEscapePkNameList(getDbType())));
             }