You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by az...@apache.org on 2024/02/01 05:25:56 UTC
(shardingsphere) branch master updated: Read underlying value of BLOB and CLOB (#29938)
This is an automated email from the ASF dual-hosted git repository.
azexin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new d8e99b252e3 Read underlying value of BLOB and CLOB (#29938)
d8e99b252e3 is described below
commit d8e99b252e357575e50c62d63f019bd1ce78ba4b
Author: Hongsheng Zhong <zh...@apache.org>
AuthorDate: Thu Feb 1 13:25:49 2024 +0800
Read underlying value of BLOB and CLOB (#29938)
---
.../dumper/inventory/column/ColumnValueReaderEngine.java | 12 +++++++++---
.../e2e/data/pipeline/cases/task/E2EIncrementalTask.java | 7 ++++---
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/column/ColumnValueReaderEngine.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/column/ColumnValueReaderEngine.java
index 28138a08ae4..33efde4677f 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/column/ColumnValueReaderEngine.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/column/ColumnValueReaderEngine.java
@@ -20,6 +20,9 @@ package org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.col
import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
+import java.sql.Blob;
+import java.sql.Clob;
+import java.sql.NClob;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
@@ -111,11 +114,14 @@ public final class ColumnValueReaderEngine {
case Types.LONGVARBINARY:
return resultSet.getBytes(columnIndex);
case Types.CLOB:
- return resultSet.getClob(columnIndex);
+ Clob clob = resultSet.getClob(columnIndex);
+ return null == clob ? null : clob.getSubString(1L, (int) clob.length());
case Types.NCLOB:
- return resultSet.getNClob(columnIndex);
+ NClob nClob = resultSet.getNClob(columnIndex);
+ return null == nClob ? null : nClob.getSubString(1L, (int) nClob.length());
case Types.BLOB:
- return resultSet.getBlob(columnIndex);
+ Blob blob = resultSet.getBlob(columnIndex);
+ return null == blob ? null : blob.getBytes(1L, (int) blob.length());
case Types.ARRAY:
return resultSet.getArray(columnIndex);
default:
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/E2EIncrementalTask.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/E2EIncrementalTask.java
index 482bf4f3095..4df1082d18c 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/E2EIncrementalTask.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/E2EIncrementalTask.java
@@ -138,7 +138,8 @@ public final class E2EIncrementalTask extends BaseIncrementTask {
int randomUnsignedInt = random.nextInt(10, 100);
LocalDateTime now = LocalDateTime.now();
Object[] parameters = {"中文测试", randomInt, randomInt, randomInt, randomUnsignedInt, randomUnsignedInt, randomUnsignedInt,
- randomUnsignedInt, 1.0F, 1.0, new BigDecimal("999"), now, now, now.toLocalDate(), now.toLocalTime(), Year.now().getValue() + 1, new byte[]{}, new byte[]{1, 2, -1, -3},
+ randomUnsignedInt, 1.0F, 1.0, new BigDecimal("999"), now, now, now.toLocalDate(), now.toLocalTime(), Year.now().getValue() + 1,
+ new byte[]{-1, 0, 1}, new byte[]{1, 2, -1, -3},
"D".getBytes(), "A".getBytes(), "T".getBytes(), "E", "text", "mediumText", "3", "3", PipelineCaseHelper.generateJsonString(32, true), orderId};
log.info("update sql: {}, params: {}", sql, parameters);
DataSourceExecuteUtils.execute(dataSource, sql, parameters);
@@ -146,7 +147,7 @@ public final class E2EIncrementalTask extends BaseIncrementTask {
}
if (databaseType instanceof PostgreSQLDatabaseType) {
String sql = SQLBuilderUtils.buildUpdateSQL(ignoreShardingColumns(POSTGRESQL_COLUMN_NAMES), orderTableName, "?");
- Object[] parameters = {"中文测试", randomInt, BigDecimal.valueOf(10000), random.nextBoolean(), new byte[]{}, "char", "varchar", PipelineCaseHelper.generateFloat(),
+ Object[] parameters = {"中文测试", randomInt, BigDecimal.valueOf(10000), random.nextBoolean(), new byte[]{-1, 0, 1}, "char", "varchar", PipelineCaseHelper.generateFloat(),
PipelineCaseHelper.generateDouble(), PipelineCaseHelper.generateJsonString(10, true), PipelineCaseHelper.generateJsonString(20, true), "text-update", LocalDate.now(),
LocalTime.now(), Timestamp.valueOf(LocalDateTime.now()), OffsetDateTime.now(), orderId};
log.info("update sql: {}, params: {}", sql, parameters);
@@ -157,7 +158,7 @@ public final class E2EIncrementalTask extends BaseIncrementTask {
LocalDateTime now = LocalDateTime.now();
String sql = SQLBuilderUtils.buildUpdateSQL(ignoreShardingColumns(OPENGAUSS_COLUMN_NAMES), orderTableName, "?");
Object[] parameters = {"中文测试", randomInt, random.nextInt(-999, 999), PipelineCaseHelper.generateFloat(), PipelineCaseHelper.generateDouble(), BigDecimal.valueOf(10000),
- random.nextBoolean(), "update-char", "update-text", new byte[]{0, 0, 1}, new byte[]{1, 0}, now.toLocalDate().plusDays(1), now.toLocalTime().plusHours(6), "2023-03-01", now,
+ random.nextBoolean(), "update-char", "update-text", new byte[]{-1, 0, 1}, new byte[]{1, 0}, now.toLocalDate().plusDays(1), now.toLocalTime().plusHours(6), "2023-03-01", now,
OffsetDateTime.now(), "1 years 1 mons 1 days 1 hours 1 mins 1 secs", "{4, 5, 6}", PipelineCaseHelper.generateJsonString(1, true), PipelineCaseHelper.generateJsonString(1, false),
UUID.fromString("00000000-000-0000-0000-000000000001").toString(), DigestUtils.md5Hex(now.toString()), "aaa", "bbb", "1111", "[1,10000)", "[2020-01-02,2021-01-01)",
"[2020-01-01 00:00:00,2021-01-01 00:00:00)", "2 years 2 mons 2 days 06:00:00", "2023-01-01 00:00:00+00", "(2.0,2.0)", "[(0.0,0.0),(3.0,3.0)]", "(1.0,1.0),(3.0,3.0)",