You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ma...@apache.org on 2023/05/25 14:38:44 UTC
[flink-connector-jdbc] branch main updated: [Hotfix][Connector/JDBC] Remove non-used code in tests. This closes #46
This is an automated email from the ASF dual-hosted git repository.
martijnvisser pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git
The following commit(s) were added to refs/heads/main by this push:
new 5b6eccc [Hotfix][Connector/JDBC] Remove non-used code in tests. This closes #46
5b6eccc is described below
commit 5b6eccceec736d1800bd63667b9ccfbaf6d75ae8
Author: Hang Ruan <ru...@hotmail.com>
AuthorDate: Thu May 25 22:38:39 2023 +0800
[Hotfix][Connector/JDBC] Remove non-used code in tests. This closes #46
---
.../jdbc/databases/mysql/table/UnsignedTypeConversionITCase.java | 4 ----
.../jdbc/databases/oracle/table/OracleTableSourceITCase.java | 6 +++---
.../jdbc/databases/postgres/catalog/PostgresCatalogTestBase.java | 4 ----
.../postgres/catalog/factory/JdbcCatalogFactoryTest.java | 7 +------
.../databases/sqlserver/table/SqlServerTableSourceITCase.java | 6 +++---
.../org/apache/flink/connector/jdbc/internal/JdbcFullTest.java | 3 ---
.../flink/connector/jdbc/table/JdbcAppendOnlyWriterTest.java | 2 +-
.../flink/connector/jdbc/table/JdbcDynamicTableSourceITCase.java | 8 ++++----
.../apache/flink/connector/jdbc/table/JdbcOutputFormatTest.java | 2 +-
.../jdbc/testutils/databases/sqlserver/SqlServerImages.java | 3 ---
10 files changed, 13 insertions(+), 32 deletions(-)
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/UnsignedTypeConversionITCase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/UnsignedTypeConversionITCase.java
index 6364cd7..531d631 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/UnsignedTypeConversionITCase.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/UnsignedTypeConversionITCase.java
@@ -32,8 +32,6 @@ import org.apache.flink.util.CloseableIterator;
import org.apache.flink.util.CollectionUtil;
import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.math.BigDecimal;
import java.sql.Connection;
@@ -53,8 +51,6 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
class UnsignedTypeConversionITCase extends AbstractTestBase implements MySqlTestBase {
- private static final Logger LOGGER =
- LoggerFactory.getLogger(UnsignedTypeConversionITCase.class);
private static final String TABLE_SOURCE = "jdbc_source";
private static final String TABLE_SINK = "jdbc_sink";
private static final String TABLE_DATA = "data";
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleTableSourceITCase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleTableSourceITCase.java
index 77192bf..4634b6b 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleTableSourceITCase.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleTableSourceITCase.java
@@ -105,7 +105,7 @@ class OracleTableSourceITCase extends AbstractTestBase implements OracleTestBase
}
@Test
- void testJdbcSource() throws Exception {
+ void testJdbcSource() {
tEnv.executeSql(INPUT_TABLE.getCreateQueryForFlink(getMetadata(), INPUT_TABLE_NAME));
Iterator<Row> collected = tEnv.executeSql("SELECT * FROM " + INPUT_TABLE_NAME).collect();
List<String> result =
@@ -123,7 +123,7 @@ class OracleTableSourceITCase extends AbstractTestBase implements OracleTestBase
}
@Test
- void testProject() throws Exception {
+ void testProject() {
tEnv.executeSql(
INPUT_TABLE.getCreateQueryForFlink(
getMetadata(),
@@ -158,7 +158,7 @@ class OracleTableSourceITCase extends AbstractTestBase implements OracleTestBase
}
@Test
- void testLimit() throws Exception {
+ void testLimit() {
tEnv.executeSql(
INPUT_TABLE.getCreateQueryForFlink(
getMetadata(),
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTestBase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTestBase.java
index 6e6c2d5..c8d2b12 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTestBase.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTestBase.java
@@ -28,8 +28,6 @@ import org.apache.flink.table.types.logical.DecimalType;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -39,8 +37,6 @@ import java.sql.Statement;
/** Test base for {@link PostgresCatalog}. */
class PostgresCatalogTestBase implements JdbcITCaseBase, PostgresTestBase {
- public static final Logger LOG = LoggerFactory.getLogger(PostgresCatalogTestBase.class);
-
private static DatabaseMetadata getStaticMetadata() {
return PostgresDatabase.getMetadata();
}
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/factory/JdbcCatalogFactoryTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/factory/JdbcCatalogFactoryTest.java
index 5c66bda..b4d8aac 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/factory/JdbcCatalogFactoryTest.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/factory/JdbcCatalogFactoryTest.java
@@ -29,10 +29,7 @@ import org.apache.flink.table.factories.FactoryUtil;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import java.sql.SQLException;
import java.util.HashMap;
import java.util.Map;
@@ -41,15 +38,13 @@ import static org.assertj.core.api.Assertions.assertThat;
/** Test for {@link JdbcCatalogFactory}. */
class JdbcCatalogFactoryTest implements PostgresTestBase {
- public static final Logger LOG = LoggerFactory.getLogger(JdbcCatalogFactoryTest.class);
-
protected static String baseUrl;
protected static JdbcCatalog catalog;
protected static final String TEST_CATALOG_NAME = "mypg";
@BeforeEach
- void setup() throws SQLException {
+ void setup() {
// jdbc:postgresql://localhost:50807/postgres?user=postgres
String jdbcUrl = getMetadata().getJdbcUrl();
// jdbc:postgresql://localhost:50807/
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerTableSourceITCase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerTableSourceITCase.java
index 02805be..e5dc9bf 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerTableSourceITCase.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerTableSourceITCase.java
@@ -107,7 +107,7 @@ class SqlServerTableSourceITCase extends AbstractTestBase implements SqlServerTe
}
@Test
- void testJdbcSource() throws Exception {
+ void testJdbcSource() {
createFlinkTable();
Iterator<Row> collected = tEnv.executeSql("SELECT * FROM " + INPUT_TABLE_NAME).collect();
List<String> result =
@@ -131,7 +131,7 @@ class SqlServerTableSourceITCase extends AbstractTestBase implements SqlServerTe
}
@Test
- void testProject() throws Exception {
+ void testProject() {
createFlinkTable();
Iterator<Row> collected =
tEnv.executeSql("SELECT id,datetime_col,decimal_col FROM " + INPUT_TABLE_NAME)
@@ -151,7 +151,7 @@ class SqlServerTableSourceITCase extends AbstractTestBase implements SqlServerTe
}
@Test
- void testFilter() throws Exception {
+ void testFilter() {
createFlinkTable();
Iterator<Row> collected =
tEnv.executeSql(
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcFullTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcFullTest.java
index d41b685..c59f619 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcFullTest.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcFullTest.java
@@ -178,9 +178,6 @@ class JdbcFullTest extends JdbcDataTestBase {
try (Connection conn = getMetadata().getConnection();
Statement stat = conn.createStatement()) {
stat.execute("DELETE FROM " + OUTPUT_TABLE);
-
- stat.close();
- conn.close();
}
}
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcAppendOnlyWriterTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcAppendOnlyWriterTest.java
index 3bd08ea..27723e8 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcAppendOnlyWriterTest.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcAppendOnlyWriterTest.java
@@ -54,7 +54,7 @@ class JdbcAppendOnlyWriterTest extends JdbcTestBase {
}
@Test
- void testMaxRetry() throws Exception {
+ void testMaxRetry() {
assertThatThrownBy(
() -> {
format =
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSourceITCase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSourceITCase.java
index 3b1855e..95a39d5 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSourceITCase.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSourceITCase.java
@@ -105,7 +105,7 @@ public abstract class JdbcDynamicTableSourceITCase implements DatabaseTest {
}
@BeforeEach
- void beforeAll() throws SQLException {
+ void beforeEach() throws SQLException {
try (Connection conn = getMetadata().getConnection()) {
inputTable.insertIntoTableValues(conn, getTestData());
}
@@ -153,7 +153,7 @@ public abstract class JdbcDynamicTableSourceITCase implements DatabaseTest {
}
@Test
- public void testLimit() throws Exception {
+ public void testLimit() {
String testTable = "testTable";
tEnv.executeSql(
inputTable.getCreateQueryForFlink(
@@ -174,7 +174,7 @@ public abstract class JdbcDynamicTableSourceITCase implements DatabaseTest {
}
@Test
- public void testFilter() throws Exception {
+ public void testFilter() {
String testTable = "testTable";
tEnv.executeSql(inputTable.getCreateQueryForFlink(getMetadata(), testTable));
@@ -271,7 +271,7 @@ public abstract class JdbcDynamicTableSourceITCase implements DatabaseTest {
@ParameterizedTest
@EnumSource(Caching.class)
- void testLookupJoin(Caching caching) throws Exception {
+ void testLookupJoin(Caching caching) {
// Create JDBC lookup table
List<String> cachingOptions = Collections.emptyList();
if (caching.equals(Caching.ENABLE_CACHE)) {
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatTest.java
index d7d95b6..6d0787e 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatTest.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatTest.java
@@ -76,7 +76,7 @@ class JdbcOutputFormatTest extends JdbcDataTestBase {
private static InternalTypeInfo<RowData> rowDataTypeInfo = InternalTypeInfo.of(rowType);
@AfterEach
- void tearDown() throws Exception {
+ void tearDown() {
if (outputFormat != null) {
outputFormat.close();
}
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerImages.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerImages.java
index 43263ba..dc2cf5c 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerImages.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerImages.java
@@ -24,7 +24,4 @@ public interface SqlServerImages {
DockerImageName MSSQL_AZURE_SQL_EDGE =
DockerImageName.parse("mcr.microsoft.com/azure-sql-edge")
.asCompatibleSubstituteFor("mcr.microsoft.com/mssql/server");
-
- String MSSQL_SERVER_2017 = "mcr.microsoft.com/mssql/server:2017-CU12";
- String MSSQL_SERVER_2019 = "mcr.microsoft.com/mssql/server:2019-GA-ubuntu-16.04";
}