AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

HSQLDB PreparedStatement caching improvements

Browse Source
This commit is contained in:
catbref 2020-09-24 12:45:37 +01:00
parent d0da5d7c48
commit 21f48fba5f
2 changed files with 47 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/org/qortal/repository/hsqldb/HSQLDBRepository.java
View File

@ -446,10 +446,21 @@ public class HSQLDBRepository implements Repository {
*
* See org.hsqldb.StatementManager for more details.
*/
if (!this.preparedStatementCache.containsKey(sql))
this.preparedStatementCache.put(sql, this.connection.prepareStatement(sql));
PreparedStatement preparedStatement = this.preparedStatementCache.get(sql);
if (preparedStatement == null || preparedStatement.isClosed()) {
if (preparedStatement != null)
// This shouldn't occur, so log, but recompile
LOGGER.debug(() -> String.format("Recompiling closed PreparedStatement: %s", sql));
return this.connection.prepareStatement(sql);
preparedStatement = this.connection.prepareStatement(sql);
this.preparedStatementCache.put(sql, preparedStatement);
} else {
// Clean up ready for reuse
preparedStatement.clearBatch();
preparedStatement.clearParameters();
}
return preparedStatement;
}
/**
@ -465,9 +476,8 @@ public class HSQLDBRepository implements Repository {
public ResultSet checkedExecute(String sql, Object... objects) throws SQLException {
PreparedStatement preparedStatement = this.prepareStatement(sql);
// Close the PreparedStatement when the ResultSet is closed otherwise there's a potential resource leak.
// We can't use try-with-resources here as closing the PreparedStatement on return would also prematurely close the ResultSet.
preparedStatement.closeOnCompletion();
// We don't close the PreparedStatement when the ResultSet is closed because we cached PreparedStatements now.
// They are cleaned up when connection/session is closed.
long beforeQuery = this.slowQueryThreshold == null ? 0 : System.currentTimeMillis();
@ -556,7 +566,7 @@ public class HSQLDBRepository implements Repository {
if (batchedObjects == null || batchedObjects.isEmpty())
return 0;
try (PreparedStatement preparedStatement = this.prepareStatement(sql)) {
PreparedStatement preparedStatement = this.prepareStatement(sql);
for (Object[] objects : batchedObjects) {
this.bindStatementParams(preparedStatement, objects);
preparedStatement.addBatch();
@ -586,7 +596,6 @@ public class HSQLDBRepository implements Repository {
return totalCount;
}
}
/**
* Fetch last value of IDENTITY column after an INSERT statement.

4
src/main/java/org/qortal/repository/hsqldb/HSQLDBSaver.java
View File

@ -60,7 +60,9 @@ public class HSQLDBSaver {
*/
public boolean execute(HSQLDBRepository repository) throws SQLException {
String sql = this.formatInsertWithPlaceholders();
try (PreparedStatement preparedStatement = repository.prepareStatement(sql)) {
try {
PreparedStatement preparedStatement = repository.prepareStatement(sql);
this.bindValues(preparedStatement);
return preparedStatement.execute();