Merge pull request #522 from project-tsurugi/amend

eliminate the Blob/Clob data field when the setting value of the fiel…
project-tsurugi · Feb 6, 2025 · d140a44 · d140a44
2 parents d1710cf + abb7414
commit d140a44
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/modules/session/src/main/java/com/tsurugidb/tsubakuro/sql/impl/TransactionImpl.java b/modules/session/src/main/java/com/tsurugidb/tsubakuro/sql/impl/TransactionImpl.java
@@ -32,6 +32,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.tsurugidb.sql.proto.SqlCommon;
 import com.tsurugidb.sql.proto.SqlRequest;
 import com.tsurugidb.sql.proto.SqlResponse;
 import com.tsurugidb.tsubakuro.common.BlobInfo;
@@ -120,8 +121,7 @@ public FutureResponse<ExecuteResult> executeStatement(
             .setPreparedStatementHandle(((PreparedStatementImpl) statement).getHandle());
         var lobs = new LinkedList<BlobInfo>();
         for (SqlRequest.Parameter e : parameters) {
-            pb.addParameters(e);
-            addLob(e, lobs);
+            pb.addParameters(addLob(e, lobs));
         }
         if (lobs.isEmpty()) {
             return service.send(pb.build());
@@ -144,8 +144,7 @@ public FutureResponse<ResultSet> executeQuery(
         .setPreparedStatementHandle(((PreparedStatementImpl) statement).getHandle());
         var lobs = new LinkedList<BlobInfo>();
         for (SqlRequest.Parameter e : parameters) {
-            pb.addParameters(e);
-            addLob(e, lobs);
+            pb.addParameters(addLob(e, lobs));
         }
         if (lobs.isEmpty()) {
             return service.send(pb.build());
@@ -154,7 +153,7 @@ public FutureResponse<ResultSet> executeQuery(
         }
     }
 
-    private void addLob(SqlRequest.Parameter e, LinkedList<BlobInfo> lobs) {
+    private SqlRequest.Parameter addLob(SqlRequest.Parameter e, LinkedList<BlobInfo> lobs) {
         if (e.getValueCase() == SqlRequest.Parameter.ValueCase.CLOB) {
             var v = e.getClob();
             switch (v.getDataCase()) {
@@ -166,6 +165,11 @@ private void addLob(SqlRequest.Parameter e, LinkedList<BlobInfo> lobs) {
                 default:
                     throw new UnsupportedOperationException();
             }
+            return SqlRequest.Parameter.newBuilder()
+                    .setClob(SqlCommon.Clob.newBuilder()
+                            .setChannelName(v.getChannelName())
+                            .build())
+                    .build();
         }
         if (e.getValueCase() == SqlRequest.Parameter.ValueCase.BLOB) {
             var v = e.getBlob();
@@ -178,7 +182,13 @@ private void addLob(SqlRequest.Parameter e, LinkedList<BlobInfo> lobs) {
                 default:
                     throw new UnsupportedOperationException();
             }
+            return SqlRequest.Parameter.newBuilder()
+                    .setBlob(SqlCommon.Blob.newBuilder()
+                            .setChannelName(v.getChannelName())
+                            .build())
+                    .build();
         }
+        return e;
     }
 
     @Override