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

Re-introduce Retry logic for prepared statement caching #618

Merged
merged 13 commits into from
Feb 15, 2018
Merged

Re-introduce Retry logic for prepared statement caching #618

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a6eee22
change back to retryLogic and change the default of prepared statemen…
AfsanehR-zz Jan 29, 2018
69edc7b
check if statementPooling is enabled for all retry logics
AfsanehR-zz Jan 30, 2018
b8e9ff9
add the setter and getter methods for disableStatementPooling property
AfsanehR-zz Jan 31, 2018
af76bfc
move same code in a function.
AfsanehR-zz Jan 31, 2018
fee85b2
Merge branch 'dev' of https://github.com/Microsoft/mssql-jdbc into re…
AfsanehR-zz Jan 31, 2018
a237ebe
prepare cache in setDisableStatementPooling()
AfsanehR-zz Jan 31, 2018
63ab78f
a small fix
AfsanehR-zz Jan 31, 2018
dbefa1c
fixed the double insertion issue with retry
AfsanehR-zz Jan 31, 2018
870e853
fixed some review comments and updated test to use raiseError
AfsanehR-zz Feb 1, 2018
f523ca9
added a fix with connection property
AfsanehR-zz Feb 1, 2018
6ed48e2
added unit Tests
AfsanehR-zz Feb 1, 2018
e221b32
Revert back needsPrepare check in retryBasedOnFailedReuseOfCachedHandle
cheenamalhotra Feb 14, 2018
9ae0843
Remove unwanted method parameter
cheenamalhotra Feb 14, 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
9 changes: 5 additions & 4 deletions src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ final void doExecutePreparedStatement(PrepStmtExecCmd command) throws SQLServerE
getNextResult();
}
catch (SQLException e) {
if (retryBasedOnFailedReuseOfCachedHandle(e, attempt))
if (retryBasedOnFailedReuseOfCachedHandle(e, attempt) && connection.isStatementPoolingEnabled())
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggest changing retryBasedOnFailedReuseOfCachedHandle to take care of the connection.IsStatementPoolingEnabled() checking, that is part of whether or not to reuse.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done.

continue;
else
throw e;
Expand Down Expand Up @@ -2690,7 +2690,7 @@ final void doExecutePreparedStatementBatch(PrepStmtBatchExecCmd batchCommand) th
throw e;

// Retry if invalid handle exception.
if (retryBasedOnFailedReuseOfCachedHandle(e, attempt)) {
if (retryBasedOnFailedReuseOfCachedHandle(e, attempt) && connection.isStatementPoolingEnabled()) {
// reset number of batches prepare
numBatchesPrepared = numBatchesExecuted;
retry = true;
Expand All @@ -2701,7 +2701,8 @@ final void doExecutePreparedStatementBatch(PrepStmtBatchExecCmd batchCommand) th
// so just record the failure for the particular batch item.
updateCount = Statement.EXECUTE_FAILED;
if (null == batchCommand.batchException)
batchCommand.batchException = e;
batchCommand.batchException = e;

}

// In batch execution, we have a special update count
Expand All @@ -2720,7 +2721,7 @@ final void doExecutePreparedStatementBatch(PrepStmtBatchExecCmd batchCommand) th
}
}
catch (SQLException e) {
if (retryBasedOnFailedReuseOfCachedHandle(e, attempt)) {
if (retryBasedOnFailedReuseOfCachedHandle(e, attempt) && connection.isStatementPoolingEnabled()) {
// Reset number of batches prepared.
numBatchesPrepared = numBatchesExecuted;
continue;
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,7 @@ private void doExecuteStatementBatch(StmtBatchExecCmd execCmd) throws SQLServerE
tdsWriter.writeString(batchIter.next());
while (batchIter.hasNext()) {
tdsWriter.writeString(" ; ");
tdsWriter.writeString(batchIter.next());
}

// Start the response
Expand Down