Skip to content

optimize: validate that the primary key is free of illegal characters #6227

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

Merged
xingfudeshi merged 4 commits into from
Jan 2, 2024
Merged

optimize: validate that the primary key is free of illegal characters #6227

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb946d5
validate that the primary key is free of illegal characters
ggbocoder Dec 30, 2023
e1d2260
fix test
ggbocoder Dec 30, 2023
50c77dc
add signature
ggbocoder Jan 2, 2024
59e0b58
Merge branch '2.x' into issue_5136
ggbocoder Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions rm-datasource/src/main/java/io/seata/rm/datasource/exec/BaseTransactionalExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,17 @@ protected void prepareUndoLog(TableRecords beforeImage, TableRecords afterImage)
}
}

/**
* validate that the primary key is free of illegal characters
*
* @param pkVal primary key value
*/
protected void validPk(String pkVal) {
if (pkVal.contains(",")) {
throw new IllegalArgumentException(pkVal + " contains illegal character!");
}
}

/**
* build lockKey
*
Expand All @@ -406,7 +417,6 @@ protected String buildLockKey(TableRecords rowsIncludingPK) {
if (rowsIncludingPK.size() == 0) {
return null;
}

StringBuilder sb = new StringBuilder();
sb.append(rowsIncludingPK.getTableMeta().getTableName());
sb.append(":");
Expand All @@ -419,7 +429,9 @@ protected String buildLockKey(TableRecords rowsIncludingPK) {
if (pkSplitIndex > 0) {
sb.append("_");
}
sb.append(rowMap.get(pkName).getValue());
Object pkVal = rowMap.get(pkName).getValue();
validPk(String.valueOf(pkVal));
sb.append(pkVal);
pkSplitIndex++;
}
rowSequence++;
Expand Down