This is an automated email from the ASF dual-hosted git repository.
dybyte pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new dbead9b01f [Fix][Connector-V2][Zeta] Resolve Hive S3, JDBC, metrics,
and documentation CI failures (#11459)
dbead9b01f is described below
commit dbead9b01fc42ddc5a7f8699311ebf52dbb5d937
Author: zhiwei.niu <[email protected]>
AuthorDate: Mon Jul 20 16:05:07 2026 +0800
[Fix][Connector-V2][Zeta] Resolve Hive S3, JDBC, metrics, and documentation
CI failures (#11459)
---
docs/en/connectors/source/Jdbc.md | 6 +++---
docs/zh/connectors/source/Jdbc.md | 8 ++++----
.../connectors/seatunnel/hive/storage/S3StorageTest.java | 11 +++++------
.../jdbc/internal/converter/AbstractJdbcRowConverter.java | 9 ---------
.../engine/e2e/SplitClusterPendingJobLifecycleFailoverIT.java | 3 +++
.../exports/EngineStateStoreLogicalMetricExportsTest.java | 3 ---
6 files changed, 15 insertions(+), 25 deletions(-)
diff --git a/docs/en/connectors/source/Jdbc.md
b/docs/en/connectors/source/Jdbc.md
index b296186f6a..09bc807b0d 100644
--- a/docs/en/connectors/source/Jdbc.md
+++ b/docs/en/connectors/source/Jdbc.md
@@ -294,14 +294,14 @@ The following values are starting points. Confirm the
driver artifact, license,
| sqlserver | com.microsoft.sqlserver.jdbc.SQLServerDriver |
jdbc:sqlserver://localhost:1433 |
https://mvnrepository.com/artifact/com.microsoft.sqlserver/mssql-jdbc
|
| oracle | oracle.jdbc.OracleDriver |
jdbc:oracle:thin:@localhost:1521/xepdb1 |
https://mvnrepository.com/artifact/com.oracle.database.jdbc/ojdbc8
|
| sqlite | org.sqlite.JDBC |
jdbc:sqlite:test.db |
https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc
|
-| gbase8a | com.gbase.jdbc.Driver |
jdbc:gbase://localhost:5258/test |
https://cdn.gbase.cn/products/30/p5CiVwXBKQYIUGN8ecHvk/gbase-connector-java-9.5.0.7-build1-bin.jar
|
+| gbase8a | com.gbase.jdbc.Driver |
jdbc:gbase://localhost:5258/test |
https://cdn.gbase.cn/products/30/p5CiVwXBKQYIUGN8ecHvk/gbase-connector-java-9.5.0.7-build1-bin.jar
|
| starrocks | com.mysql.cj.jdbc.Driver |
jdbc:mysql://localhost:3306/test |
https://mvnrepository.com/artifact/mysql/mysql-connector-java
|
| db2 | com.ibm.db2.jcc.DB2Driver |
jdbc:db2://localhost:50000/testdb |
https://mvnrepository.com/artifact/com.ibm.db2.jcc/db2jcc/db2jcc4
|
-| tablestore | com.alicloud.openservices.tablestore.jdbc.OTSDriver |
jdbc:ots:https://myinstance.cn-hangzhou.ots.aliyuncs.com/myinstance |
https://mvnrepository.com/artifact/com.aliyun.openservices/tablestore-jdbc
|
+| tablestore | com.alicloud.openservices.tablestore.jdbc.OTSDriver |
`jdbc:ots:https://<instance_name>.<region_id>.ots.aliyuncs.com/<instance_name>`
| https://mvnrepository.com/artifact/com.aliyun.openservices/tablestore-jdbc
|
| saphana | com.sap.db.jdbc.Driver |
jdbc:sap://localhost:39015 |
https://mvnrepository.com/artifact/com.sap.cloud.db.jdbc/ngdbc
|
| doris | com.mysql.cj.jdbc.Driver |
jdbc:mysql://localhost:3306/test |
https://mvnrepository.com/artifact/mysql/mysql-connector-java
|
| teradata | com.teradata.jdbc.TeraDriver |
jdbc:teradata://localhost/DBS_PORT=1025,DATABASE=test |
https://mvnrepository.com/artifact/com.teradata.jdbc/terajdbc
|
-| Snowflake | net.snowflake.client.jdbc.SnowflakeDriver |
jdbc:snowflake://<account_name>.snowflakecomputing.com |
https://mvnrepository.com/artifact/net.snowflake/snowflake-jdbc
|
+| Snowflake | net.snowflake.client.jdbc.SnowflakeDriver |
jdbc:snowflake://<account_name>.snowflakecomputing.com |
https://mvnrepository.com/artifact/net.snowflake/snowflake-jdbc
|
| Redshift | com.amazon.redshift.jdbc42.Driver |
jdbc:redshift://localhost:5439/testdb?defaultRowFetchSize=1000 |
https://mvnrepository.com/artifact/com.amazon.redshift/redshift-jdbc42
|
| Vertica | com.vertica.jdbc.Driver |
jdbc:vertica://localhost:5433 |
https://repo1.maven.org/maven2/com/vertica/jdbc/vertica-jdbc/12.0.3-0/vertica-jdbc-12.0.3-0.jar
|
| Kingbase | com.kingbase8.Driver |
jdbc:kingbase8://localhost:54321/db_test |
https://repo1.maven.org/maven2/cn/com/kingbase/kingbase8/8.6.0/kingbase8-8.6.0.jar
|
diff --git a/docs/zh/connectors/source/Jdbc.md
b/docs/zh/connectors/source/Jdbc.md
index 2e3d19c862..d8ad0bd229 100644
--- a/docs/zh/connectors/source/Jdbc.md
+++ b/docs/zh/connectors/source/Jdbc.md
@@ -285,7 +285,7 @@ SeaTunnel 为 `query` 推断主键时，会继承结果集第一列所属底层
下表仅作为起点。部署前应向数据库厂商确认驱动制品、许可证、数据库版本兼容性和 Java 版本兼容性。
| 数据源 | 驱动 | URL
| Maven
|
-|-------------|---------------------------------------------------|--------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------|
+|-------------|---------------------------------------------------|--------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------|
| mysql | com.mysql.cj.jdbc.Driver |
jdbc:mysql://localhost:3306/test |
https://mvnrepository.com/artifact/mysql/mysql-connector-java
|
| postgresql | org.postgresql.Driver |
jdbc:postgresql://localhost:5432/postgres |
https://mvnrepository.com/artifact/org.postgresql/postgresql
|
| dm | dm.jdbc.driver.DmDriver |
jdbc:dm://localhost:5236 |
https://mvnrepository.com/artifact/com.dameng/DmJdbcDriver18
|
@@ -296,11 +296,11 @@ SeaTunnel 为 `query` 推断主键时，会继承结果集第一列所属底层
| gbase8a | com.gbase.jdbc.Driver |
jdbc:gbase://localhost:5258/test |
https://cdn.gbase.cn/products/30/p5CiVwXBKQYIUGN8ecHvk/gbase-connector-java-9.5.0.7-build1-bin.jar
|
| starrocks | com.mysql.cj.jdbc.Driver |
jdbc:mysql://localhost:3306/test |
https://mvnrepository.com/artifact/mysql/mysql-connector-java
|
| db2 | com.ibm.db2.jcc.DB2Driver |
jdbc:db2://localhost:50000/testdb |
https://mvnrepository.com/artifact/com.ibm.db2.jcc/db2jcc/db2jcc4
|
-| tablestore | com.alicloud.openservices.tablestore.jdbc.OTSDriver |
jdbc:ots:https://myinstance.cn-hangzhou.ots.aliyuncs.com/myinstance |
https://mvnrepository.com/artifact/com.aliyun.openservices/tablestore-jdbc
|
+| tablestore | com.alicloud.openservices.tablestore.jdbc.OTSDriver |
`jdbc:ots:https://<instance_name>.<region_id>.ots.aliyuncs.com/<instance_name>`
| https://mvnrepository.com/artifact/com.aliyun.openservices/tablestore-jdbc
|
| saphana | com.sap.db.jdbc.Driver |
jdbc:sap://localhost:39015 |
https://mvnrepository.com/artifact/com.sap.cloud.db.jdbc/ngdbc
|
| doris | com.mysql.cj.jdbc.Driver |
jdbc:mysql://localhost:3306/test |
https://mvnrepository.com/artifact/mysql/mysql-connector-java
|
| teradata | com.teradata.jdbc.TeraDriver |
jdbc:teradata://localhost/DBS_PORT=1025,DATABASE=test |
https://mvnrepository.com/artifact/com.teradata.jdbc/terajdbc
|
-| Snowflake | net.snowflake.client.jdbc.SnowflakeDriver |
jdbc:snowflake://<account_name>.snowflakecomputing.com |
https://mvnrepository.com/artifact/net.snowflake/snowflake-jdbc
|
+| Snowflake | net.snowflake.client.jdbc.SnowflakeDriver |
jdbc:snowflake://<account_name>.snowflakecomputing.com |
https://mvnrepository.com/artifact/net.snowflake/snowflake-jdbc
|
| Redshift | com.amazon.redshift.jdbc42.Driver |
jdbc:redshift://localhost:5439/testdb?defaultRowFetchSize=1000 |
https://mvnrepository.com/artifact/com.amazon.redshift/redshift-jdbc42
|
| Vertica | com.vertica.jdbc.Driver |
jdbc:vertica://localhost:5433 |
https://repo1.maven.org/maven2/com/vertica/jdbc/vertica-jdbc/12.0.3-0/vertica-jdbc-12.0.3-0.jar
|
| kingbase | com.kingbase8.Driver |
jdbc:kingbase8://localhost:54321/db_test |
https://repo1.maven.org/maven2/cn/com/kingbase/kingbase8/8.6.0/kingbase8-8.6.0.jar
|
@@ -310,7 +310,7 @@ SeaTunnel 为 `query` 推断主键时，会继承结果集第一列所属底层
| InterSystems IRIS | com.intersystems.jdbc.IRISDriver |
jdbc:IRIS://localhost:1972/%SYS |
https://raw.githubusercontent.com/intersystems-community/iris-driver-distribution/main/JDBC/JDK18/intersystems-jdbc-3.8.4.jar
|
| opengauss | org.opengauss.Driver |
jdbc:opengauss://localhost:5432/postgres |
https://repo1.maven.org/maven2/org/opengauss/opengauss-jdbc/5.1.0-og/opengauss-jdbc-5.1.0-og.jar
|
| Highgo | com.highgo.jdbc.Driver |
jdbc:highgo://localhost:5866/highgo |
https://repo1.maven.org/maven2/com/highgo/HgdbJdbc/6.2.3/HgdbJdbc-6.2.3.jar
|
-| Presto | com.facebook.presto.jdbc.PrestoDriver |
jdbc:presto://localhost:8080/presto |
https://repo1.maven.org/maven2/com/facebook/presto/presto-jdbc/0.279/presto-jdbc/0.279.jar
|
+| Presto | com.facebook.presto.jdbc.PrestoDriver |
jdbc:presto://localhost:8080/presto |
https://repo1.maven.org/maven2/com/facebook/presto/presto-jdbc/0.279/presto-jdbc-0.279.jar
|
| Trino | io.trino.jdbc.TrinoDriver |
jdbc:trino://localhost:8080/trino |
https://repo1.maven.org/maven2/io/trino/trino-jdbc/460/trino-jdbc-460.jar
|
| YashanDB | com.yashandb.jdbc.Driver |
jdbc:yasdb://localhost:1688/SYS |
https://mvnrepository.com/artifact/com.yashandb/yashandb-jdbc
|
diff --git
a/seatunnel-connectors-v2/connector-hive/src/test/java/org/apache/seatunnel/connectors/seatunnel/hive/storage/S3StorageTest.java
b/seatunnel-connectors-v2/connector-hive/src/test/java/org/apache/seatunnel/connectors/seatunnel/hive/storage/S3StorageTest.java
index 9660eb8b43..efad7a45a7 100644
---
a/seatunnel-connectors-v2/connector-hive/src/test/java/org/apache/seatunnel/connectors/seatunnel/hive/storage/S3StorageTest.java
+++
b/seatunnel-connectors-v2/connector-hive/src/test/java/org/apache/seatunnel/connectors/seatunnel/hive/storage/S3StorageTest.java
@@ -32,6 +32,9 @@ import java.util.HashMap;
public class S3StorageTest {
+ private static final String TEST_S3_CREDENTIALS_PROVIDER =
+
S3FileBaseOptions.S3aAwsCredentialsProvider.SimpleAWSCredentialsProvider.getProvider();
+
private static final ReadonlyConfig S3A =
ReadonlyConfig.fromMap(
new HashMap<String, Object>() {
@@ -46,9 +49,7 @@ public class S3StorageTest {
put(
S3FileBaseOptions.S3A_AWS_CREDENTIALS_PROVIDER
.key(),
-
S3FileBaseOptions.S3aAwsCredentialsProvider
-
.InstanceProfileCredentialsProvider
- .getProvider());
+
TEST_S3_CREDENTIALS_PROVIDER);
put(
S3FileBaseOptions.FS_S3A_ENDPOINT.key(),
"http://s3.ap-northeast-1.amazonaws.com";);
@@ -71,9 +72,7 @@ public class S3StorageTest {
put(
S3FileBaseOptions.S3A_AWS_CREDENTIALS_PROVIDER
.key(),
-
S3FileBaseOptions.S3aAwsCredentialsProvider
-
.InstanceProfileCredentialsProvider
- .getProvider());
+
TEST_S3_CREDENTIALS_PROVIDER);
put(S3FileBaseOptions.FS_S3A_ENDPOINT.key(), "test");
}
});
diff --git
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/converter/AbstractJdbcRowConverter.java
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/converter/AbstractJdbcRowConverter.java
index 010daa8245..c2a3fb04ab 100644
---
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/converter/AbstractJdbcRowConverter.java
+++
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/converter/AbstractJdbcRowConverter.java
@@ -260,15 +260,6 @@ public abstract class AbstractJdbcRowConverter implements
JdbcRowConverter {
statement.setObject(statementIndex, null);
}
- protected void setNullToStatementByDataType(
- PreparedStatement statement,
- SeaTunnelDataType<?> seaTunnelDataType,
- int statementIndex,
- @Nullable String sourceType)
- throws SQLException {
- statement.setObject(statementIndex, null);
- }
-
protected void setValueToStatementByDataType(
Object value,
PreparedStatement statement,
diff --git
a/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/java/org/apache/seatunnel/engine/e2e/SplitClusterPendingJobLifecycleFailoverIT.java
b/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/java/org/apache/seatunnel/engine/e2e/SplitClusterPendingJobLifecycleFailoverIT.java
index b7f4285c4e..cea53f445d 100644
---
a/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/java/org/apache/seatunnel/engine/e2e/SplitClusterPendingJobLifecycleFailoverIT.java
+++
b/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/java/org/apache/seatunnel/engine/e2e/SplitClusterPendingJobLifecycleFailoverIT.java
@@ -72,6 +72,9 @@ public class SplitClusterPendingJobLifecycleFailoverIT {
configurePendingLifecycleTest(masterNode2Config);
configurePendingLifecycleTest(workerNode1Config);
configurePendingLifecycleTest(workerNode2Config);
+ // Both jobs enter the restore queue after master failover. Provide
enough capacity for
+ // their resource pre-allocation regardless of the restore queue order.
+
workerNode2Config.getEngineConfig().getSlotServiceConfig().setSlotNum(8);
try {
masterNode1 =
SeaTunnelServerStarter.createMasterHazelcastInstance(masterNode1Config);
diff --git
a/seatunnel-engine/seatunnel-engine-server/src/test/java/org/apache/seatunnel/engine/server/telemetry/metrics/exports/EngineStateStoreLogicalMetricExportsTest.java
b/seatunnel-engine/seatunnel-engine-server/src/test/java/org/apache/seatunnel/engine/server/telemetry/metrics/exports/EngineStateStoreLogicalMetricExportsTest.java
index 7cb201cdac..504dc0d1bd 100644
---
a/seatunnel-engine/seatunnel-engine-server/src/test/java/org/apache/seatunnel/engine/server/telemetry/metrics/exports/EngineStateStoreLogicalMetricExportsTest.java
+++
b/seatunnel-engine/seatunnel-engine-server/src/test/java/org/apache/seatunnel/engine/server/telemetry/metrics/exports/EngineStateStoreLogicalMetricExportsTest.java
@@ -313,9 +313,6 @@ class EngineStateStoreLogicalMetricExportsTest {
String yaml =
"seatunnel:\n"
+ " engine:\n"
- + " telemetry:\n"
- + " metric:\n"
- + " enabled: true\n"
+ " history-job-expire-minutes: 1\n"
+ " jar-storage:\n"
+ " enable: true\n"
