This is an automated email from the ASF dual-hosted git repository.
corgy 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 a0aa0ceaf9 Fix[CI] Update the MySQL Docker image version to 8.0.43
(#9903)
a0aa0ceaf9 is described below
commit a0aa0ceaf9f414920253fa4d48c4463fe29bb6c5
Author: zhangdonghao <[email protected]>
AuthorDate: Fri Oct 10 10:40:46 2025 +0800
Fix[CI] Update the MySQL Docker image version to 8.0.43 (#9903)
---
.../seatunnel/cdc/mysql/testutils/MySqlVersion.java | 2 +-
.../connectors/seatunnel/jdbc/JdbcMysqlIT.java | 2 +-
.../seatunnel/jdbc/JdbcMysqlMultipleTablesIT.java | 2 +-
.../jdbc/internal/xa/XaGroupOpsImplIT.java | 2 +-
.../seatunnel/jdbc/JdbcMySqlCreateTableIT.java | 21 +++++++++++++--------
.../seatunnel/jdbc/JdbcSqlServerCreateTableIT.java | 2 +-
.../seatunnel/jdbc/JdbcMySqlSaveModeCatalogIT.java | 16 +++++++++-------
.../seatunnel/jdbc/JdbcMysqlSaveModeHandlerIT.java | 5 ++++-
.../connectors/seatunnel/jdbc/JdbcMysqlSplitIT.java | 14 ++++++++------
.../connectors/seatunnel/jdbc/MetalakeIT.java | 5 +----
10 files changed, 40 insertions(+), 31 deletions(-)
diff --git
a/seatunnel-connectors-v2/connector-cdc/connector-cdc-mysql/src/test/java/org/apache/seatunnel/connectors/seatunnel/cdc/mysql/testutils/MySqlVersion.java
b/seatunnel-connectors-v2/connector-cdc/connector-cdc-mysql/src/test/java/org/apache/seatunnel/connectors/seatunnel/cdc/mysql/testutils/MySqlVersion.java
index ac794a02a5..04aea181e2 100644
---
a/seatunnel-connectors-v2/connector-cdc/connector-cdc-mysql/src/test/java/org/apache/seatunnel/connectors/seatunnel/cdc/mysql/testutils/MySqlVersion.java
+++
b/seatunnel-connectors-v2/connector-cdc/connector-cdc-mysql/src/test/java/org/apache/seatunnel/connectors/seatunnel/cdc/mysql/testutils/MySqlVersion.java
@@ -22,7 +22,7 @@ public enum MySqlVersion {
V5_5("5.5"),
V5_6("5.6"),
V5_7("5.7"),
- V8_0("8.0"),
+ V8_0("8.0.43"),
V8_4("8.4.4");
private final String version;
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-1/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMysqlIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-1/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMysqlIT.java
index 660a101211..b46b40fc0f 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-1/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMysqlIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-1/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMysqlIT.java
@@ -79,7 +79,7 @@ import java.util.Properties;
public class JdbcMysqlIT extends AbstractJdbcIT {
- private static final String MYSQL_IMAGE = "mysql:8.0";
+ private static final String MYSQL_IMAGE = "mysql:8.0.43";
private static final String MYSQL_CONTAINER_HOST = "mysql-e2e";
private static final String MYSQL_DATABASE = "seatunnel";
private static final String MYSQL_SOURCE = "source";
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-1/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMysqlMultipleTablesIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-1/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMysqlMultipleTablesIT.java
index 97daf4743c..e8dd2b37ae 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-1/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMysqlMultipleTablesIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-1/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMysqlMultipleTablesIT.java
@@ -62,7 +62,7 @@ import java.util.stream.Stream;
@Slf4j
public class JdbcMysqlMultipleTablesIT extends TestSuiteBase implements
TestResource {
- private static final String MYSQL_IMAGE = "mysql:8.0";
+ private static final String MYSQL_IMAGE = "mysql:8.0.43";
private static final String MYSQL_CONTAINER_HOST = "mysql-e2e";
private static final String MYSQL_DATABASE = "seatunnel";
private static final String MYSQL_USERNAME = "root";
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-1/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/xa/XaGroupOpsImplIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-1/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/xa/XaGroupOpsImplIT.java
index 8035d2e5c9..28e34b656c 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-1/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/xa/XaGroupOpsImplIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-1/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/xa/XaGroupOpsImplIT.java
@@ -51,7 +51,7 @@ import static javax.transaction.xa.XAResource.TMSTARTRSCAN;
"Temporary fast fix, reason: JdbcDatabaseContainer:
ClassNotFoundException: com.mysql.jdbc.Driver")
class XaGroupOpsImplIT {
- private static final String MYSQL_DOCKER_IMAGE = "mysql:8.0.29";
+ private static final String MYSQL_DOCKER_IMAGE = "mysql:8.0.43";
private MySQLContainer<?> mc;
private XaGroupOps xaGroupOps;
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-4/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMySqlCreateTableIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-4/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMySqlCreateTableIT.java
index b4ac622a69..e7177286ba 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-4/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMySqlCreateTableIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-4/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMySqlCreateTableIT.java
@@ -74,7 +74,7 @@ public class JdbcMySqlCreateTableIT extends TestSuiteBase
implements TestResourc
private static final String PG_GEOMETRY_JAR =
"https://repo1.maven.org/maven2/net/postgis/postgis-geometry/2.5.1/postgis-geometry-2.5.1.jar";;
- private static final String MYSQL_IMAGE = "mysql:8.0";
+ private static final String MYSQL_IMAGE = "mysql:8.0.43";
private static final String MYSQL_CONTAINER_HOST = "mysql-e2e";
private static final String MYSQL_DATABASE = "auto";
@@ -304,13 +304,18 @@ public class JdbcMySqlCreateTableIT extends TestSuiteBase
implements TestResourc
@Override
public void tearDown() throws Exception {
-
- sqlserver_container.close();
- mysql_container.close();
- POSTGRESQL_CONTAINER.close();
-
dockerClient.removeContainerCmd(sqlserver_container.getContainerId()).exec();
-
dockerClient.removeContainerCmd(mysql_container.getContainerId()).exec();
-
dockerClient.removeContainerCmd(POSTGRESQL_CONTAINER.getContainerId()).exec();
+ if (sqlserver_container != null) {
+ sqlserver_container.close();
+
dockerClient.removeContainerCmd(sqlserver_container.getContainerId()).exec();
+ }
+ if (mysql_container != null) {
+ mysql_container.close();
+
dockerClient.removeContainerCmd(mysql_container.getContainerId()).exec();
+ }
+ if (POSTGRESQL_CONTAINER != null) {
+ POSTGRESQL_CONTAINER.close();
+
dockerClient.removeContainerCmd(POSTGRESQL_CONTAINER.getContainerId()).exec();
+ }
}
private Connection getJdbcSqlServerConnection() throws SQLException {
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-4/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcSqlServerCreateTableIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-4/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcSqlServerCreateTableIT.java
index 9eb962d44f..f8bd57e586 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-4/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcSqlServerCreateTableIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-4/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcSqlServerCreateTableIT.java
@@ -130,7 +130,7 @@ public class JdbcSqlServerCreateTableIT extends
TestSuiteBase implements TestRes
private static final String PG_GEOMETRY_JAR =
"https://repo1.maven.org/maven2/net/postgis/postgis-geometry/2.5.1/postgis-geometry-2.5.1.jar";;
- private static final String MYSQL_IMAGE = "mysql:8.0";
+ private static final String MYSQL_IMAGE = "mysql:8.0.43";
private static final String MYSQL_CONTAINER_HOST = "mysql-e2e";
private static final String MYSQL_DATABASE = "auto";
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMySqlSaveModeCatalogIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMySqlSaveModeCatalogIT.java
index b1361b58e5..a93c11bd05 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMySqlSaveModeCatalogIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMySqlSaveModeCatalogIT.java
@@ -36,6 +36,7 @@ import org.testcontainers.containers.Container;
import org.testcontainers.containers.MySQLContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.images.PullPolicy;
import org.testcontainers.lifecycle.Startables;
import org.testcontainers.utility.DockerImageName;
import org.testcontainers.utility.DockerLoggerFactory;
@@ -46,6 +47,7 @@ import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
+import java.time.Duration;
import java.util.stream.Stream;
@Slf4j
@@ -54,7 +56,7 @@ public class JdbcMySqlSaveModeCatalogIT extends TestSuiteBase
implements TestRes
private static final String MYSQL_DRIVER_JAR =
"https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/8.0.32/mysql-connector-j-8.0.32.jar";;
- private static final String MYSQL_IMAGE = "mysql:8.0";
+ private static final String MYSQL_IMAGE = "mysql:8.0.43";
private static final String MYSQL_CONTAINER_HOST = "mysql-e2e";
private static final String MYSQL_DATABASE = "auto";
@@ -100,12 +102,12 @@ public class JdbcMySqlSaveModeCatalogIT extends
TestSuiteBase implements TestRes
+ " PRIMARY KEY (`id`)\n"
+ ");";
- private String getInsertSql =
+ private final String getInsertSql =
"INSERT INTO mysql_auto_create"
+ "(id, f_binary, f_smallint, f_smallint_unsigned,
f_mediumint, f_mediumint_unsigned, f_int, f_int_unsigned, f_integer,
f_integer_unsigned, f_bigint, f_bigint_unsigned, f_numeric, f_decimal, f_float,
f_double, f_double_precision, f_tinytext, f_varchar, f_datetime, f_timestamp,
f_bit1, f_bit64, f_char, f_enum, f_real, f_tinyint, f_bigint8, f_bigint1,
f_data)\n"
+ "VALUES(575,
0x654458436C70336B7357000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000,
194, 549, 633, 835, 719, 253, 742, 265, 806, 736, 474, 254, 120.8, 476.42,
264.95, 'In other words, Navicat provides the ability for data in different
databases and/or schemas to be kept up-to-date so that each repository contains
the same information.', 'jF9X70ZqH4', '2011-10-20 23:10:08', '2017-09-10
19:33:51', 1, b'00010 [...]
- private String customSql =
+ private final String customSql =
"INSERT INTO mysql_auto_create_sink"
+ "(id, f_binary, f_smallint, f_smallint_unsigned,
f_mediumint, f_mediumint_unsigned, f_int, f_int_unsigned, f_integer,
f_integer_unsigned, f_bigint, f_bigint_unsigned, f_numeric, f_decimal, f_float,
f_double, f_double_precision, f_tinytext, f_varchar, f_datetime, f_timestamp,
f_bit1, f_bit64, f_char, f_enum, f_real, f_tinyint, f_bigint8, f_bigint1,
f_data)\n"
+ "VALUES(575,
0x654458436C70336B7357000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000,
194, 549, 633, 835, 719, 253, 742, 265, 806, 736, 474, 254, 120.8, 476.42,
264.95, 'In other words, Navicat provides the ability for data in different
databases and/or schemas to be kept up-to-date so that each repository contains
the same information.', 'jF9X70ZqH4', '2011-10-20 23:10:08', '2017-09-10
19:33:51', 1, b'00010 [...]
@@ -127,6 +129,7 @@ public class JdbcMySqlSaveModeCatalogIT extends
TestSuiteBase implements TestRes
DockerImageName imageName = DockerImageName.parse(MYSQL_IMAGE);
mysql_container =
new MySQLContainer<>(imageName)
+
.withImagePullPolicy(PullPolicy.ageBased(Duration.ofDays(7)))
.withUsername(MYSQL_USERNAME)
.withPassword(MYSQL_PASSWORD)
.withDatabaseName(MYSQL_DATABASE)
@@ -162,8 +165,8 @@ public class JdbcMySqlSaveModeCatalogIT extends
TestSuiteBase implements TestRes
CatalogTable catalogTable = mySqlCatalog.getTable(tablePathMySql);
// source comment
Assertions.assertEquals(
- catalogTable.getTableSchema().getColumns().get(1).getComment(),
- "\"#¥%……&*（）;;',,..``````//'@特殊注释'\\'\"");
+ "\"#¥%……&*（）;;',,..``````//'@特殊注释'\\'\"",
+
catalogTable.getTableSchema().getColumns().get(1).getComment());
// sink tableExists ?
boolean tableExistsBefore =
mySqlCatalog.tableExists(tablePathMySqlSink);
Assertions.assertFalse(tableExistsBefore);
@@ -174,7 +177,7 @@ public class JdbcMySqlSaveModeCatalogIT extends
TestSuiteBase implements TestRes
// comment
final CatalogTable sinkTable =
mySqlCatalog.getTable(tablePathMySqlSink);
final Column column = sinkTable.getTableSchema().getColumns().get(1);
- Assertions.assertEquals(column.getComment(),
"\"#¥%……&*（）;;',,..``````//'@特殊注释'\\'\"");
+ Assertions.assertEquals("\"#¥%……&*（）;;',,..``````//'@特殊注释'\\'\"",
column.getComment());
// isExistsData ?
boolean existsDataBefore =
mySqlCatalog.isExistsData(tablePathMySqlSink);
Assertions.assertFalse(existsDataBefore);
@@ -195,7 +198,6 @@ public class JdbcMySqlSaveModeCatalogIT extends
TestSuiteBase implements TestRes
public void tearDown() throws Exception {
if (mysql_container != null) {
mysql_container.close();
-
dockerClient.removeContainerCmd(mysql_container.getContainerId()).exec();
}
}
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMysqlSaveModeHandlerIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMysqlSaveModeHandlerIT.java
index 88da0113c5..cff0b42f7c 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMysqlSaveModeHandlerIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMysqlSaveModeHandlerIT.java
@@ -36,6 +36,7 @@ import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.MySQLContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.images.PullPolicy;
import org.testcontainers.utility.DockerImageName;
import org.testcontainers.utility.DockerLoggerFactory;
@@ -46,6 +47,7 @@ import java.math.BigDecimal;
import java.sql.Date;
import java.sql.SQLException;
import java.sql.Timestamp;
+import java.time.Duration;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
@@ -58,7 +60,7 @@ import java.util.stream.Collectors;
@Slf4j
public class JdbcMysqlSaveModeHandlerIT extends AbstractJdbcIT {
- private static final String MYSQL_IMAGE = "mysql:8.0";
+ private static final String MYSQL_IMAGE = "mysql:8.0.43";
private static final String MYSQL_CONTAINER_HOST = "mysql-e2e-2";
private static final String MYSQL_DATABASE = "seatunnel";
private static final String MYSQL_SOURCE = "source";
@@ -299,6 +301,7 @@ public class JdbcMysqlSaveModeHandlerIT extends
AbstractJdbcIT {
GenericContainer<?> container =
new MySQLContainer<>(imageName)
+
.withImagePullPolicy(PullPolicy.ageBased(Duration.ofDays(7)))
.withUsername(MYSQL_USERNAME)
.withPassword(MYSQL_PASSWORD)
.withDatabaseName(MYSQL_DATABASE)
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMysqlSplitIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMysqlSplitIT.java
index 04cce52182..52fb9fff4c 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMysqlSplitIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMysqlSplitIT.java
@@ -46,6 +46,7 @@ import org.slf4j.LoggerFactory;
import org.testcontainers.containers.MySQLContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.images.PullPolicy;
import org.testcontainers.lifecycle.Startables;
import org.testcontainers.utility.DockerImageName;
import org.testcontainers.utility.DockerLoggerFactory;
@@ -57,6 +58,7 @@ import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.sql.Timestamp;
+import java.time.Duration;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
@@ -74,7 +76,7 @@ import static org.awaitility.Awaitility.given;
public class JdbcMysqlSplitIT extends TestSuiteBase implements TestResource {
private static final Logger LOG =
LoggerFactory.getLogger(JdbcMysqlSplitIT.class);
- private static final String MYSQL_IMAGE = "mysql:8.0";
+ private static final String MYSQL_IMAGE = "mysql:8.0.43";
private static final String MYSQL_CONTAINER_HOST = "mysql-e2e";
private static final String MYSQL_DATABASE = "auto";
private static final String MYSQL_TABLE = "split_test";
@@ -145,6 +147,7 @@ public class JdbcMysqlSplitIT extends TestSuiteBase
implements TestResource {
DockerImageName imageName = DockerImageName.parse(MYSQL_IMAGE);
mysql_container =
new MySQLContainer<>(imageName)
+
.withImagePullPolicy(PullPolicy.ageBased(Duration.ofDays(7)))
.withUsername(MYSQL_USERNAME)
.withPassword(MYSQL_PASSWORD)
.withDatabaseName(MYSQL_DATABASE)
@@ -488,14 +491,14 @@ public class JdbcMysqlSplitIT extends TestSuiteBase
implements TestResource {
private void assertNumSplit(JdbcSourceSplit[] splitArray, String info) {
for (int i = 0; i < splitArray.length; i++) {
if (i == 0) {
- Assertions.assertEquals(null, splitArray[i].getSplitStart());
+ Assertions.assertNull(splitArray[i].getSplitStart());
Assertions.assertEquals("10" + info,
splitArray[i].getSplitEnd().toString());
continue;
}
if (i == splitArray.length - 1 && i != 0) {
Assertions.assertEquals(10 * i + info,
splitArray[i].getSplitStart().toString());
- Assertions.assertEquals(null, splitArray[i].getSplitEnd());
+ Assertions.assertNull(splitArray[i].getSplitEnd());
continue;
}
@@ -507,7 +510,7 @@ public class JdbcMysqlSplitIT extends TestSuiteBase
implements TestResource {
private void assertDateSplit(JdbcSourceSplit[] splitArray) {
for (int i = 0; i < splitArray.length; i++) {
if (i == 0) {
- Assertions.assertEquals(null, splitArray[i].getSplitStart());
+ Assertions.assertNull(splitArray[i].getSplitStart());
Assertions.assertEquals(
currentDateOld.plusDays(i * 9).toString(),
splitArray[i].getSplitEnd().toString());
@@ -518,7 +521,7 @@ public class JdbcMysqlSplitIT extends TestSuiteBase
implements TestResource {
Assertions.assertEquals(
currentDateOld.plusDays((i - 1) * 9).toString(),
splitArray[i].getSplitStart().toString());
- Assertions.assertEquals(null, splitArray[i].getSplitEnd());
+ Assertions.assertNull(splitArray[i].getSplitEnd());
continue;
}
@@ -549,7 +552,6 @@ public class JdbcMysqlSplitIT extends TestSuiteBase
implements TestResource {
public void tearDown() throws Exception {
if (mysql_container != null) {
mysql_container.close();
-
dockerClient.removeContainerCmd(mysql_container.getContainerId()).exec();
}
}
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/MetalakeIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/MetalakeIT.java
index 619ef5ab93..62338e55f3 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/MetalakeIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/MetalakeIT.java
@@ -73,7 +73,7 @@ public class MetalakeIT extends SeaTunnelContainer {
protected static final String HOST = "HOST";
- private static final String MYSQL_IMAGE = "mysql:8.0";
+ private static final String MYSQL_IMAGE = "mysql:8.0.43";
private static final String MYSQL_CONTAINER_HOST = "mysql-e2e";
private static final String MYSQL_DATABASE = "seatunnel";
private static final String MYSQL_SOURCE = "source";
@@ -174,15 +174,12 @@ public class MetalakeIT extends SeaTunnelContainer {
if (catalog != null) {
catalog.close();
}
-
if (connection != null) {
connection.close();
}
-
if (dbServer != null) {
dbServer.close();
}
-
super.tearDown();
}
