Skip to content
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.

Sign up for GitHub

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

Jump to bottom

bugfix: error image when use null value as image query condition in insert on duplicate #5031

Merged
merged 7 commits into from Nov 13, 2022
Merged

bugfix: error image when use null value as image query condition in insert on duplicate #5031

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6128575
bugfix:error image fro use index null value in insert on duplicate ex…
renliangyu857 Oct 28, 2022
13db88f
resolve test failures
renliangyu857 Nov 1, 2022
8519e4e
Merge branch 'develop' into bugfix_errorimage_for_use_nulluniqueindex…
renliangyu857 Nov 2, 2022
0334794
resolve checkstyle
renliangyu857 Nov 5, 2022
27d101e
Merge branch 'develop' into bugfix_errorimage_for_use_nulluniqueindex…
renliangyu857 Nov 10, 2022
371baad
resolve test fail
renliangyu857 Nov 13, 2022
78ade4e
register pr
renliangyu857 Nov 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 15 additions & 10 deletions ...src/main/java/io/seata/rm/datasource/exec/mysql/MySQLInsertOnDuplicateUpdateExecutor.java
View file
Open in desktop
Expand Up @@ -46,6 +46,7 @@
import io.seata.rm.datasource.sql.struct.Row;
import io.seata.rm.datasource.sql.struct.TableMeta;
import io.seata.rm.datasource.sql.struct.TableRecords;
import io.seata.rm.datasource.sql.struct.IndexMeta;
import io.seata.rm.datasource.undo.SQLUndoLog;
import io.seata.sqlparser.SQLInsertRecognizer;
import io.seata.sqlparser.SQLRecognizer;
Expand Down Expand Up @@ -306,7 +307,7 @@ public String buildImageSQL(TableMeta tableMeta) {
int finalI = i;
List<Object> paramAppenderTempList = new ArrayList<>();
tableMeta.getAllIndexes().forEach((k, v) -> {
if (!v.isNonUnique()) {
if (!v.isNonUnique() && isIndexValueNotNull(v,imageParameterMap,finalI)) {
boolean columnIsNull = true;
List<String> uniqueList = new ArrayList<>();
for (ColumnMeta m : v.getValues()) {
Expand All @@ -320,15 +321,6 @@ public String buildImageSQL(TableMeta tableMeta) {
columnIsNull = false;
continue;
}
if ((imageParameters == null && m.getColumnDef() == null) || imageParameters.get(finalI) == null || imageParameters.get(finalI) instanceof Null) {
if (!"PRIMARY".equalsIgnoreCase(k)) {
columnIsNull = false;
uniqueList.add(columnName + " is ? ");
paramAppenderTempList.add("NULL");
continue;
}
break;
}
if ("PRIMARY".equalsIgnoreCase(k)) {
primaryKeysInBeforeImageSql.add(columnName);
}
Expand Down Expand Up @@ -405,4 +397,17 @@ public Map<String, ArrayList<Object>> buildImageParameters(SQLInsertRecognizer r
return imageParameterMap;
}

private boolean isIndexValueNotNull(IndexMeta indexMeta, Map<String, ArrayList<Object>> imageParameterMap,int rowIndex) {
for (ColumnMeta columnMeta : indexMeta.getValues()) {
String columnName = columnMeta.getColumnName();
List<Object> imageParameters = imageParameterMap.get(columnName);
if (imageParameters == null && columnMeta.getColumnDef() == null) {
return false;
} else if (imageParameters != null && (imageParameters.get(rowIndex) == null || imageParameters.get(rowIndex) instanceof Null)) {
return false;
}
}
return true;
}

}