[FLINK-25825][connector-jdbc] MySqlCatalogITCase fails on azure

This closes apache#18653.
tongcheng-elong · Feb 15, 2022 · 52a4018 · 52a4018
1 parent 009d255
commit 52a4018
Show file tree

Hide file tree

Showing 4 changed files with 118 additions and 205 deletions.
diff --git a/flink-connectors/flink-connector-jdbc/pom.xml b/flink-connectors/flink-connector-jdbc/pom.xml
@@ -138,28 +138,17 @@ under the License.
  </dependency>
 
  <!-- MySQL tests -->
- <dependency>
- <groupId>ch.vorburger.mariaDB4j</groupId>
- <artifactId>mariaDB4j</artifactId>
- <version>2.4.0</version>
- <scope>test</scope>
- </dependency>
- <!-- ch.vorburger.mariaDB4j:mariaDB4j has a dependency of mariadb-java-client:2.3.0,
- but we want to bump mariadb-java-client to >= 2.5.4 which fix a few notable bugs,
- see: https://mariadb.com/kb/en/mariadb-connector-j-release-notes/
- and the lower version may cause the test stability issue FLINK-18082.-->
- <dependency>
- <groupId>org.mariadb.jdbc</groupId>
- <artifactId>mariadb-java-client</artifactId>
- <version>2.7.4</version>
- <scope>test</scope>
- </dependency>
  <dependency>
  <groupId>mysql</groupId>
  <artifactId>mysql-connector-java</artifactId>
  <version>8.0.27</version>
  <scope>test</scope>
  </dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>mysql</artifactId>
+ <scope>test</scope>
+ </dependency>
 
  <!-- Derby tests -->
  <dependency>
@@ -184,18 +173,6 @@ under the License.
  <scope>test</scope>
  </dependency>
 
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>postgresql</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>mysql</artifactId>
- <scope>test</scope>
- </dependency>
-
  <!-- ArchUit test dependencies -->
 
  <dependency>

diff --git a/...nector-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/MySqlCatalogITCase.java b/...nector-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/MySqlCatalogITCase.java
@@ -94,7 +94,7 @@ public class MySqlCatalogITCase extends MySqlCatalogTestBase {
  Timestamp.valueOf("2021-08-04 01:54:16").toLocalDateTime(),
  "col_tinytext",
  Byte.parseByte("-1"),
- Byte.parseByte("1"),
+ Short.parseShort("1"),
  null,
  "col_varchar",
  Timestamp.valueOf("2021-08-04 01:54:16.463").toLocalDateTime(),
@@ -142,7 +142,7 @@ public class MySqlCatalogITCase extends MySqlCatalogTestBase {
  Timestamp.valueOf("2021-08-04 01:53:19").toLocalDateTime(),
  "col_tinytext",
  Byte.parseByte("-1"),
- Byte.parseByte("1"),
+ Short.parseShort("1"),
  null,
  "col_varchar",
  Timestamp.valueOf("2021-08-04 01:53:19.098").toLocalDateTime(),

diff --git a/...ctor-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/MySqlCatalogTestBase.java b/...ctor-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/MySqlCatalogTestBase.java
@@ -23,8 +23,8 @@
 
 import org.apache.flink.shaded.guava30.com.google.common.collect.Lists;
 
-import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.junit.ClassRule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.MySQLContainer;
@@ -67,7 +67,7 @@ public class MySqlCatalogTestBase {
  .column("col_date", DataTypes.DATE())
  .column("col_datetime", DataTypes.TIMESTAMP(0))
  .column("col_decimal", DataTypes.DECIMAL(10, 0))
- .column("col_decimal_unsigned", DataTypes.DECIMAL(10, 0))
+ .column("col_decimal_unsigned", DataTypes.DECIMAL(11, 0))
  .column("col_double", DataTypes.DOUBLE())
  .column("col_double_unsigned", DataTypes.DOUBLE())
  .column("col_enum", DataTypes.CHAR(6))
@@ -83,20 +83,20 @@ public class MySqlCatalogTestBase {
  .column("col_mediumblob", DataTypes.BYTES())
  .column("col_mediumint", DataTypes.INT())
  .column("col_mediumint_unsigned", DataTypes.INT())
- .column("col_mediumtext", DataTypes.VARCHAR(16777215))
+ .column("col_mediumtext", DataTypes.VARCHAR(5592405))
  .column("col_numeric", DataTypes.DECIMAL(10, 0))
- .column("col_numeric_unsigned", DataTypes.DECIMAL(10, 0))
+ .column("col_numeric_unsigned", DataTypes.DECIMAL(11, 0))
  .column("col_real", DataTypes.DOUBLE())
  .column("col_real_unsigned", DataTypes.DOUBLE())
  .column("col_set", DataTypes.CHAR(18))
  .column("col_smallint", DataTypes.SMALLINT())
  .column("col_smallint_unsigned", DataTypes.INT())
- .column("col_text", DataTypes.VARCHAR(65535))
+ .column("col_text", DataTypes.VARCHAR(21845))
  .column("col_time", DataTypes.TIME(0))
  .column("col_timestamp", DataTypes.TIMESTAMP(0))
- .column("col_tinytext", DataTypes.VARCHAR(255))
+ .column("col_tinytext", DataTypes.VARCHAR(85))
  .column("col_tinyint", DataTypes.TINYINT())
- .column("col_tinyint_unsinged", DataTypes.TINYINT())
+ .column("col_tinyint_unsinged", DataTypes.SMALLINT())
  .column("col_tinyblob", DataTypes.BYTES())
  .column("col_varchar", DataTypes.VARCHAR(255))
  .column("col_datetime_p3", DataTypes.TIMESTAMP(3).notNull())
@@ -106,6 +106,7 @@ public class MySqlCatalogTestBase {
  .primaryKeyNamed("PRIMARY", Lists.newArrayList("pid"))
  .build();
 
+ @ClassRule
  public static final MySQLContainer<?> MYSQL_CONTAINER =
  new MySQLContainer<>(MYSQL_57_IMAGE)
  .withUsername("root")
@@ -114,23 +115,14 @@ public class MySqlCatalogTestBase {
  .withInitScript(MYSQL_INIT_SCRIPT)
  .withLogConsumer(new Slf4jLogConsumer(LOG));
 
- protected static String baseUrl;
-
  protected static MySqlCatalog catalog;
 
  @BeforeClass
- public static void launchContainer() {
- MYSQL_CONTAINER.start();
- baseUrl =
+ public static void beforeAll() {
+ String baseUrl =
  MYSQL_CONTAINER
  .getJdbcUrl()
  .substring(0, MYSQL_CONTAINER.getJdbcUrl().lastIndexOf("/"));
  catalog = new MySqlCatalog(TEST_CATALOG_NAME, TEST_DB, TEST_USERNAME, TEST_PWD, baseUrl);
  }
-
- @AfterClass
- public static void shutdownContainer() {
- MYSQL_CONTAINER.stop();
- MYSQL_CONTAINER.close();
- }
 }