Caching - properly bypass the cache for queries that return non ResultSet objects

Author: QuChen88

wrapper/src/main/java/software/amazon/jdbc/plugin/cache/DataRemoteCachePlugin.java

@@ -252,6 +252,12 @@ public <T, E extends Exception> T execute(
       final JdbcCallable<T, E> jdbcMethodFunc,
       final Object[] jdbcMethodArgs)
       throws E {
+    if (resultClass != ResultSet.class) {
+      return jdbcMethodFunc.call();
+    }
+
+    incrCounter(totalQueryCounter);
+
     ResultSet result;
     boolean needToCache = false;
     final String sql = getQuery(jdbcMethodArgs);
@@ -273,8 +279,6 @@ public <T, E extends Exception> T execute(
       }
     }
 
-    incrCounter(totalQueryCounter);
-
     // Query result can be served from the cache if it has a configured TTL value, and it is
     // not executed in a transaction as a transaction typically need to return consistent results.
     if (!isInTransaction && (configuredQueryTtl != null)) {