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
commit 753ea0e87d05e0eb7b4419cd1653bd36ba986aa5 Author: Joao Boto <[email protected]> AuthorDate: Wed Feb 8 12:05:08 2023 +0100 [FLINK-30790] Cleaning metadata deprecated methods and disableOnMac annotation --- .../flink/connector/jdbc/JdbcDataTestBase.java | 4 +-- .../apache/flink/connector/jdbc/JdbcITCase.java | 8 +++--- .../flink/connector/jdbc/JdbcInputFormatTest.java | 30 +++++++++++----------- .../connector/jdbc/JdbcRowOutputFormatTest.java | 22 ++++++++-------- .../apache/flink/connector/jdbc/JdbcTestBase.java | 2 +- .../flink/connector/jdbc/JdbcTestFixture.java | 2 +- .../connector/jdbc/databases/DatabaseMetadata.java | 10 +------- .../jdbc/databases/mysql/MySqlMetadata.java | 2 +- .../jdbc/databases/oracle/OracleDatabase.java | 8 ++---- .../{OracleDatabase.java => OracleImages.java} | 25 ++---------------- .../jdbc/databases/oracle/OracleMetadata.java | 10 ++------ .../{OracleDatabase.java => OracleXaDatabase.java} | 7 ++--- .../jdbc/databases/postgres/PostgresMetadata.java | 2 +- .../databases/sqlserver/SqlServerMetadata.java | 3 ++- .../oracle/OracleExactlyOnceSinkE2eTest.java | 14 ++-------- .../jdbc/dialect/oracle/OracleTableSinkITCase.java | 3 --- .../dialect/oracle/OracleTableSourceITCase.java | 3 --- .../sqlserver/SqlServerTableSinkITCase.java | 2 +- .../connector/jdbc/internal/JdbcFullTest.java | 8 +++--- .../jdbc/internal/JdbcTableOutputFormatTest.java | 8 +++--- .../jdbc/table/JdbcAppendOnlyWriterTest.java | 5 ++-- .../jdbc/table/JdbcDynamicTableSinkITCase.java | 2 +- .../connector/jdbc/table/JdbcOutputFormatTest.java | 24 ++++++++--------- .../jdbc/table/JdbcRowDataInputFormatTest.java | 24 ++++++++--------- .../jdbc/xa/JdbcExactlyOnceSinkE2eTest.java | 7 +---- 25 files changed, 87 insertions(+), 148 deletions(-) diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcDataTestBase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcDataTestBase.java index 8b8a5aa..de23d88 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcDataTestBase.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcDataTestBase.java @@ -35,8 +35,8 @@ import static org.apache.flink.connector.jdbc.JdbcTestFixture.DERBY_EBOOKSHOP_DB import static org.mockito.Mockito.doReturn; /** - * Base class for JDBC test using data from {@link JdbcTestFixture}. It uses {@link DerbyDbMetadata} - * and inserts data before each test. + * Base class for JDBC test using data from {@link JdbcTestFixture}. It uses {@link + * org.apache.flink.connector.jdbc.databases.derby.DerbyMetadata} and inserts data before each test. */ public abstract class JdbcDataTestBase extends JdbcTestBase { @BeforeEach diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcITCase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcITCase.java index 41a8082..8c521dc 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcITCase.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcITCase.java @@ -74,7 +74,7 @@ public class JdbcITCase extends JdbcTestBase { String.format(INSERT_TEMPLATE, INPUT_TABLE), TEST_ENTRY_JDBC_STATEMENT_BUILDER, new JdbcConnectionOptionsBuilder() - .withUrl(getMetadata().getUrl()) + .withUrl(getMetadata().getJdbcUrl()) .withDriverName(getMetadata().getDriverClass()) .build())); env.execute(); @@ -108,7 +108,7 @@ public class JdbcITCase extends JdbcTestBase { ps.setString(2, e.content); }, new JdbcConnectionOptionsBuilder() - .withUrl(getMetadata().getUrl()) + .withUrl(getMetadata().getJdbcUrl()) .withDriverName(getMetadata().getDriverClass()) .build())); env.execute(); @@ -118,7 +118,7 @@ public class JdbcITCase extends JdbcTestBase { private List<String> selectWords() throws SQLException { ArrayList<String> strings = new ArrayList<>(); - try (Connection connection = DriverManager.getConnection(getMetadata().getUrl())) { + try (Connection connection = DriverManager.getConnection(getMetadata().getJdbcUrl())) { try (Statement st = connection.createStatement()) { try (ResultSet rs = st.executeQuery("select word from words")) { while (rs.next()) { @@ -145,7 +145,7 @@ public class JdbcITCase extends JdbcTestBase { private List<TestEntry> selectBooks() throws SQLException { List<TestEntry> result = new ArrayList<>(); - try (Connection connection = DriverManager.getConnection(getMetadata().getUrl())) { + try (Connection connection = DriverManager.getConnection(getMetadata().getJdbcUrl())) { connection.setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED); connection.setReadOnly(true); try (Statement st = connection.createStatement()) { diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcInputFormatTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcInputFormatTest.java index d766f07..ae45787 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcInputFormatTest.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcInputFormatTest.java @@ -66,7 +66,7 @@ class JdbcInputFormatTest extends JdbcDataTestBase { jdbcInputFormat = JdbcInputFormat.buildJdbcInputFormat() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(SELECT_ALL_BOOKS) .finish(); jdbcInputFormat.openInputFormat(); @@ -82,7 +82,7 @@ class JdbcInputFormatTest extends JdbcDataTestBase { jdbcInputFormat = JdbcInputFormat.buildJdbcInputFormat() .setDrivername("org.apache.derby.jdbc.idontexist") - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(SELECT_ALL_BOOKS) .setRowTypeInfo(ROW_TYPE_INFO) .finish(); @@ -114,7 +114,7 @@ class JdbcInputFormatTest extends JdbcDataTestBase { jdbcInputFormat = JdbcInputFormat.buildJdbcInputFormat() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery("iamnotsql") .setRowTypeInfo(ROW_TYPE_INFO) .finish(); @@ -145,7 +145,7 @@ class JdbcInputFormatTest extends JdbcDataTestBase { jdbcInputFormat = JdbcInputFormat.buildJdbcInputFormat() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setRowTypeInfo(ROW_TYPE_INFO) .finish(); }) @@ -160,7 +160,7 @@ class JdbcInputFormatTest extends JdbcDataTestBase { jdbcInputFormat = JdbcInputFormat.buildJdbcInputFormat() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(SELECT_ALL_BOOKS) .setRowTypeInfo(ROW_TYPE_INFO) .setFetchSize(-7) @@ -174,7 +174,7 @@ class JdbcInputFormatTest extends JdbcDataTestBase { jdbcInputFormat = JdbcInputFormat.buildJdbcInputFormat() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(SELECT_ALL_BOOKS) .setRowTypeInfo(ROW_TYPE_INFO) .setFetchSize(Integer.MIN_VALUE) @@ -186,7 +186,7 @@ class JdbcInputFormatTest extends JdbcDataTestBase { jdbcInputFormat = JdbcInputFormat.buildJdbcInputFormat() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(SELECT_ALL_BOOKS) .setRowTypeInfo(ROW_TYPE_INFO) .finish(); @@ -205,7 +205,7 @@ class JdbcInputFormatTest extends JdbcDataTestBase { jdbcInputFormat = JdbcInputFormat.buildJdbcInputFormat() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(SELECT_ALL_BOOKS) .setRowTypeInfo(ROW_TYPE_INFO) .setFetchSize(desiredFetchSize) @@ -221,7 +221,7 @@ class JdbcInputFormatTest extends JdbcDataTestBase { jdbcInputFormat = JdbcInputFormat.buildJdbcInputFormat() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(SELECT_ALL_BOOKS) .setRowTypeInfo(ROW_TYPE_INFO) .finish(); @@ -239,7 +239,7 @@ class JdbcInputFormatTest extends JdbcDataTestBase { jdbcInputFormat = JdbcInputFormat.buildJdbcInputFormat() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(SELECT_ALL_BOOKS) .setRowTypeInfo(ROW_TYPE_INFO) .setAutoCommit(desiredAutoCommit) @@ -254,7 +254,7 @@ class JdbcInputFormatTest extends JdbcDataTestBase { jdbcInputFormat = JdbcInputFormat.buildJdbcInputFormat() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(SELECT_ALL_BOOKS) .setRowTypeInfo(ROW_TYPE_INFO) .setResultSetType(ResultSet.TYPE_SCROLL_INSENSITIVE) @@ -287,7 +287,7 @@ class JdbcInputFormatTest extends JdbcDataTestBase { jdbcInputFormat = JdbcInputFormat.buildJdbcInputFormat() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(SELECT_ALL_BOOKS_SPLIT_BY_ID) .setRowTypeInfo(ROW_TYPE_INFO) .setParametersProvider(pramProvider) @@ -325,7 +325,7 @@ class JdbcInputFormatTest extends JdbcDataTestBase { jdbcInputFormat = JdbcInputFormat.buildJdbcInputFormat() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(SELECT_ALL_BOOKS_SPLIT_BY_ID) .setRowTypeInfo(ROW_TYPE_INFO) .setParametersProvider(pramProvider) @@ -363,7 +363,7 @@ class JdbcInputFormatTest extends JdbcDataTestBase { jdbcInputFormat = JdbcInputFormat.buildJdbcInputFormat() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(SELECT_ALL_BOOKS_SPLIT_BY_AUTHOR) .setRowTypeInfo(ROW_TYPE_INFO) .setParametersProvider(paramProvider) @@ -404,7 +404,7 @@ class JdbcInputFormatTest extends JdbcDataTestBase { jdbcInputFormat = JdbcInputFormat.buildJdbcInputFormat() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(SELECT_EMPTY) .setRowTypeInfo(ROW_TYPE_INFO) .setResultSetType(ResultSet.TYPE_SCROLL_INSENSITIVE) diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcRowOutputFormatTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcRowOutputFormatTest.java index f0427c0..fca5d11 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcRowOutputFormatTest.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcRowOutputFormatTest.java @@ -75,7 +75,7 @@ class JdbcRowOutputFormatTest extends JdbcDataTestBase { jdbcOutputFormat = JdbcRowOutputFormat.buildJdbcOutputFormat() .setDrivername("org.apache.derby.jdbc.idontexist") - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(String.format(INSERT_TEMPLATE, INPUT_TABLE)) .finish(); jdbcOutputFormat.open(0, 1); @@ -107,7 +107,7 @@ class JdbcRowOutputFormatTest extends JdbcDataTestBase { jdbcOutputFormat = JdbcRowOutputFormat.buildJdbcOutputFormat() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery("iamnotsql") .finish(); setRuntimeContext(jdbcOutputFormat, true); @@ -140,7 +140,7 @@ class JdbcRowOutputFormatTest extends JdbcDataTestBase { jdbcOutputFormat = JdbcRowOutputFormat.buildJdbcOutputFormat() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(String.format(INSERT_TEMPLATE, INPUT_TABLE)) .finish(); setRuntimeContext(jdbcOutputFormat, true); @@ -168,7 +168,7 @@ class JdbcRowOutputFormatTest extends JdbcDataTestBase { jdbcOutputFormat = JdbcRowOutputFormat.buildJdbcOutputFormat() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(String.format(INSERT_TEMPLATE, OUTPUT_TABLE)) .setSqlTypes( new int[] { @@ -204,7 +204,7 @@ class JdbcRowOutputFormatTest extends JdbcDataTestBase { jdbcOutputFormat = JdbcRowOutputFormat.buildJdbcOutputFormat() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(String.format(INSERT_TEMPLATE, OUTPUT_TABLE)) .setSqlTypes( new int[] { @@ -241,7 +241,7 @@ class JdbcRowOutputFormatTest extends JdbcDataTestBase { jdbcOutputFormat = JdbcRowOutputFormat.buildJdbcOutputFormat() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(String.format(INSERT_TEMPLATE, OUTPUT_TABLE)) .finish(); setRuntimeContext(jdbcOutputFormat, true); @@ -253,7 +253,7 @@ class JdbcRowOutputFormatTest extends JdbcDataTestBase { jdbcOutputFormat.close(); - try (Connection dbConn = DriverManager.getConnection(DERBY_EBOOKSHOP_DB.getUrl()); + try (Connection dbConn = DriverManager.getConnection(DERBY_EBOOKSHOP_DB.getJdbcUrl()); PreparedStatement statement = dbConn.prepareStatement(SELECT_ALL_NEWBOOKS); ResultSet resultSet = statement.executeQuery()) { int recordCount = 0; @@ -275,12 +275,12 @@ class JdbcRowOutputFormatTest extends JdbcDataTestBase { jdbcOutputFormat = JdbcRowOutputFormat.buildJdbcOutputFormat() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(String.format(INSERT_TEMPLATE, OUTPUT_TABLE_2)) .setBatchSize(3) .finish(); setRuntimeContext(jdbcOutputFormat, true); - try (Connection dbConn = DriverManager.getConnection(DERBY_EBOOKSHOP_DB.getUrl()); + try (Connection dbConn = DriverManager.getConnection(DERBY_EBOOKSHOP_DB.getJdbcUrl()); PreparedStatement statement = dbConn.prepareStatement(SELECT_ALL_NEWBOOKS_2)) { jdbcOutputFormat.open(0, 1); for (int i = 0; i < 2; ++i) { @@ -315,7 +315,7 @@ class JdbcRowOutputFormatTest extends JdbcDataTestBase { jdbcOutputFormat = JdbcRowOutputFormat.buildJdbcOutputFormat() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(String.format(INSERT_TEMPLATE, OUTPUT_TABLE_3)) .finish(); setRuntimeContext(jdbcOutputFormat, true); @@ -335,7 +335,7 @@ class JdbcRowOutputFormatTest extends JdbcDataTestBase { jdbcOutputFormat.close(); - try (Connection dbConn = DriverManager.getConnection(DERBY_EBOOKSHOP_DB.getUrl()); + try (Connection dbConn = DriverManager.getConnection(DERBY_EBOOKSHOP_DB.getJdbcUrl()); PreparedStatement statement = dbConn.prepareStatement(SELECT_ALL_NEWBOOKS_3); ResultSet resultSet = statement.executeQuery()) { int recordCount = 0; diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcTestBase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcTestBase.java index ee6b208..a8b673c 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcTestBase.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcTestBase.java @@ -35,7 +35,7 @@ public abstract class JdbcTestBase implements DatabaseTest { @AfterEach public void after() throws Exception { - JdbcTestFixture.cleanupData(getMetadata().getUrl()); + JdbcTestFixture.cleanupData(getMetadata().getJdbcUrl()); JdbcTestFixture.cleanUpDatabasesStatic(getMetadata()); } } diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcTestFixture.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcTestFixture.java index cab8135..ae1c688 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcTestFixture.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcTestFixture.java @@ -210,7 +210,7 @@ public class JdbcTestFixture implements DerbyDatabase { } static void initData(DatabaseMetadata dbMetadata) throws SQLException { - try (Connection conn = DriverManager.getConnection(dbMetadata.getUrl())) { + try (Connection conn = DriverManager.getConnection(dbMetadata.getJdbcUrl())) { insertDataIntoInputTable(conn); } } diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/DatabaseMetadata.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/DatabaseMetadata.java index 3eeed1d..b0956a8 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/DatabaseMetadata.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/DatabaseMetadata.java @@ -29,14 +29,6 @@ import java.sql.DriverManager; /** Describes a database: driver, schema and urls. */ public interface DatabaseMetadata extends Serializable { - default String getUrl() { - return getJdbcUrl(); - } - - default String getUser() { - return getUsername(); - } - String getJdbcUrl(); String getJdbcUrlWithCredentials(); @@ -63,7 +55,7 @@ public interface DatabaseMetadata extends Serializable { default Connection getConnection() { try { Class.forName(getDriverClass()); - return DriverManager.getConnection(getUrl(), getUser(), getPassword()); + return DriverManager.getConnection(getJdbcUrl(), getUsername(), getPassword()); } catch (Exception e) { throw new FlinkRuntimeException(e); } diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/MySqlMetadata.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/MySqlMetadata.java index 58956ad..d553f15 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/MySqlMetadata.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/MySqlMetadata.java @@ -54,7 +54,7 @@ public class MySqlMetadata implements DatabaseMetadata { @Override public String getJdbcUrlWithCredentials() { - return String.format("%s?user=%s&password=%s", this.url, this.username, this.password); + return String.format("%s?user=%s&password=%s", getJdbcUrl(), getUsername(), getPassword()); } @Override diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleDatabase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleDatabase.java index d22994b..3dd4554 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleDatabase.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleDatabase.java @@ -26,17 +26,13 @@ import org.testcontainers.junit.jupiter.Testcontainers; /** A Oracle database for testing. */ @Testcontainers -public interface OracleDatabase extends DatabaseTest { - - String ORACLE_18 = "gvenzl/oracle-xe:18.4.0-slim"; - String ORACLE_21 = "gvenzl/oracle-xe:21.3.0-slim-faststart"; +public interface OracleDatabase extends DatabaseTest, OracleImages { @Container OracleContainer CONTAINER = new OracleContainer(ORACLE_21) .withStartupTimeoutSeconds(240) - .withConnectTimeoutSeconds(120) - .usingSid(); + .withConnectTimeoutSeconds(120); @Override default DatabaseMetadata getMetadata() { diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleDatabase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleImages.java similarity index 56% copy from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleDatabase.java copy to flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleImages.java index d22994b..26e183f 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleDatabase.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleImages.java @@ -17,29 +17,8 @@ package org.apache.flink.connector.jdbc.databases.oracle; -import org.apache.flink.connector.jdbc.databases.DatabaseMetadata; -import org.apache.flink.connector.jdbc.databases.DatabaseTest; - -import org.testcontainers.containers.OracleContainer; -import org.testcontainers.junit.jupiter.Container; -import org.testcontainers.junit.jupiter.Testcontainers; - -/** A Oracle database for testing. */ -@Testcontainers -public interface OracleDatabase extends DatabaseTest { - +/** Oracle docker images. */ +public interface OracleImages { String ORACLE_18 = "gvenzl/oracle-xe:18.4.0-slim"; String ORACLE_21 = "gvenzl/oracle-xe:21.3.0-slim-faststart"; - - @Container - OracleContainer CONTAINER = - new OracleContainer(ORACLE_21) - .withStartupTimeoutSeconds(240) - .withConnectTimeoutSeconds(120) - .usingSid(); - - @Override - default DatabaseMetadata getMetadata() { - return new OracleMetadata(CONTAINER); - } } diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleMetadata.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleMetadata.java index afee02b..b62c0e0 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleMetadata.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleMetadata.java @@ -43,13 +43,7 @@ public class OracleMetadata implements DatabaseMetadata { public OracleMetadata(OracleContainer container, boolean hasXaEnabled) { this.username = container.getUsername(); this.password = container.getPassword(); - this.url = - "jdbc:oracle:thin:@" - + container.getHost() - + ":" - + container.getOraclePort() - + ":" - + container.getSid(); + this.url = container.getJdbcUrl(); this.driver = container.getDriverClassName(); this.version = container.getDockerImageName(); this.xaEnabled = hasXaEnabled; @@ -62,7 +56,7 @@ public class OracleMetadata implements DatabaseMetadata { @Override public String getJdbcUrlWithCredentials() { - return String.format("%s?user=%s&password=%s", this.url, this.username, this.password); + return String.format("%s?user=%s&password=%s", getJdbcUrl(), getUsername(), getPassword()); } @Override diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleDatabase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleXaDatabase.java similarity index 87% copy from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleDatabase.java copy to flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleXaDatabase.java index d22994b..4886dc5 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleDatabase.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleXaDatabase.java @@ -26,10 +26,7 @@ import org.testcontainers.junit.jupiter.Testcontainers; /** A Oracle database for testing. */ @Testcontainers -public interface OracleDatabase extends DatabaseTest { - - String ORACLE_18 = "gvenzl/oracle-xe:18.4.0-slim"; - String ORACLE_21 = "gvenzl/oracle-xe:21.3.0-slim-faststart"; +public interface OracleXaDatabase extends DatabaseTest, OracleImages { @Container OracleContainer CONTAINER = @@ -40,6 +37,6 @@ public interface OracleDatabase extends DatabaseTest { @Override default DatabaseMetadata getMetadata() { - return new OracleMetadata(CONTAINER); + return new OracleMetadata(CONTAINER, true); } } diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/PostgresMetadata.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/PostgresMetadata.java index 562984e..6ed24b0 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/PostgresMetadata.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/PostgresMetadata.java @@ -54,7 +54,7 @@ public class PostgresMetadata implements DatabaseMetadata { @Override public String getJdbcUrlWithCredentials() { - return String.format("%s&user=%s&password=%s", this.url, this.username, this.password); + return String.format("%s&user=%s&password=%s", getJdbcUrl(), getUsername(), getPassword()); } @Override diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/SqlServerMetadata.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/SqlServerMetadata.java index edda8e4..94a52f9 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/SqlServerMetadata.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/SqlServerMetadata.java @@ -54,7 +54,8 @@ public class SqlServerMetadata implements DatabaseMetadata { @Override public String getJdbcUrlWithCredentials() { - return String.format("%s;username=%s;password=%s", getUrl(), getUser(), getPassword()); + return String.format( + "%s;username=%s;password=%s", getJdbcUrl(), getUsername(), getPassword()); } @Override diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/oracle/OracleExactlyOnceSinkE2eTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/oracle/OracleExactlyOnceSinkE2eTest.java index 27a41ae..072131b 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/oracle/OracleExactlyOnceSinkE2eTest.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/oracle/OracleExactlyOnceSinkE2eTest.java @@ -1,28 +1,18 @@ package org.apache.flink.connector.jdbc.dialect.oracle; -import org.apache.flink.connector.jdbc.databases.DatabaseMetadata; -import org.apache.flink.connector.jdbc.databases.oracle.OracleDatabase; -import org.apache.flink.connector.jdbc.databases.oracle.OracleMetadata; +import org.apache.flink.connector.jdbc.databases.oracle.OracleXaDatabase; import org.apache.flink.connector.jdbc.xa.JdbcExactlyOnceSinkE2eTest; import org.apache.flink.util.function.SerializableSupplier; import oracle.jdbc.xa.client.OracleXADataSource; -import org.junit.jupiter.api.condition.DisabledOnOs; -import org.junit.jupiter.api.condition.OS; import javax.sql.XADataSource; import java.sql.SQLException; /** A simple end-to-end test for {@link JdbcExactlyOnceSinkE2eTest}. */ -@DisabledOnOs(OS.MAC) public class OracleExactlyOnceSinkE2eTest extends JdbcExactlyOnceSinkE2eTest - implements OracleDatabase { - - @Override - public DatabaseMetadata getMetadata() { - return new OracleMetadata(CONTAINER, true); - } + implements OracleXaDatabase { @Override public SerializableSupplier<XADataSource> getDataSourceSupplier() { diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/oracle/OracleTableSinkITCase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/oracle/OracleTableSinkITCase.java index a6e1574..605a42f 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/oracle/OracleTableSinkITCase.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/oracle/OracleTableSinkITCase.java @@ -49,8 +49,6 @@ import org.apache.flink.types.Row; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledOnOs; -import org.junit.jupiter.api.condition.OS; import java.math.BigDecimal; import java.sql.Connection; @@ -69,7 +67,6 @@ import static org.apache.flink.table.api.Expressions.$; import static org.apache.flink.table.factories.utils.FactoryMocks.createTableSink; /** The Table Sink ITCase for {@link OracleDialect}. */ -@DisabledOnOs(OS.MAC) class OracleTableSinkITCase extends AbstractTestBase implements OracleDatabase { public static final String OUTPUT_TABLE1 = "dynamicSinkForUpsert"; diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/oracle/OracleTableSourceITCase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/oracle/OracleTableSourceITCase.java index eb07f6b..a891b64 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/oracle/OracleTableSourceITCase.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/oracle/OracleTableSourceITCase.java @@ -30,8 +30,6 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledOnOs; -import org.junit.jupiter.api.condition.OS; import java.sql.Connection; import java.sql.DriverManager; @@ -47,7 +45,6 @@ import java.util.stream.Stream; import static org.assertj.core.api.Assertions.assertThat; /** The Table Source ITCase for {@link OracleDialect}. */ -@DisabledOnOs(OS.MAC) class OracleTableSourceITCase extends AbstractTestBase implements OracleDatabase { private static final String INPUT_TABLE = "oracle_test_table"; diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/sqlserver/SqlServerTableSinkITCase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/sqlserver/SqlServerTableSinkITCase.java index f5101fc..18b8ca0 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/sqlserver/SqlServerTableSinkITCase.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/sqlserver/SqlServerTableSinkITCase.java @@ -196,7 +196,7 @@ class SqlServerTableSinkITCase extends AbstractTestBase implements SqlServerData + ") WITH (" + " 'connector'='jdbc'," + " 'url'='" - + getMetadata().getUrl() + + getMetadata().getJdbcUrl() + "'," + " 'table-name'='" + OUTPUT_TABLE4 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 4966c28..057bbb0 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 @@ -80,7 +80,7 @@ class JdbcFullTest extends JdbcDataTestBase { JdbcOutputFormat.builder() .setOptions( JdbcConnectorOptions.builder() - .setDBUrl(getMetadata().getUrl()) + .setDBUrl(getMetadata().getJdbcUrl()) .setTableName(OUTPUT_TABLE) .build()) .setFieldNames(new String[] {"id", "title", "author", "price", "qty"}) @@ -115,7 +115,7 @@ class JdbcFullTest extends JdbcDataTestBase { JdbcInputFormat.JdbcInputFormatBuilder inputBuilder = JdbcInputFormat.buildJdbcInputFormat() .setDrivername(getMetadata().getDriverClass()) - .setDBUrl(getMetadata().getUrl()) + .setDBUrl(getMetadata().getJdbcUrl()) .setQuery(SELECT_ALL_BOOKS) .setRowTypeInfo(ROW_TYPE_INFO); @@ -138,7 +138,7 @@ class JdbcFullTest extends JdbcDataTestBase { // in PreparedStatement.setObject (see its javadoc for more details) JdbcConnectionOptions connectionOptions = new JdbcConnectionOptions.JdbcConnectionOptionsBuilder() - .withUrl(getMetadata().getUrl()) + .withUrl(getMetadata().getJdbcUrl()) .withDriverName(getMetadata().getDriverClass()) .build(); @@ -162,7 +162,7 @@ class JdbcFullTest extends JdbcDataTestBase { source.output(jdbcOutputFormat); environment.execute(); - try (Connection dbConn = DriverManager.getConnection(getMetadata().getUrl()); + try (Connection dbConn = DriverManager.getConnection(getMetadata().getJdbcUrl()); PreparedStatement statement = dbConn.prepareStatement(SELECT_ALL_NEWBOOKS); ResultSet resultSet = statement.executeQuery()) { int count = 0; diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcTableOutputFormatTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcTableOutputFormatTest.java index 4c0cb19..11eca03 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcTableOutputFormatTest.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcTableOutputFormatTest.java @@ -67,7 +67,7 @@ public class JdbcTableOutputFormatTest extends JdbcDataTestBase { void testUpsertFormatCloseBeforeOpen() throws Exception { JdbcConnectorOptions options = JdbcConnectorOptions.builder() - .setDBUrl(getMetadata().getUrl()) + .setDBUrl(getMetadata().getJdbcUrl()) .setTableName(OUTPUT_TABLE) .build(); JdbcDmlOptions dmlOptions = @@ -102,7 +102,7 @@ public class JdbcTableOutputFormatTest extends JdbcDataTestBase { new TableJdbcUpsertOutputFormat( new SimpleJdbcConnectionProvider( JdbcConnectorOptions.builder() - .setDBUrl(getMetadata().getUrl()) + .setDBUrl(getMetadata().getJdbcUrl()) .setTableName(OUTPUT_TABLE) .build()) { @Override @@ -174,7 +174,7 @@ public class JdbcTableOutputFormatTest extends JdbcDataTestBase { void testJdbcOutputFormat() throws Exception { JdbcConnectorOptions options = JdbcConnectorOptions.builder() - .setDBUrl(getMetadata().getUrl()) + .setDBUrl(getMetadata().getJdbcUrl()) .setTableName(OUTPUT_TABLE) .build(); JdbcDmlOptions dmlOptions = @@ -222,7 +222,7 @@ public class JdbcTableOutputFormatTest extends JdbcDataTestBase { } private void check(Row[] rows) throws SQLException { - check(rows, getMetadata().getUrl(), OUTPUT_TABLE, fieldNames); + check(rows, getMetadata().getJdbcUrl(), OUTPUT_TABLE, fieldNames); } public static void check(Row[] rows, String url, String table, String[] fields) 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 b83d08c..f0407dc 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 @@ -63,10 +63,11 @@ class JdbcAppendOnlyWriterTest extends JdbcTestBase { JdbcOutputFormat.builder() .setOptions( JdbcConnectorOptions.builder() - .setDBUrl(getMetadata().getUrl()) + .setDBUrl(getMetadata().getJdbcUrl()) .setDialect( JdbcDialectLoader.load( - getMetadata().getUrl(), + getMetadata() + .getJdbcUrl(), getClass() .getClassLoader())) .setTableName(OUTPUT_TABLE) diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSinkITCase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSinkITCase.java index 1b6354d..7b4d36d 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSinkITCase.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSinkITCase.java @@ -68,7 +68,7 @@ import static org.apache.flink.table.factories.utils.FactoryMocks.createTableSin /** The ITCase for {@link JdbcDynamicTableSink}. */ class JdbcDynamicTableSinkITCase extends AbstractTestBase { - public static final String DB_URL = DERBY_EBOOKSHOP_DB.getUrl(); + public static final String DB_URL = DERBY_EBOOKSHOP_DB.getJdbcUrl(); public static final String OUTPUT_TABLE1 = "dynamicSinkForUpsert"; public static final String OUTPUT_TABLE2 = "dynamicSinkForAppend"; public static final String OUTPUT_TABLE3 = "dynamicSinkForBatch"; 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 35ff2e8..897d485 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 @@ -92,7 +92,7 @@ class JdbcOutputFormatTest extends JdbcDataTestBase { JdbcConnectorOptions jdbcOptions = JdbcConnectorOptions.builder() .setDriverName("org.apache.derby.jdbc.idontexist") - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setTableName(INPUT_TABLE) .build(); JdbcDmlOptions dmlOptions = @@ -153,7 +153,7 @@ class JdbcOutputFormatTest extends JdbcDataTestBase { JdbcConnectorOptions jdbcOptions = JdbcConnectorOptions.builder() .setDriverName(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setTableName(INPUT_TABLE) .build(); JdbcDmlOptions dmlOptions = @@ -192,7 +192,7 @@ class JdbcOutputFormatTest extends JdbcDataTestBase { JdbcConnectorOptions jdbcOptions = JdbcConnectorOptions.builder() .setDriverName(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setTableName(OUTPUT_TABLE) .build(); JdbcDmlOptions dmlOptions = @@ -233,7 +233,7 @@ class JdbcOutputFormatTest extends JdbcDataTestBase { JdbcConnectorOptions jdbcOptions = JdbcConnectorOptions.builder() .setDriverName(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setTableName(OUTPUT_TABLE) .build(); JdbcDmlOptions dmlOptions = @@ -279,7 +279,7 @@ class JdbcOutputFormatTest extends JdbcDataTestBase { JdbcConnectorOptions jdbcOptions = JdbcConnectorOptions.builder() .setDriverName(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setTableName(OUTPUT_TABLE) .build(); JdbcDmlOptions dmlOptions = @@ -310,7 +310,7 @@ class JdbcOutputFormatTest extends JdbcDataTestBase { outputFormat.close(); - try (Connection dbConn = DriverManager.getConnection(DERBY_EBOOKSHOP_DB.getUrl()); + try (Connection dbConn = DriverManager.getConnection(DERBY_EBOOKSHOP_DB.getJdbcUrl()); PreparedStatement statement = dbConn.prepareStatement(SELECT_ALL_NEWBOOKS); ResultSet resultSet = statement.executeQuery()) { int recordCount = 0; @@ -332,7 +332,7 @@ class JdbcOutputFormatTest extends JdbcDataTestBase { JdbcConnectorOptions jdbcOptions = JdbcConnectorOptions.builder() .setDriverName(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setTableName(OUTPUT_TABLE_2) .build(); JdbcDmlOptions dmlOptions = @@ -355,7 +355,7 @@ class JdbcOutputFormatTest extends JdbcDataTestBase { setRuntimeContext(outputFormat, true); outputFormat.open(0, 1); - try (Connection dbConn = DriverManager.getConnection(DERBY_EBOOKSHOP_DB.getUrl()); + try (Connection dbConn = DriverManager.getConnection(DERBY_EBOOKSHOP_DB.getJdbcUrl()); PreparedStatement statement = dbConn.prepareStatement(SELECT_ALL_NEWBOOKS_2)) { outputFormat.open(0, 1); for (int i = 0; i < 2; ++i) { @@ -402,7 +402,7 @@ class JdbcOutputFormatTest extends JdbcDataTestBase { JdbcConnectorOptions jdbcOptions = JdbcConnectorOptions.builder() .setDriverName(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setTableName(OUTPUT_TABLE_2) .build(); JdbcDmlOptions dmlOptions = @@ -424,7 +424,7 @@ class JdbcOutputFormatTest extends JdbcDataTestBase { .build(); setRuntimeContext(outputFormat, true); - try (Connection dbConn = DriverManager.getConnection(DERBY_EBOOKSHOP_DB.getUrl()); + try (Connection dbConn = DriverManager.getConnection(DERBY_EBOOKSHOP_DB.getJdbcUrl()); PreparedStatement statement = dbConn.prepareStatement(SELECT_ALL_NEWBOOKS_2)) { outputFormat.open(0, 1); for (int i = 0; i < 2; ++i) { @@ -449,7 +449,7 @@ class JdbcOutputFormatTest extends JdbcDataTestBase { JdbcConnectorOptions jdbcOptions = JdbcConnectorOptions.builder() .setDriverName(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setTableName(OUTPUT_TABLE_3) .build(); JdbcDmlOptions dmlOptions = @@ -489,7 +489,7 @@ class JdbcOutputFormatTest extends JdbcDataTestBase { outputFormat.close(); - try (Connection dbConn = DriverManager.getConnection(DERBY_EBOOKSHOP_DB.getUrl()); + try (Connection dbConn = DriverManager.getConnection(DERBY_EBOOKSHOP_DB.getJdbcUrl()); PreparedStatement statement = dbConn.prepareStatement(SELECT_ALL_NEWBOOKS_3); ResultSet resultSet = statement.executeQuery()) { int recordCount = 0; diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormatTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormatTest.java index 1e9ce3a..013e55e 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormatTest.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormatTest.java @@ -67,7 +67,7 @@ class JdbcRowDataInputFormatTest extends JdbcDataTestBase { }; final JdbcDialect dialect = JdbcConnectorOptions.builder() - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setTableName(INPUT_TABLE) .build() .getDialect(); @@ -94,7 +94,7 @@ class JdbcRowDataInputFormatTest extends JdbcDataTestBase { inputFormat = JdbcRowDataInputFormat.builder() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(SELECT_ALL_BOOKS) .build(); inputFormat.openInputFormat(); @@ -109,7 +109,7 @@ class JdbcRowDataInputFormatTest extends JdbcDataTestBase { inputFormat = JdbcRowDataInputFormat.builder() .setDrivername("org.apache.derby.jdbc.idontexist") - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(SELECT_ALL_BOOKS) .setRowConverter(dialect.getRowConverter(rowType)) .build(); @@ -141,7 +141,7 @@ class JdbcRowDataInputFormatTest extends JdbcDataTestBase { inputFormat = JdbcRowDataInputFormat.builder() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery("iamnotsql") .setRowConverter(dialect.getRowConverter(rowType)) .build(); @@ -157,7 +157,7 @@ class JdbcRowDataInputFormatTest extends JdbcDataTestBase { inputFormat = JdbcRowDataInputFormat.builder() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setRowConverter(dialect.getRowConverter(rowType)) .build(); }) @@ -187,7 +187,7 @@ class JdbcRowDataInputFormatTest extends JdbcDataTestBase { inputFormat = JdbcRowDataInputFormat.builder() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(SELECT_ALL_BOOKS) .setFetchSize(-7) .build(); @@ -200,7 +200,7 @@ class JdbcRowDataInputFormatTest extends JdbcDataTestBase { inputFormat = JdbcRowDataInputFormat.builder() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(SELECT_ALL_BOOKS) .setFetchSize(Integer.MIN_VALUE) .setRowConverter(dialect.getRowConverter(rowType)) @@ -212,7 +212,7 @@ class JdbcRowDataInputFormatTest extends JdbcDataTestBase { inputFormat = JdbcRowDataInputFormat.builder() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(SELECT_ALL_BOOKS) .setResultSetType(ResultSet.TYPE_SCROLL_INSENSITIVE) .setRowConverter(dialect.getRowConverter(rowType)) @@ -245,7 +245,7 @@ class JdbcRowDataInputFormatTest extends JdbcDataTestBase { inputFormat = JdbcRowDataInputFormat.builder() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(SELECT_ALL_BOOKS_SPLIT_BY_ID) .setParametersProvider(pramProvider) .setResultSetType(ResultSet.TYPE_SCROLL_INSENSITIVE) @@ -283,7 +283,7 @@ class JdbcRowDataInputFormatTest extends JdbcDataTestBase { inputFormat = JdbcRowDataInputFormat.builder() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(SELECT_ALL_BOOKS_SPLIT_BY_ID) .setParametersProvider(pramProvider) .setResultSetType(ResultSet.TYPE_SCROLL_INSENSITIVE) @@ -321,7 +321,7 @@ class JdbcRowDataInputFormatTest extends JdbcDataTestBase { inputFormat = JdbcRowDataInputFormat.builder() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(SELECT_ALL_BOOKS_SPLIT_BY_AUTHOR) .setParametersProvider(paramProvider) .setResultSetType(ResultSet.TYPE_SCROLL_INSENSITIVE) @@ -363,7 +363,7 @@ class JdbcRowDataInputFormatTest extends JdbcDataTestBase { inputFormat = JdbcRowDataInputFormat.builder() .setDrivername(DERBY_EBOOKSHOP_DB.getDriverClass()) - .setDBUrl(DERBY_EBOOKSHOP_DB.getUrl()) + .setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl()) .setQuery(SELECT_EMPTY) .setResultSetType(ResultSet.TYPE_SCROLL_INSENSITIVE) .setRowConverter(dialect.getRowConverter(rowType)) diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcExactlyOnceSinkE2eTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcExactlyOnceSinkE2eTest.java index 6bde49a..e03a7fa 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcExactlyOnceSinkE2eTest.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcExactlyOnceSinkE2eTest.java @@ -294,11 +294,6 @@ public abstract class JdbcExactlyOnceSinkE2eTest extends JdbcTestBase { private void waitOtherSources() throws InterruptedException { long start = System.currentTimeMillis(); while (running && haveActiveSources()) { - if (System.currentTimeMillis() - start > 10_000) { - // debugging FLINK-22889 (TODO: remove after resolved) - LOG.debug("Slept more than 10s", new Exception()); - start = Long.MAX_VALUE; - } activeSources .get(getRuntimeContext().getAttemptNumber()) .await(100, TimeUnit.MILLISECONDS); @@ -361,7 +356,7 @@ public abstract class JdbcExactlyOnceSinkE2eTest extends JdbcTestBase { @Override public TestEntry map(TestEntry value) throws Exception { if (--remaining <= 0) { - LOG.debug("Mapper failing intentionally"); + LOG.debug("Mapper failing intentionally."); throw new TestException(); } return value;
