JDBC: Use PreparedStatement (#1802)

Author: singhpk234

persistence/relational-jdbc/build.gradle.kts

@@ -34,6 +34,7 @@ dependencies {
   compileOnly(libs.jakarta.inject.api)
 
   implementation(libs.smallrye.common.annotation) // @Identifier
+  implementation(libs.postgresql)
 
   testImplementation(libs.mockito.junit.jupiter)
   testImplementation(libs.h2)

persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/DatasourceOperations.java

@@ -26,6 +26,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.sql.Connection;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
@@ -54,15 +55,23 @@ public class DatasourceOperations {
 
   private final DataSource datasource;
   private final RelationalJdbcConfiguration relationalJdbcConfiguration;
+  private final DatabaseType databaseType;
 
   private final Random random = new Random();
 
   public DatasourceOperations(
-      DataSource datasource, RelationalJdbcConfiguration relationalJdbcConfiguration) {
+      DataSource datasource,
+      DatabaseType databaseType,
+      RelationalJdbcConfiguration relationalJdbcConfiguration) {
     this.datasource = datasource;
+    this.databaseType = databaseType;
     this.relationalJdbcConfiguration = relationalJdbcConfiguration;
   }
 
+  public DatabaseType getDatabaseType() {
+    return databaseType;
+  }
+
   /**
    * Execute SQL script
    *
@@ -116,7 +125,8 @@ public void executeScript(String scriptFilePath) throws SQLException {
    * @param <T> : Business entity class
    * @throws SQLException : Exception during the query execution.
    */
-  public <T> List<T> executeSelect(@Nonnull String query, @Nonnull Converter<T> converterInstance)
+  public <T> List<T> executeSelect(
+      @Nonnull QueryGenerator.PreparedQuery query, @Nonnull Converter<T> converterInstance)
       throws SQLException {
     ArrayList<T> results = new ArrayList<>();
     executeSelectOverStream(query, converterInstance, stream -> stream.forEach(results::add));
@@ -134,38 +144,47 @@ public <T> List<T> executeSelect(@Nonnull String query, @Nonnull Converter<T> co
    * @throws SQLException : Exception during the query execution.
    */
   public <T> void executeSelectOverStream(
-      @Nonnull String query,
+      @Nonnull QueryGenerator.PreparedQuery query,
       @Nonnull Converter<T> converterInstance,
       @Nonnull Consumer<Stream<T>> consumer)
       throws SQLException {
     withRetries(
         () -> {
           try (Connection connection = borrowConnection();
-              Statement statement = connection.createStatement();
-              ResultSet resultSet = statement.executeQuery(query)) {
-            ResultSetIterator<T> iterator = new ResultSetIterator<>(resultSet, converterInstance);
-            consumer.accept(iterator.toStream());
-            return null;
+              PreparedStatement statement = connection.prepareStatement(query.sql())) {
+            List<Object> params = query.parameters();
+            for (int i = 0; i < params.size(); i++) {
+              statement.setObject(i + 1, params.get(i));
+            }
+            try (ResultSet resultSet = statement.executeQuery()) {
+              ResultSetIterator<T> iterator = new ResultSetIterator<>(resultSet, converterInstance);
+              consumer.accept(iterator.toStream());
+              return null;
+            }
           }
         });
   }
 
   /**
    * Executes the UPDATE or INSERT Query
    *
-   * @param query : query to be executed
+   * @param preparedQuery : query to be executed
    * @return : Number of rows modified / inserted.
    * @throws SQLException : Exception during Query Execution.
    */
-  public int executeUpdate(String query) throws SQLException {
+  public int executeUpdate(QueryGenerator.PreparedQuery preparedQuery) throws SQLException {
     return withRetries(
         () -> {
           try (Connection connection = borrowConnection();
-              Statement statement = connection.createStatement()) {
+              PreparedStatement statement = connection.prepareStatement(preparedQuery.sql())) {
+            List<Object> params = preparedQuery.parameters();
+            for (int i = 0; i < params.size(); i++) {
+              statement.setObject(i + 1, params.get(i));
+            }
             boolean autoCommit = connection.getAutoCommit();
             connection.setAutoCommit(true);
             try {
-              return statement.executeUpdate(query);
+              return statement.executeUpdate();
             } finally {
               connection.setAutoCommit(autoCommit);
             }
@@ -188,9 +207,7 @@ public void runWithinTransaction(TransactionCallback callback) throws SQLExcepti
             connection.setAutoCommit(false);
             try {
               try {
-                try (Statement statement = connection.createStatement()) {
-                  success = callback.execute(statement);
-                }
+                success = callback.execute(connection);
               } finally {
                 if (success) {
                   connection.commit();
@@ -206,6 +223,17 @@ public void runWithinTransaction(TransactionCallback callback) throws SQLExcepti
         });
   }
 
+  public Integer execute(Connection connection, QueryGenerator.PreparedQuery preparedQuery)
+      throws SQLException {
+    try (PreparedStatement statement = connection.prepareStatement(preparedQuery.sql())) {
+      List<Object> params = preparedQuery.parameters();
+      for (int i = 0; i < params.size(); i++) {
+        statement.setObject(i + 1, params.get(i));
+      }
+      return statement.executeUpdate();
+    }
+  }
+
   private boolean isRetryable(SQLException e) {
     String sqlState = e.getSQLState();
 
@@ -291,7 +319,7 @@ public interface Operation<T> {
 
   // Interface for transaction callback
   public interface TransactionCallback {
-    boolean execute(Statement statement) throws SQLException;
+    boolean execute(Connection connection) throws SQLException;
   }
 
   public boolean isConstraintViolation(SQLException e) {