fix(tgsql): Delay close of PreparedStatement

project-tsurugi · Jan 21, 2025 · f1e91cb · f1e91cb
1 parent 0ef2c95
commit f1e91cb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/...les/tgsql/core/src/main/java/com/tsurugidb/tgsql/core/executor/sql/BasicSqlProcessor.java b/...les/tgsql/core/src/main/java/com/tsurugidb/tgsql/core/executor/sql/BasicSqlProcessor.java
@@ -38,6 +38,7 @@
 import com.tsurugidb.tsubakuro.sql.StatementMetadata;
 import com.tsurugidb.tsubakuro.sql.TableMetadata;
 import com.tsurugidb.tsubakuro.sql.exception.TargetNotFoundException;
+import com.tsurugidb.tsubakuro.util.Owner;
 
 /**
  * A basic implementation of {@link SqlProcessor}.
@@ -190,12 +191,13 @@ public void rollbackTransaction() throws ServerException, IOException, Interrupt
         LOG.debug("start prepare: '{}'", statement);
         desireActive();
         var client = getSqlClient();
-        try (var prepared = client.prepare(statement).await()) {
+        try (var preparedOwner = Owner.of(client.prepare(statement).await())) {
+            var prepared = preparedOwner.get();
             var t = transaction.getTransaction();
             if (prepared.hasResultRecords()) {
                 LOG.debug("start query: '{}'", statement);
                 var result = t.executeQuery(prepared).await();
-                return new PreparedStatementResult(result);
+                return new PreparedStatementResult(result, preparedOwner.release());
             }
             LOG.debug("start execute: '{}'", statement);
             var result = t.executeStatement(prepared).await();

diff --git a/...sql/core/src/main/java/com/tsurugidb/tgsql/core/executor/sql/PreparedStatementResult.java b/...sql/core/src/main/java/com/tsurugidb/tgsql/core/executor/sql/PreparedStatementResult.java
@@ -19,21 +19,25 @@
 
 import com.tsurugidb.tsubakuro.exception.ServerException;
 import com.tsurugidb.tsubakuro.sql.ExecuteResult;
+import com.tsurugidb.tsubakuro.sql.PreparedStatement;
 import com.tsurugidb.tsubakuro.sql.ResultSet;
 
 public class PreparedStatementResult implements AutoCloseable {
 
     private final ResultSet resultSet;
     private final ExecuteResult executeResult;
+    private final PreparedStatement preparedStatement;
 
-    public PreparedStatementResult(ResultSet resultSet) {
+    public PreparedStatementResult(ResultSet resultSet, PreparedStatement preparedStatement) {
         this.resultSet = resultSet;
         this.executeResult = null;
+        this.preparedStatement = preparedStatement;
     }
 
     public PreparedStatementResult(ExecuteResult executeResult) {
         this.resultSet = null;
         this.executeResult = executeResult;
+        this.preparedStatement = null;
     }
 
     public ResultSet getResultSet() {
@@ -46,7 +50,7 @@ public ExecuteResult getExecuteResult() {
 
     @Override
     public void close() throws ServerException, IOException, InterruptedException {
-        try (resultSet) {
+        try (preparedStatement; resultSet) {
             // close only
         }
     }

diff --git a/...es/tgsql/core/src/test/java/com/tsurugidb/tgsql/core/executor/engine/BasicEngineTest.java b/...es/tgsql/core/src/test/java/com/tsurugidb/tgsql/core/executor/engine/BasicEngineTest.java
@@ -169,7 +169,7 @@ void empty_statement() throws Exception {
     }
 
     @Test
-    void generic_staement_wo_result() throws Exception {
+    void generic_statement_wo_result() throws Exception {
         var reached = new AtomicBoolean();
         MockSqlProcessor sql = new MockSqlProcessor(true) {
             @Override
@@ -195,7 +195,7 @@ public Map<CounterType, Long> getCounters() {
     }
 
     @Test
-    void generic_staement_w_result() throws Exception {
+    void generic_statement_w_result() throws Exception {
         var reachedExec = new AtomicBoolean();
         MockSqlProcessor sql = new MockSqlProcessor(true) {
             @Override
@@ -205,7 +205,7 @@ public PreparedStatementResult execute(String statement, Region region) {
                 }
                 assertEquals("SELECT * FROM T", statement);
                 var rs = Relation.of(new Object[][] { { 1 } }).getResultSet(new ResultSetMetadataAdapter(SqlResponse.ResultSetMetadata.newBuilder().addColumns(Types.column(int.class)).build()));
-                return new PreparedStatementResult(rs);
+                return new PreparedStatementResult(rs, null);
             }
         };
         var reachedRs = new AtomicBoolean();
@@ -231,7 +231,7 @@ public long process(ResultSet target) throws ServerException, IOException, Inter
     }
 
     @Test
-    void call_staement_fall_through() throws Exception {
+    void call_statement_fall_through() throws Exception {
         var reached = new AtomicBoolean();
         MockSqlProcessor sql = new MockSqlProcessor(true) {
             @Override
@@ -257,7 +257,7 @@ public Map<CounterType, Long> getCounters() {
     }
 
     @Test
-    void generic_staement_inactive_tx() throws Exception {
+    void generic_statement_inactive_tx() throws Exception {
         MockSqlProcessor sql = new MockSqlProcessor(false);
         MockResultProcessor rs = new MockResultProcessor();
         var engine = newBasicEngine(sql, rs);