Check cache before executing a request

Author: emmanuel-keller

src/main/java/com/qwazr/jdbc/cache/CachedPreparedStatement.java

@@ -206,10 +206,12 @@ public void setObject(int parameterIndex, Object x) throws SQLException {
 
     @Override
     public boolean execute() throws SQLException {
+        if (connection.resultSetCache.checkIfExists(ResultSetCache.getKey(executedSql, parameters)))
+            return true;
         if (backendStatement != null)
             return backendStatement.execute();
         else
-            return connection.resultSetCache.checkExists(ResultSetCache.getKey(executedSql, parameters));
+            throw new SQLException("No cache entry");
     }
 
     @Override

src/main/java/com/qwazr/jdbc/cache/CachedStatement.java

@@ -162,10 +162,12 @@ public void setCursorName(String name) throws SQLException {
     @Override
     public boolean execute(String sql) throws SQLException {
         this.executedSql = sql;
+        if (connection.resultSetCache.checkIfExists(ResultSetCache.getKey(executedSql)))
+            return true;
         if (backendStatement != null)
             return backendStatement.execute(sql);
         else
-            return connection.resultSetCache.checkExists(ResultSetCache.getKey(executedSql));
+            throw new SQLException("No cache entry");
     }
 
     @Override
@@ -306,28 +308,34 @@ public int executeUpdate(String sql, String[] columnNames) throws SQLException {
     @Override
     public boolean execute(String sql, int autoGeneratedKeys) throws SQLException {
         executedSql = sql;
+        if (connection.resultSetCache.checkIfExists(ResultSetCache.getKey(executedSql)))
+            return true;
         if (backendStatement != null)
             return backendStatement.execute(sql, autoGeneratedKeys);
         else
-            return connection.resultSetCache.checkExists(ResultSetCache.getKey(executedSql));
+            throw new SQLException("No cache entry");
     }
 
     @Override
     public boolean execute(String sql, int[] columnIndexes) throws SQLException {
         executedSql = sql;
+        if (connection.resultSetCache.checkIfExists(ResultSetCache.getKey(executedSql)))
+            return true;
         if (backendStatement != null)
             return backendStatement.execute(sql, columnIndexes);
         else
-            return connection.resultSetCache.checkExists(ResultSetCache.getKey(executedSql));
+            throw new SQLException("No cache entry");
     }
 
     @Override
     public boolean execute(String sql, String[] columnNames) throws SQLException {
         executedSql = sql;
+        if (connection.resultSetCache.checkIfExists(ResultSetCache.getKey(executedSql)))
+            return true;
         if (backendStatement != null)
             return backendStatement.execute(sql, columnNames);
         else
-            return connection.resultSetCache.checkExists(ResultSetCache.getKey(executedSql));
+            throw new SQLException("No cache entry");
     }
 
     @Override

src/main/java/com/qwazr/jdbc/cache/ResultSetCache.java

@@ -68,17 +68,14 @@ final CachedResultSet get(final CachedStatement statement, final String key, fin
     }
 
     /**
-     * Check if an entry is available for this key. If not, an SQLException is thrown.
+     * Check if an entry is available for this key.
      *
      * @param key the computed key
-     * @return always true
-     * @throws SQLException
+     * @return always true if the cache entry exists
      */
-    final boolean checkExists(final String key) throws SQLException {
+    final boolean checkIfExists(final String key) {
         final Path resultSetPath = cacheDirectory.resolve(key);
-        if (!Files.exists(resultSetPath))
-            throw new SQLException("No cache available");
-        return true;
+        return Files.exists(resultSetPath);
     }
 
     interface Provider {