reactor: 优化对clob的支持

zhou-hao · zhou-hao · commit dc94671e4557 · 2025-10-23T14:51:21.000+08:00
diff --git a/hsweb-easy-orm-core/src/main/java/org/hswebframework/ezorm/core/ValueCodec.java b/hsweb-easy-orm-core/src/main/java/org/hswebframework/ezorm/core/ValueCodec.java
@@ -1,5 +1,7 @@
 package org.hswebframework.ezorm.core;
 
+import org.hswebframework.ezorm.core.meta.ColumnMetadata;
+
 public interface ValueCodec<E, D> extends Encoder<E>, Decoder<D> {
 
     default E encodeNull(){
@@ -9,4 +11,12 @@ default E encodeNull(){
     E encode(Object value);
 
     D decode(Object data);
+
+    default E encode(Object value, ColumnMetadata column){
+        return encode(value);
+    }
+
+    default D decode(Object value, ColumnMetadata column){
+        return decode(value);
+    }
 }
diff --git a/hsweb-easy-orm-core/src/main/java/org/hswebframework/ezorm/core/meta/AbstractColumnMetadata.java b/hsweb-easy-orm-core/src/main/java/org/hswebframework/ezorm/core/meta/AbstractColumnMetadata.java
@@ -46,7 +46,7 @@ public Object decode(Object data) {
             return null;
         }
         if (valueCodec != null) {
-            data = valueCodec.decode(data);
+            data = valueCodec.decode(data, this);
         }
         if (dictionaryCodec != null) {
             data = dictionaryCodec.decode(data);
@@ -63,7 +63,7 @@ public Object encode(Object data) {
             return null;
         }
         if (valueCodec != null) {
-            data = valueCodec.encode(data);
+            data = valueCodec.encode(data, this);
         }
         if (dictionaryCodec != null) {
             data = dictionaryCodec.encode(data);
diff --git a/hsweb-easy-orm-rdb/pom.xml b/hsweb-easy-orm-rdb/pom.xml
@@ -125,7 +125,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.3.9</version>
+            <version>42.7.8</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/codec/ClobValue.java b/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/codec/ClobValue.java
@@ -0,0 +1,64 @@
+package org.hswebframework.ezorm.rdb.codec;
+
+import org.reactivestreams.Publisher;
+import reactor.util.annotation.NonNull;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.util.stream.IntStream;
+
+public class ClobValue implements CharSequence {
+
+    private final CharSequence charSequence;
+
+    public ClobValue(CharSequence charSequence) {
+        this.charSequence = charSequence;
+    }
+
+    public CharSequence source() {
+        return charSequence;
+    }
+
+    public Reader reader() {
+        return new StringReader(String.valueOf(charSequence));
+    }
+
+    @Override
+    public String toString() {
+        return charSequence.toString();
+    }
+
+    @Override
+    public int length() {
+        return charSequence.length();
+    }
+
+    @Override
+    public char charAt(int index) {
+        return charSequence.charAt(index);
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return charSequence.isEmpty();
+    }
+
+    @Override
+    @NonNull
+    public CharSequence subSequence(int start, int end) {
+        return charSequence.subSequence(start, end);
+    }
+
+    @Override
+    @NonNull
+    public IntStream chars() {
+        return charSequence.chars();
+    }
+
+    @Override
+    @NonNull
+    public IntStream codePoints() {
+        return charSequence.codePoints();
+    }
+}
diff --git a/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/codec/ClobValueCodec.java b/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/codec/ClobValueCodec.java
@@ -4,24 +4,42 @@
 import io.netty.buffer.ByteBuf;
 import lombok.SneakyThrows;
 import org.hswebframework.ezorm.core.ValueCodec;
+import org.hswebframework.ezorm.core.meta.ColumnMetadata;
+import org.hswebframework.ezorm.rdb.metadata.RDBColumnMetadata;
 import org.hswebframework.ezorm.rdb.utils.FeatureUtils;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.sql.Clob;
+import java.sql.JDBCType;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 public class ClobValueCodec implements ValueCodec {
 
     public static final ClobValueCodec INSTANCE = new ClobValueCodec();
 
+    @Override
+    public Object encode(Object value, ColumnMetadata column) {
+        Object val = this.encode(value);
+        if (val instanceof CharSequence cs && column instanceof RDBColumnMetadata col) {
+            if (col.getType().getSqlType() == JDBCType.LONGVARCHAR ||
+                col.getType().getSqlType() == JDBCType.LONGNVARCHAR ||
+                col.getType().getSqlType() == JDBCType.CLOB) {
+                return new ClobValue(cs);
+            }
+        }
+        return val;
+    }
+
     @Override
     @SneakyThrows
     public Object encode(Object value) {
-
+        if (value == null) {
+            return null;
+        }
         if (value instanceof Clob) {
             return value;
         }
diff --git a/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/codec/JsonValueCodec.java b/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/codec/JsonValueCodec.java
@@ -10,6 +10,8 @@
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.hswebframework.ezorm.core.ValueCodec;
+import org.hswebframework.ezorm.core.meta.ColumnMetadata;
+import org.hswebframework.ezorm.rdb.metadata.RDBColumnMetadata;
 import org.hswebframework.ezorm.rdb.utils.FeatureUtils;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
@@ -22,6 +24,7 @@
 import java.nio.ByteBuffer;
 import java.sql.Blob;
 import java.sql.Clob;
+import java.sql.JDBCType;
 import java.util.Collection;
 import java.util.Map;
 import java.util.TimeZone;
@@ -101,6 +104,20 @@ public JsonValueCodec(Class<?> targetType, JavaType type) {
         this.targetType = targetType;
     }
 
+    @Override
+    public Object encode(Object value, ColumnMetadata column) {
+        Object data = encode(value);
+        if (data instanceof CharSequence cs && column instanceof RDBColumnMetadata col) {
+            // clob 类型
+            if (col.getType().getSqlType() == JDBCType.LONGVARCHAR ||
+                col.getType().getSqlType() == JDBCType.LONGNVARCHAR ||
+                col.getType().getSqlType() == JDBCType.CLOB) {
+                return new ClobValue(cs);
+            }
+        }
+        return data;
+    }
+
     @Override
     @SneakyThrows
     public Object encode(Object value) {
@@ -145,7 +162,7 @@ public Object decode(Object data) {
             } else if (data instanceof ByteBuffer) {
                 return doRead(new ByteBufferBackedInputStream(((ByteBuffer) data)));
             } else if (FeatureUtils.r2dbcIsAlive()) {
-                Mono mono = null;
+                Mono<?> mono = null;
                 if (data instanceof io.r2dbc.spi.Clob) {
                     mono = Flux.from(((io.r2dbc.spi.Clob) data).stream())
                                .collect(Collectors.joining())
diff --git a/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/executor/jdbc/JdbcSqlExecutorHelper.java b/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/executor/jdbc/JdbcSqlExecutorHelper.java
@@ -1,9 +1,12 @@
 package org.hswebframework.ezorm.rdb.executor.jdbc;
 
 import lombok.SneakyThrows;
+import org.hswebframework.ezorm.rdb.codec.ClobValue;
 import org.hswebframework.ezorm.rdb.executor.NullValue;
 
+import javax.sql.rowset.serial.SerialClob;
 import java.io.ByteArrayInputStream;
+import java.io.CharArrayReader;
 import java.sql.*;
 import java.util.ArrayList;
 import java.util.Date;
@@ -39,9 +42,11 @@ protected static void preparedStatementParameter(PreparedStatement statement, Ob
                 statement.setNull(index++, ((NullValue) object).getDataType().getSqlType().getVendorTypeNumber());
             } else if (object instanceof Date) {
                 statement.setTimestamp(index++, new java.sql.Timestamp(((Date) object).getTime()));
-            } else if (object instanceof byte[]) {
-                statement.setBlob(index++, new ByteArrayInputStream((byte[]) object));
-            } else{
+            } else if (object instanceof byte[] b) {
+                statement.setBlob(index++, new ByteArrayInputStream(b));
+            } else if (object instanceof ClobValue cb) {
+                statement.setCharacterStream(index++, cb.reader());
+            } else {
                 statement.setObject(index++, object);
             }
 
diff --git a/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/executor/reactive/r2dbc/R2dbcReactiveSqlExecutor.java b/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/executor/reactive/r2dbc/R2dbcReactiveSqlExecutor.java
@@ -1,13 +1,11 @@
 package org.hswebframework.ezorm.rdb.executor.reactive.r2dbc;
 
-import io.r2dbc.spi.ColumnMetadata;
-import io.r2dbc.spi.Connection;
-import io.r2dbc.spi.Result;
-import io.r2dbc.spi.Statement;
+import io.r2dbc.spi.*;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.hswebframework.ezorm.core.CastUtil;
+import org.hswebframework.ezorm.rdb.codec.ClobValue;
 import org.hswebframework.ezorm.rdb.executor.BatchSqlRequest;
 import org.hswebframework.ezorm.rdb.executor.DefaultColumnWrapperContext;
 import org.hswebframework.ezorm.rdb.executor.NullValue;
@@ -256,6 +254,10 @@ protected Statement prepareStatement(Statement statement, SqlRequest request) {
             } else if (parameter instanceof NullValue) {
                 bindNull(statement, index, ((NullValue) parameter).getDataType().getJavaType());
             } else {
+                // convert clob
+                if (parameter instanceof ClobValue cb) {
+                    parameter = Clob.from(Mono.just(cb.source()));
+                }
                 bind(statement, index, parameter);
             }
             index++;
diff --git a/hsweb-easy-orm-rdb/src/test/java/org/hswebframework/ezorm/rdb/codec/R2dbcClobValueCodecTest.java b/hsweb-easy-orm-rdb/src/test/java/org/hswebframework/ezorm/rdb/codec/R2dbcClobValueCodecTest.java
@@ -6,7 +6,7 @@
 
 import static org.junit.Assert.*;
 
-public class ClobValueCodecTest {
+public class R2dbcClobValueCodecTest {
 
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public Object decode(Object data) {`
`46`	`46`	`return null;`
`47`	`47`	`}`
`48`	`48`	`if (valueCodec != null) {`
`49`		`- data = valueCodec.decode(data);`
	`49`	`+ data = valueCodec.decode(data, this);`
`50`	`50`	`}`
`51`	`51`	`if (dictionaryCodec != null) {`
`52`	`52`	`data = dictionaryCodec.decode(data);`
`@@ -63,7 +63,7 @@ public Object encode(Object data) {`
`63`	`63`	`return null;`
`64`	`64`	`}`
`65`	`65`	`if (valueCodec != null) {`
`66`		`- data = valueCodec.encode(data);`
	`66`	`+ data = valueCodec.encode(data, this);`
`67`	`67`	`}`
`68`	`68`	`if (dictionaryCodec != null) {`
`69`	`69`	`data = dictionaryCodec.encode(data);`