Skip to content

Fix getGeneratedKeys when no insert during batch upsert #4136

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
sougou merged 4 commits into from
Sep 1, 2018
Merged

Fix getGeneratedKeys when no insert during batch upsert #4136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
125c9fe
Exclude insertId 0 from batchUpsert generatedKeys
Aug 15, 2018
b195f30
Add test case for upsert insertId 0 fix
Aug 15, 2018
76f9c60
Reuse local insertId
Aug 15, 2018
8ff0d4b
Paren around boolean statement for clarity
Aug 27, 2018
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
15 changes: 9 additions & 6 deletions java/jdbc/src/main/java/io/vitess/jdbc/VitessStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ protected void checkSQLNullOrEmpty(String sql) throws SQLException {
protected int[] generateBatchUpdateResult(List<CursorWithError> cursorWithErrorList, List<String> batchedArgs)
throws BatchUpdateException {
int[] updateCounts = new int[cursorWithErrorList.size()];
long[][] generatedKeys = new long[cursorWithErrorList.size()][2];
ArrayList<long[]> generatedKeys = new ArrayList<long[]>();

Vtrpc.RPCError rpcError = null;
String batchCommand = null;
Expand All @@ -603,35 +603,38 @@ protected int[] generateBatchUpdateResult(List<CursorWithError> cursorWithErrorL
try {
long rowsAffected = cursorWithError.getCursor().getRowsAffected();
int truncatedUpdateCount;
boolean queryBatchUpsert = false;
if (rowsAffected > Integer.MAX_VALUE) {
truncatedUpdateCount = Integer.MAX_VALUE;
} else {
if (sqlIsUpsert(batchCommand)) {
// mimicking mysql-connector-j here.
// but it would fail for: insert into t1 values ('a'), ('b') on duplicate key update ts = now();
truncatedUpdateCount = 1;
queryBatchUpsert = true;
} else {
truncatedUpdateCount = (int) rowsAffected;
}
}
updateCounts[i] = truncatedUpdateCount;
if (this.retrieveGeneratedKeys) {
generatedKeys[i] = new long[]{cursorWithError.getCursor().getInsertId(), truncatedUpdateCount};
long insertId = cursorWithError.getCursor().getInsertId();
if (this.retrieveGeneratedKeys && (!queryBatchUpsert || insertId > 0)) {
generatedKeys.add(new long[]{insertId, truncatedUpdateCount});
}
} catch (SQLException ex) {
/* This case should not happen as API has returned cursor and not error.
* Handling by Statement.SUCCESS_NO_INFO
*/
updateCounts[i] = Statement.SUCCESS_NO_INFO;
if (this.retrieveGeneratedKeys) {
generatedKeys[i] = new long[]{Statement.SUCCESS_NO_INFO, Statement.SUCCESS_NO_INFO};
generatedKeys.add(new long[]{Statement.SUCCESS_NO_INFO, Statement.SUCCESS_NO_INFO});
}
}
} else {
rpcError = cursorWithError.getError();
updateCounts[i] = Statement.EXECUTE_FAILED;
if (this.retrieveGeneratedKeys) {
generatedKeys[i] = new long[]{Statement.EXECUTE_FAILED, Statement.EXECUTE_FAILED};
generatedKeys.add(new long[]{Statement.EXECUTE_FAILED, Statement.EXECUTE_FAILED});
}
}
}
Expand All @@ -642,7 +645,7 @@ protected int[] generateBatchUpdateResult(List<CursorWithError> cursorWithErrorL
throw new BatchUpdateException(rpcError.toString(), sqlState, errno, updateCounts);
}
if (this.retrieveGeneratedKeys) {
this.batchGeneratedKeys = generatedKeys;
this.batchGeneratedKeys = generatedKeys.toArray(new long[generatedKeys.size()][2]);
}
return updateCounts;
}
Expand Down
10 changes: 10 additions & 0 deletions java/jdbc/src/test/java/io/vitess/jdbc/VitessStatementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,5 +742,15 @@ private void testExecute(int fetchSize, boolean simpleExecute, boolean shouldRun
Assert.assertEquals(i, 0); // we should only have one
i++;
}

VitessStatement noUpdate = new VitessStatement(mockConn);
PowerMockito.when(mockCursor.getInsertId()).thenReturn(0L);
PowerMockito.when(mockCursor.getRowsAffected()).thenReturn(1L);

noUpdate.addBatch(sqlUpsert);
noUpdate.executeBatch();

ResultSet empty = noUpdate.getGeneratedKeys();
Assert.assertFalse(empty.next());
}
}