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: when use Statement.executeBatch() api can not generate after … #4838

Merged
merged 7 commits into from
Aug 6, 2022
Merged

bugfix: when use Statement.executeBatch() api can not generate after … #4838

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
01e9f5e
bugfix: when use Statement.executeBatch() api can not generate after …
a1104321118 Aug 3, 2022
ea2ee64
bugfix: when use Statement.executeBatch() api can not generate after …
a1104321118 Aug 3, 2022
ef9d986
bugfix: when use Statement.executeBatch() api can not generate after …
a1104321118 Aug 4, 2022
57d960d
bugfix: code format
a1104321118 Aug 4, 2022
40afdc4
bugfix: remove updateCount
a1104321118 Aug 4, 2022
8be84ca
bugfix: remove executeBatchApiUsed
a1104321118 Aug 4, 2022
99375e2
bugfix: fix test
a1104321118 Aug 4, 2022
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
8 changes: 6 additions & 2 deletions rm-datasource/src/main/java/io/seata/rm/datasource/exec/AbstractDMLBaseExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,18 @@ protected T executeAutoCommitFalse(Object[] args) throws Exception {
}
TableRecords beforeImage = beforeImage();
T result = statementCallback.execute(statementProxy.getTargetStatement(), args);
int updateCount = statementProxy.getUpdateCount();
if (updateCount > 0) {
if (needUndoLog()) {
TableRecords afterImage = afterImage(beforeImage);
prepareUndoLog(beforeImage, afterImage);
}
return result;
}

protected boolean needUndoLog() throws Exception {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SQLexception

int updateCount = statementProxy.getUpdateCount();
return updateCount > 0;
}

private boolean isMultiPk() {
if (null != sqlRecognizer) {
return getTableMeta().getPrimaryKeyOnlyName().size() > 1;
Expand Down
5 changes: 5 additions & 0 deletions rm-datasource/src/main/java/io/seata/rm/datasource/exec/mysql/MySQLInsertExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,11 @@ else if (containsColumns()) {
return pkValuesMap;
}

@Override
protected boolean needUndoLog() throws Exception {
return true;
}

/**
* the modify for test
*/
Expand Down