You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by fa...@apache.org on 2024/07/29 01:49:24 UTC
(flink-connector-jdbc) branch main updated (099cda71 -> 39ba942c)
This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git
from 099cda71 [hotfix][test] Change the modifier visibility of JUnit5.
new 26655e5e [FLINK-35370] Add temp module to test backward compatibility
new b5c030bb [FLINK-35364] Create core module and move code
new a0011519 [FLINK-35365] Reorganize dialect code
new d8e5665c [FLINK-35365] Reorganize catalog code
new e07ec5f4 [FLINK-35366] Create all database modules
new 2f8995c1 [FLINK-35366] Reorganize database modules packages
new 48842334 [FLINK-35366] Bump containers and fix forkCountItCase
new 0dfaf067 [FLINK-35366] Fix version from release
new 64b4c824 [FLINK-35367] Reorganize sinks
new 231542bb [FLINK-35494] Reorganize sources
new e9d7c321 [FLINK-35788] Deprecate JdbcXaSinkFunction
new 67046e0a [FLINK-35368] Reorganize table code
new 9d535c6f [FLINK-35363] Fix deprecated documentation
new 39ba942c [FLINK-35363] Modify tests to clean up unused docker images
The 14 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/backwards_compatibility.yml | 103 ++++
.../pom.xml | 86 ++++
.../backward/compatibility/DataStreamSinkTest.java | 125 +++++
.../compatibility/DataStreamSourceTest.java | 112 +++--
.../compatibility/DynamicTableSinkTest.java | 107 +---
.../compatibility/DynamicTableSourceTest.java | 45 +-
.../src/test/resources/log4j2-test.properties | 0
.../0c7b60d6-a12c-432d-8a72-747cabaeb7ed | 0
.../0f94f11b-9bc8-445a-8be8-e7dfd8a384b0 | 0
.../4bca2274-65a9-4a61-81ef-767d58233ea0 | 0
.../596bd7eb-1ed5-4963-a56a-941766d61233 | 0
.../6b9ab1b0-c14d-4667-bab5-407b81fba98b | 0
.../b10c194a-0517-4744-830f-81abfb71ab18 | 0
.../d45c3af5-52c6-45fd-9926-75e75e77473a | 0
.../f242ee43-a122-4d2f-a291-6439cdb9029f | 0
.../archunit-violations/stored.rules | 4 +-
flink-connector-jdbc-core/pom.xml | 186 +++++++
.../connector/jdbc/JdbcConnectionOptions.java | 0
.../connector/jdbc/JdbcExactlyOnceOptions.java | 0
.../flink/connector/jdbc/JdbcExecutionOptions.java | 0
.../flink/connector/jdbc/JdbcInputFormat.java | 7 +-
.../flink/connector/jdbc/JdbcRowOutputFormat.java | 0
.../flink/connector/jdbc/JdbcStatementBuilder.java | 0
.../connector/jdbc/core/database/JdbcFactory.java | 41 +-
.../jdbc/core/database/JdbcFactoryLoader.java | 83 +++-
.../database}/catalog/AbstractJdbcCatalog.java | 49 +-
.../jdbc/core/database/catalog/JdbcCatalog.java | 10 +
.../database/catalog/JdbcCatalogTypeMapper.java | 6 +-
.../catalog/factory/JdbcCatalogFactory.java | 27 +-
.../catalog/factory/JdbcCatalogFactoryOptions.java | 6 +-
.../core/database}/dialect/AbstractDialect.java | 12 +-
.../database/dialect/AbstractDialectConverter.java | 6 +-
.../jdbc/core/database}/dialect/JdbcDialect.java | 8 +-
.../database/dialect/JdbcDialectConverter.java | 4 +-
.../flink/connector/jdbc/core/datastream/Jdbc.java | 27 +-
.../jdbc/core/datastream}/sink/JdbcSink.java | 14 +-
.../core/datastream}/sink/JdbcSinkBuilder.java | 2 +-
.../datastream}/sink/committer/JdbcCommitable.java | 2 +-
.../sink/committer/JdbcCommitableSerializer.java | 4 +-
.../datastream}/sink/committer/JdbcCommitter.java | 4 +-
.../core/datastream}/sink/writer/JdbcWriter.java | 4 +-
.../datastream}/sink/writer/JdbcWriterState.java | 2 +-
.../sink/writer/JdbcWriterStateSerializer.java | 2 +-
.../jdbc/core/datastream}/source/JdbcSource.java | 20 +-
.../core/datastream}/source/JdbcSourceBuilder.java | 29 +-
.../core/datastream}/source/JdbcSourceOptions.java | 2 +-
.../enumerator/JdbcSourceEnumStateSerializer.java | 6 +-
.../source/enumerator/JdbcSourceEnumerator.java | 4 +-
.../enumerator/JdbcSourceEnumeratorState.java | 4 +-
.../enumerator/JdbcSqlSplitEnumeratorBase.java | 4 +-
.../enumerator/SqlTemplateSplitEnumerator.java | 6 +-
.../source/reader/JdbcRecordEmitter.java | 6 +-
.../source/reader/JdbcSourceReader.java | 6 +-
.../source/reader/JdbcSourceSplitReader.java | 16 +-
.../datastream}/source/reader/RecordAndOffset.java | 4 +-
.../source/reader/extractor/ResultExtractor.java | 2 +-
.../reader/extractor/RowResultExtractor.java | 2 +-
.../source/split/CheckpointedOffset.java | 2 +-
.../datastream}/source/split/JdbcSourceSplit.java | 2 +-
.../source/split/JdbcSourceSplitSerializer.java | 2 +-
.../source/split/JdbcSourceSplitState.java | 2 +-
.../jdbc/core}/table/JdbcConnectorOptions.java | 4 +-
.../jdbc/core}/table/JdbcDynamicTableFactory.java | 58 +--
.../core/table/sink}/JdbcDynamicTableSink.java | 2 +-
.../core/table/sink}/JdbcOutputFormatBuilder.java | 8 +-
.../core/table/source}/JdbcDynamicTableSource.java | 4 +-
...JdbcFilterPushdownPreparedStatementVisitor.java | 2 +-
.../core/table/source}/JdbcRowDataInputFormat.java | 12 +-
.../table/source}/JdbcRowDataLookupFunction.java | 14 +-
.../core/table/source}/ParameterizedPredicate.java | 2 +-
.../connections/JdbcConnectionProvider.java | 0
.../connections/SimpleJdbcConnectionProvider.java | 0
.../xa/PoolingXaConnectionProvider.java | 0
.../connections/xa/SimpleXaConnectionProvider.java | 0
.../jdbc/datasource/connections/xa/XaCommand.java | 0
.../connections/xa/XaConnectionProvider.java | 0
.../datasource/statements/JdbcQueryStatement.java | 0
.../statements/SimpleJdbcQueryStatement.java | 0
.../datasource/transactions/xa/XaTransaction.java | 2 +-
.../transactions/xa/XaTransactionResult.java | 0
.../transactions/xa/domain/TransactionId.java | 0
.../xa/exceptions/EmptyTransactionXaException.java | 9 +-
.../xa/exceptions/TransientXaException.java | 0
.../transactions/xa/exceptions/XaError.java | 0
.../datasource/transactions/xa/xid}/XidImpl.java | 6 +-
.../transactions/xa/xid}/XidSerializer.java | 2 +-
.../jdbc/derby/database/DerbyFactory.java | 23 +-
.../jdbc/derby/database}/dialect/DerbyDialect.java | 10 +-
.../database/dialect/DerbyDialectConverter.java | 8 +-
.../jdbc/internal/GenericJdbcSinkFunction.java | 0
.../connector/jdbc/internal/JdbcOutputFormat.java | 0
.../jdbc/internal/JdbcOutputSerializer.java | 0
.../jdbc/internal/RowJdbcOutputFormat.java | 0
.../jdbc/internal/TableJdbcUpsertOutputFormat.java | 0
.../executor/InsertOrUpdateJdbcExecutor.java | 0
.../executor/JdbcBatchStatementExecutor.java | 0
.../executor/KeyedBatchStatementExecutor.java | 0
.../executor/SimpleBatchStatementExecutor.java | 0
.../TableBufferReducedStatementExecutor.java | 0
.../executor/TableBufferedStatementExecutor.java | 0
.../TableInsertOrUpdateStatementExecutor.java | 14 +-
.../executor/TableSimpleStatementExecutor.java | 7 +-
.../options/InternalJdbcConnectionOptions.java | 8 +-
.../jdbc/internal/options/JdbcDmlOptions.java | 2 +-
.../jdbc/internal/options/JdbcInsertOptions.java | 0
.../jdbc/internal/options/JdbcReadOptions.java | 0
.../internal/options/JdbcTypedQueryOptions.java | 0
.../CompositeJdbcParameterValuesProvider.java | 0
.../split/JdbcGenericParameterValuesProvider.java | 0
.../JdbcNumericBetweenParametersProvider.java | 0
.../jdbc/split/JdbcParameterValuesProvider.java | 0
.../split/JdbcSlideTimingParameterProvider.java | 0
.../statement/FieldNamedPreparedStatement.java | 0
.../statement/FieldNamedPreparedStatementImpl.java | 0
.../connector/jdbc/statement/StatementFactory.java | 0
.../jdbc/utils/ContinuousUnBoundingSettings.java | 0
.../flink/connector/jdbc/utils/JdbcTypeUtil.java | 0
.../flink/connector/jdbc/utils/JdbcUtils.java | 4 +-
....flink.connector.jdbc.core.database.JdbcFactory | 10 +-
.../org.apache.flink.table.factories.Factory | 4 +-
.../ProductionCodeArchitectureTest.java | 0
.../architecture/TestCodeArchitectureTest.java | 0
.../reader/splitreader/TestingSplitsChange.java | 2 +-
.../connector/jdbc/JdbcConnectionOptionsTest.java | 0
.../flink/connector/jdbc/JdbcDataTestBase.java | 4 +-
.../apache/flink/connector/jdbc/JdbcITCase.java | 22 +-
.../flink/connector/jdbc/JdbcInputFormatTest.java | 0
.../connector/jdbc/JdbcRowOutputFormatTest.java | 0
.../apache/flink/connector/jdbc/JdbcTestBase.java | 2 +-
.../flink/connector/jdbc/JdbcTestCheckpoint.java | 0
.../flink/connector/jdbc/JdbcTestFixture.java | 2 +-
.../database/catalog/AbstractJdbcCatalogTest.java | 15 +-
.../database/dialect/JdbcDialectConverterTest.java | 10 +-
.../core/database/dialect/JdbcDialectTest.java | 63 +--
.../datastream}/sink/AtLeastOnceJdbcSinkTest.java | 2 +-
.../core/datastream}/sink/BaseJdbcSinkTest.java | 8 +-
.../datastream}/sink/ExactlyOnceJdbcSinkTest.java | 2 +-
.../sink/writer/AlLeastOnceJdbcWriterTest.java | 4 +-
.../sink/writer/BaseJdbcWriterTest.java | 12 +-
.../sink/writer/ExactlyOnceJdbcWriterTest.java | 4 +-
.../sink/writer/JdbcWriterStateSerializerTest.java | 7 +-
.../sink/writer/JdbcWriterStateTest.java | 7 +-
.../datastream}/source/JdbcSourceBuilderTest.java | 12 +-
.../core/datastream}/source/JdbcSourceITCase.java | 7 +-
.../source/JdbcSourceStreamRelatedITCase.java | 11 +-
.../JdbcSourceEnumStateSerializerTest.java | 13 +-
.../enumerator/JdbcSourceEnumeratorTest.java | 11 +-
.../source/reader/JdbcSourceReaderTest.java | 10 +-
.../source/reader/JdbcSourceSplitReaderTest.java | 11 +-
.../split/JdbcSourceSplitSerializerTest.java | 7 +-
.../core}/table/JdbcDynamicTableFactoryTest.java | 4 +-
.../jdbc/core}/table/JdbcTablePlanTest.java | 2 +-
.../core/table/sink}/JdbcAppendOnlyWriterTest.java | 6 +-
.../table/sink}/JdbcDynamicTableSinkITCase.java | 2 +-
.../core/table/sink}/JdbcOutputFormatTest.java | 2 +-
.../source}/JdbcDynamicTableSourceITCase.java | 2 +-
...FilterPushdownPreparedStatementVisitorTest.java | 8 +-
.../core/table/source}/JdbcLookupTestBase.java | 4 +-
.../table/source}/JdbcRowDataInputFormatTest.java | 4 +-
.../source}/JdbcRowDataLookupFunctionTest.java | 2 +-
.../xa/SimpleXaConnectionProviderTest.java | 2 +-
.../xa/TransactionIdConnectionTest.java | 2 +-
.../transactions/xa/domain/TransactionIdTest.java | 0
.../datasource/transactions/xa/xid}/XaXidTest.java | 7 +-
.../transactions/xa/xid}/XidSerializersTest.java | 2 +-
.../flink/connector/jdbc}/derby/DerbyTestBase.java | 4 +-
.../jdbc/derby/database/DerbyDialectTest.java | 31 +-
.../derby/table/DerbyDynamicTableSinkITCase.java | 8 +-
.../derby/table/DerbyDynamicTableSourceITCase.java | 8 +-
.../jdbc/derby/testutils}/DerbyDatabase.java | 59 ++-
.../jdbc/derby/testutils}/DerbyMetadata.java | 2 +-
.../flink/connector/jdbc/fakedb/FakeDBUtils.java | 0
.../jdbc/fakedb/driver/FakeConnection.java | 0
.../jdbc/fakedb/driver/FakeConnection1.java | 0
.../jdbc/fakedb/driver/FakeConnection2.java | 0
.../jdbc/fakedb/driver/FakeConnection3.java | 0
.../connector/jdbc/fakedb/driver/FakeDriver1.java | 0
.../connector/jdbc/fakedb/driver/FakeDriver2.java | 0
.../connector/jdbc/fakedb/driver/FakeDriver3.java | 0
.../flink/connector/jdbc}/h2/H2XaTestBase.java | 4 +-
.../connector/jdbc/h2/testutils}/H2Metadata.java | 4 +-
.../connector/jdbc/h2/testutils}/H2XaDatabase.java | 45 +-
.../h2/testutils}/xa/H2XaConnectionWrapper.java | 2 +-
.../jdbc/h2/testutils}/xa/H2XaDsWrapper.java | 2 +-
.../jdbc/h2/testutils}/xa/H2XaResourceWrapper.java | 2 +-
.../jdbc/h2/testutils}/xa/package-info.java | 4 +-
.../connector/jdbc/internal/JdbcFullTest.java | 0
.../jdbc/internal/JdbcOutputSerializerTest.java | 0
.../jdbc/internal/JdbcTableOutputFormatTest.java | 0
...ProviderDriverClassConcurrentLoadingITCase.java | 0
.../SimpleJdbcConnectionProviderTest.java | 0
.../NumericBetweenParametersProviderTest.java | 0
.../jdbc/testutils/DatabaseExtension.java | 88 ++--
.../connector/jdbc/testutils/DatabaseMetadata.java | 0
.../connector/jdbc/testutils/DatabaseResource.java | 15 +
.../connector/jdbc/testutils/DatabaseTest.java | 0
.../connector/jdbc/testutils/JdbcITCaseBase.java | 0
.../connector/jdbc/testutils/TableManaged.java | 0
.../testutils/functions/JdbcResultSetBuilder.java | 0
.../jdbc/testutils/resources/DockerResource.java | 61 +++
.../jdbc/testutils/resources/MemoryResource.java | 6 +
.../connector/jdbc/testutils/tables/TableBase.java | 0
.../jdbc/testutils/tables/TableBuilder.java | 0
.../jdbc/testutils/tables/TableBuilderTest.java | 0
.../jdbc/testutils/tables/TableField.java | 0
.../connector/jdbc/testutils/tables/TableRow.java | 0
.../testutils/tables/templates/BooksTable.java | 0
.../connector/jdbc/utils/JdbcTypeUtilTest.java | 0
.../resources/META-INF/services/java.sql.Driver | 0
.../src/test/resources/archunit.properties | 0
.../src/test/resources/log4j2-test.properties | 0
.../jdbc/core}/table/JdbcTablePlanTest.xml | 0
flink-connector-jdbc-cratedb/pom.xml | 118 +++++
.../jdbc/cratedb/database/CrateDBFactory.java | 25 +-
.../cratedb/database}/catalog/CrateDBCatalog.java | 4 +-
.../database}/catalog/CrateDBTablePath.java | 6 +-
.../database}/catalog/CrateDBTypeMapper.java | 4 +-
.../cratedb/database}/dialect/CrateDBDialect.java | 16 +-
.../database/dialect/CrateDBDialectConverter.java | 14 +-
....flink.connector.jdbc.core.database.JdbcFactory | 3 +-
.../connector/jdbc/cratedb}/CrateDBTestBase.java | 4 +-
.../database}/catalog/CrateDBCatalogITCase.java | 4 +-
.../database}/catalog/CrateDBCatalogTest.java | 19 +-
.../database}/catalog/CrateDBCatalogTestBase.java | 27 +-
.../database}/catalog/CrateDBTablePathTest.java | 2 +-
.../database/dialect/CrateDBDialectTest.java | 14 +-
.../jdbc/cratedb/testutils}/CrateDBDatabase.java | 17 +-
.../jdbc/cratedb/testutils/CrateDBImages.java | 6 +-
.../jdbc/cratedb/testutils}/CrateDBMetadata.java | 2 +-
.../src/test/resources/log4j2-test.properties | 0
flink-connector-jdbc-db2/pom.xml | 103 ++++
.../connector/jdbc/db2/database/Db2Factory.java | 23 +-
.../jdbc/db2/database}/dialect/Db2Dialect.java | 12 +-
.../db2/database/dialect/Db2DialectConverter.java | 10 +-
....flink.connector.jdbc.core.database.JdbcFactory | 3 +-
.../flink/connector/jdbc}/db2/Db2TestBase.java | 4 +-
.../jdbc/db2/database/dialect/Db2DialectTest.java | 13 +-
.../dialect/Db2PreparedStatementTest.java | 9 +-
.../database}/table/Db2DynamicTableSinkITCase.java | 8 +-
.../table/Db2DynamicTableSourceITCase.java | 8 +-
.../connector/jdbc/db2/testutils}/Db2Database.java | 16 +-
.../connector/jdbc/db2/testutils/Db2Images.java | 6 +
.../connector/jdbc/db2/testutils}/Db2Metadata.java | 2 +-
.../src/test/resources/log4j2-test.properties | 0
flink-connector-jdbc-mysql/pom.xml | 108 ++++
.../jdbc/mysql/database/MySqlFactory.java | 24 +-
.../jdbc/mysql/database}/catalog/MySqlCatalog.java | 8 +-
.../mysql/database}/catalog/MySqlTypeMapper.java | 9 +-
.../database/dialect/MySQLDialectConverter.java | 8 +-
.../jdbc/mysql/database}/dialect/MySqlDialect.java | 10 +-
....flink.connector.jdbc.core.database.JdbcFactory | 3 +-
.../flink/connector/jdbc}/mysql/MySqlTestBase.java | 4 +-
.../database}/catalog/MySqlCatalogITCase.java | 4 +-
.../database}/catalog/MySqlCatalogTestBase.java | 2 +-
.../mysql/database/dialect/MySqlDialectTest.java | 30 +-
.../dialect/MysqlPreparedStatementTest.java | 12 +-
.../mysql/table/MySqlDynamicTableSinkITCase.java | 8 +-
.../mysql/table/MySqlDynamicTableSourceITCase.java | 8 +-
.../mysql/table/UnsignedTypeConversionITCase.java | 4 +-
.../jdbc/mysql/testutils}/MySqlContainer.java | 2 +-
.../jdbc/mysql/testutils}/MySqlDatabase.java | 14 +-
.../jdbc/mysql/testutils}/MySqlImages.java | 6 +-
.../jdbc/mysql/testutils}/MySqlMetadata.java | 2 +-
.../src/test/resources/log4j2-test.properties | 0
flink-connector-jdbc-oceanbase/pom.xml | 117 +++++
.../jdbc/oceanbase/database/OceanBaseFactory.java | 25 +-
.../database}/dialect/OceanBaseDialect.java | 14 +-
.../dialect/OceanBaseDialectConverter.java | 8 +-
....flink.connector.jdbc.core.database.JdbcFactory | 3 +-
.../jdbc}/oceanbase/OceanBaseMysqlTestBase.java | 6 +-
.../jdbc}/oceanbase/OceanBaseOracleTestBase.java | 12 +-
.../database}/dialect/OceanBaseDialectTest.java | 2 +-
.../dialect/OceanBaseMysqlDialectTest.java | 18 +-
.../dialect/OceanBaseOracleDialectTest.java | 18 +-
.../OceanBaseMySqlDynamicTableSinkITCase.java | 6 +-
.../OceanBaseMySqlDynamicTableSourceITCase.java | 6 +-
.../OceanBaseOracleDynamicTableSinkITCase.java | 6 +-
.../OceanBaseOracleDynamicTableSourceITCase.java | 6 +-
.../jdbc}/oceanbase/table/OceanBaseTableRow.java | 2 +-
.../oceanbase/testutils}/OceanBaseDatabase.java | 33 +-
.../jdbc/oceanbase/testutils}/OceanBaseImages.java | 7 +-
.../oceanbase/testutils}/OceanBaseMetadata.java | 6 +-
.../src/test/resources/log4j2-test.properties | 0
flink-connector-jdbc-oracle/pom.xml | 101 ++++
.../jdbc/oracle/database/OracleFactory.java | 23 +-
.../oracle/database}/dialect/OracleDialect.java | 10 +-
.../database/dialect/OracleDialectConverter.java | 8 +-
....flink.connector.jdbc.core.database.JdbcFactory | 3 +-
.../connector/jdbc}/oracle/OracleTestBase.java | 4 +-
.../oracle/database/dialect/OracleDialectTest.java | 14 +-
.../dialect/OraclePreparedStatementTest.java | 8 +-
.../oracle/table/OracleDynamicTableSinkITCase.java | 52 +-
.../table/OracleDynamicTableSourceITCase.java | 53 +-
.../oracle/table/OracleTableSourceITCase.java | 66 ++-
.../jdbc/oracle/testutils}/OracleDatabase.java | 12 +-
.../jdbc/oracle/testutils}/OracleImages.java | 3 +-
.../jdbc/oracle/testutils}/OracleMetadata.java | 2 +-
.../src/test/resources/log4j2-test.properties | 0
flink-connector-jdbc-postgres/pom.xml | 123 +++++
.../jdbc/postgres/database/PostgresFactory.java | 25 +-
.../database}/catalog/PostgresCatalog.java | 12 +-
.../database}/catalog/PostgresTablePath.java | 2 +-
.../database}/catalog/PostgresTypeMapper.java | 6 +-
.../dialect/CompatiblePostgresDialect.java | 29 +-
.../CompatiblePostgresDialectConverter.java | 20 +-
.../postgres/database/dialect/PostgresDialect.java | 25 +-
.../database/dialect/PostgresDialectConverter.java | 20 +-
....flink.connector.jdbc.core.database.JdbcFactory | 3 +-
.../connector/jdbc}/postgres/PostgresTestBase.java | 4 +-
.../postgres/database/PostgresFactoryTest.java | 25 +-
.../database}/catalog/PostgresCatalogITCase.java | 4 +-
.../database}/catalog/PostgresCatalogTest.java | 18 +-
.../database}/catalog/PostgresCatalogTestBase.java | 6 +-
.../database}/catalog/PostgresTablePathTest.java | 2 +-
.../database/dialect/PostgresDialectTest.java | 14 +-
.../table/PostgresDynamicTableSinkITCase.java | 8 +-
.../table/PostgresDynamicTableSourceITCase.java | 8 +-
.../jdbc/postgres/testutils}/PostgresDatabase.java | 15 +-
.../jdbc/postgres/testutils}/PostgresImages.java | 6 +-
.../jdbc/postgres/testutils}/PostgresMetadata.java | 5 +-
.../src/test/resources/log4j2-test.properties | 0
flink-connector-jdbc-sqlserver/pom.xml | 102 ++++
.../jdbc/sqlserver/database/SqlServerFactory.java | 23 +-
.../database}/dialect/SqlServerDialect.java | 10 +-
.../dialect/SqlServerDialectConverter.java | 8 +-
....flink.connector.jdbc.core.database.JdbcFactory | 3 +-
.../jdbc}/sqlserver/SqlServerTestBase.java | 4 +-
.../dialect/SqlServerPreparedStatementTest.java | 8 +-
.../table/SqlServerDynamicTableSinkITCase.java | 8 +-
.../table/SqlServerDynamicTableSourceITCase.java | 8 +-
.../table/SqlServerTableSourceITCase.java | 6 +-
.../sqlserver/testutils}/SqlServerDatabase.java | 12 +-
.../jdbc/sqlserver/testutils}/SqlServerImages.java | 2 +-
.../sqlserver/testutils}/SqlServerMetadata.java | 2 +-
.../src/test/resources/log4j2-test.properties | 0
flink-connector-jdbc-trino/pom.xml | 112 +++++
.../jdbc/trino/database/TrinoFactory.java | 23 +-
.../jdbc/trino/database}/dialect/TrinoDialect.java | 10 +-
.../database/dialect/TrinoDialectConverter.java | 8 +-
....flink.connector.jdbc.core.database.JdbcFactory | 3 +-
.../flink/connector/jdbc}/trino/TrinoTestBase.java | 6 +-
.../trino/database/dialect/TrinoDialectTest.java | 17 +-
.../dialect/TrinoPreparedStatementTest.java | 9 +-
.../trino/table/TrinoDynamicTableSinkITCase.java | 8 +-
.../trino/table/TrinoDynamicTableSourceITCase.java | 8 +-
.../jdbc/trino/testutils}/TrinoDatabase.java | 81 +--
.../jdbc/trino/testutils}/TrinoImages.java | 4 +-
.../jdbc/trino/testutils}/TrinoMetadata.java | 2 +-
.../src/test/resources/log4j2-test.properties | 0
flink-connector-jdbc/pom.xml | 257 +++-------
.../org/apache/flink/connector/jdbc/JdbcSink.java | 11 +-
.../jdbc/catalog/AbstractJdbcCatalog.java | 547 +--------------------
.../flink/connector/jdbc/catalog/JdbcCatalog.java | 8 +-
.../connector/jdbc/catalog/JdbcCatalogUtils.java | 57 ++-
.../jdbc/catalog/factory/JdbcCatalogFactory.java | 24 +-
.../jdbc/converter/AbstractJdbcRowConverter.java | 253 +---------
.../connector/jdbc/converter/JdbcRowConverter.java | 29 +-
.../connector/jdbc/dialect/AbstractDialect.java | 244 +--------
.../flink/connector/jdbc/dialect/JdbcDialect.java | 135 +----
.../connector/jdbc/dialect/JdbcDialectFactory.java | 53 +-
.../jdbc/dialect/JdbcDialectTypeMapper.java | 19 +-
.../apache/flink/connector/jdbc/sink/JdbcSink.java | 14 +-
.../flink/connector/jdbc/sink/JdbcSinkBuilder.java | 7 +-
.../flink/connector/jdbc/source/JdbcSource.java | 25 +-
.../connector/jdbc/source/JdbcSourceBuilder.java | 32 +-
.../source/reader/extractor/ResultExtractor.java | 34 +-
.../connector/jdbc/table/JdbcConnectorOptions.java | 168 +------
.../flink/connector/jdbc/xa/CheckpointAndXid.java | 1 +
.../jdbc/xa/CheckpointAndXidSerializer.java | 2 +
.../connector/jdbc/xa/JdbcXaSinkFunction.java | 1 +
.../connector/jdbc/xa/JdbcXaSinkFunctionState.java | 1 +
.../apache/flink/connector/jdbc/xa/JobSubtask.java | 1 +
.../connector/jdbc/xa/SemanticXidGenerator.java | 2 +
.../apache/flink/connector/jdbc/xa/XaFacade.java | 1 +
.../flink/connector/jdbc/xa/XaFacadeImpl.java | 1 +
.../connector/jdbc/xa/XaFacadePoolingImpl.java | 1 +
.../apache/flink/connector/jdbc/xa/XaGroupOps.java | 1 +
.../flink/connector/jdbc/xa/XaGroupOpsImpl.java | 1 +
.../connector/jdbc/xa/XaSinkStateHandler.java | 1 +
.../connector/jdbc/xa/XaSinkStateHandlerImpl.java | 1 +
.../connector/jdbc/xa/XaSinkStateSerializer.java | 2 +
.../flink/connector/jdbc/xa/XidGenerator.java | 1 +
.../flink/connector/jdbc/xa/package-info.java | 1 +
.../org.apache.flink.table.factories.Factory | 1 -
.../db2/xa/Db2ExactlyOnceSinkE2eTest.java | 25 -
.../derby/xa/DerbyExactlyOnceSinkE2eTest.java | 28 --
.../mysql/catalog/MySql56CatalogITCase.java | 35 --
.../mysql/catalog/MySql57CatalogITCase.java | 34 --
.../databases/mysql/dialect/MySqlDialectTest.java | 41 --
.../mysql/xa/MySqlExactlyOnceSinkE2eTest.java | 28 --
.../oracle/xa/OracleExactlyOnceSinkE2eTest.java | 25 -
.../xa/PostgresExactlyOnceSinkE2eTest.java | 29 --
.../xa/SqlServerExactlyOnceSinkE2eTest.java | 29 --
.../jdbc/dialect/JdbcDialectTypeTest.java | 122 +----
.../testutils/databases/mysql/MySql56Database.java | 57 ---
.../testutils/databases/mysql/MySql57Database.java | 57 ---
.../databases/oceanbase/OceanBaseContainer.java | 74 ---
.../databases/oceanbase/OceanBaseTestDatabase.java | 25 -
.../jdbc/xa/CheckpointAndXidSerializersTest.java | 2 +
.../jdbc/xa/JdbcExactlyOnceSinkE2eTest.java | 29 +-
.../connector/jdbc/xa/JdbcXaFacadeImplTest.java | 1 +
.../connector/jdbc/xa/JdbcXaFacadeTestHelper.java | 1 +
.../connector/jdbc/xa/JdbcXaSinkDerbyTest.java | 1 +
.../flink/connector/jdbc/xa/JdbcXaSinkH2Test.java | 7 +-
.../connector/jdbc/xa/JdbcXaSinkMigrationTest.java | 7 +-
.../jdbc/xa/JdbcXaSinkNoInsertionTest.java | 5 +-
.../connector/jdbc/xa/JdbcXaSinkTestBase.java | 1 +
.../connector/jdbc/xa/JdbcXaSinkTestHelper.java | 1 +
.../jdbc/xa/SemanticXidGeneratorTest.java | 2 +
pom.xml | 33 +-
410 files changed, 3459 insertions(+), 3530 deletions(-)
create mode 100644 .github/workflows/backwards_compatibility.yml
create mode 100644 flink-connector-jdbc-backward-compatibility/pom.xml
create mode 100644 flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DataStreamSinkTest.java
copy flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceITCase.java => flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DataStreamSourceTest.java (53%)
copy flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSinkITCase.java => flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DynamicTableSinkTest.java (76%)
copy flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSourceITCase.java => flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DynamicTableSourceTest.java (95%)
copy {flink-connector-jdbc => flink-connector-jdbc-backward-compatibility}/src/test/resources/log4j2-test.properties (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/archunit-violations/0c7b60d6-a12c-432d-8a72-747cabaeb7ed (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/archunit-violations/0f94f11b-9bc8-445a-8be8-e7dfd8a384b0 (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/archunit-violations/4bca2274-65a9-4a61-81ef-767d58233ea0 (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/archunit-violations/596bd7eb-1ed5-4963-a56a-941766d61233 (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/archunit-violations/6b9ab1b0-c14d-4667-bab5-407b81fba98b (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/archunit-violations/b10c194a-0517-4744-830f-81abfb71ab18 (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/archunit-violations/d45c3af5-52c6-45fd-9926-75e75e77473a (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/archunit-violations/f242ee43-a122-4d2f-a291-6439cdb9029f (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/archunit-violations/stored.rules (97%)
create mode 100644 flink-connector-jdbc-core/pom.xml
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/JdbcConnectionOptions.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/JdbcExactlyOnceOptions.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/JdbcExecutionOptions.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/JdbcInputFormat.java (98%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/JdbcRowOutputFormat.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/JdbcStatementBuilder.java (100%)
copy flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectFactory.java => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/JdbcFactory.java (60%)
rename flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectLoader.java => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/JdbcFactoryLoader.java (54%)
copy {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database}/catalog/AbstractJdbcCatalog.java (92%)
create mode 100644 flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/JdbcCatalog.java
copy flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/JdbcCatalogTypeMapper.java (87%)
copy {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database}/catalog/factory/JdbcCatalogFactory.java (65%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database}/catalog/factory/JdbcCatalogFactoryOptions.java (89%)
copy {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database}/dialect/AbstractDialect.java (97%)
copy flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/dialect/AbstractDialectConverter.java (98%)
copy {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database}/dialect/JdbcDialect.java (96%)
copy flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/JdbcRowConverter.java => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/dialect/JdbcDialectConverter.java (93%)
copy flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/statements/JdbcQueryStatement.java => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/Jdbc.java (54%)
copy {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/sink/JdbcSink.java (87%)
copy {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/sink/JdbcSinkBuilder.java (98%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/sink/committer/JdbcCommitable.java (93%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/sink/committer/JdbcCommitableSerializer.java (88%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/sink/committer/JdbcCommitter.java (93%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/sink/writer/JdbcWriter.java (98%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/sink/writer/JdbcWriterState.java (98%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/sink/writer/JdbcWriterStateSerializer.java (97%)
copy {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/source/JdbcSource.java (89%)
copy {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/source/JdbcSourceBuilder.java (91%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/source/JdbcSourceOptions.java (97%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/source/enumerator/JdbcSourceEnumStateSerializer.java (94%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/source/enumerator/JdbcSourceEnumerator.java (98%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/source/enumerator/JdbcSourceEnumeratorState.java (95%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/source/enumerator/JdbcSqlSplitEnumeratorBase.java (95%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/source/enumerator/SqlTemplateSplitEnumerator.java (95%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/source/reader/JdbcRecordEmitter.java (86%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/source/reader/JdbcSourceReader.java (91%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/source/reader/JdbcSourceSplitReader.java (94%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/source/reader/RecordAndOffset.java (91%)
copy {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/source/reader/extractor/ResultExtractor.java (95%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/source/reader/extractor/RowResultExtractor.java (94%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/source/split/CheckpointedOffset.java (97%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/source/split/JdbcSourceSplit.java (98%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/source/split/JdbcSourceSplitSerializer.java (98%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream}/source/split/JdbcSourceSplitState.java (98%)
copy {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core}/table/JdbcConnectorOptions.java (98%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core}/table/JdbcDynamicTableFactory.java (84%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/sink}/JdbcDynamicTableSink.java (98%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/sink}/JdbcOutputFormatBuilder.java (97%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/source}/JdbcDynamicTableSource.java (98%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/source}/JdbcFilterPushdownPreparedStatementVisitor.java (99%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/source}/JdbcRowDataInputFormat.java (97%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/source}/JdbcRowDataLookupFunction.java (94%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/source}/ParameterizedPredicate.java (96%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/JdbcConnectionProvider.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/SimpleJdbcConnectionProvider.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/xa/PoolingXaConnectionProvider.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/xa/SimpleXaConnectionProvider.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/xa/XaCommand.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/xa/XaConnectionProvider.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/datasource/statements/JdbcQueryStatement.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/datasource/statements/SimpleJdbcQueryStatement.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/XaTransaction.java (99%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/XaTransactionResult.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/domain/TransactionId.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/EmptyTransactionXaException.java (60%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/TransientXaException.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/XaError.java (100%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid}/XidImpl.java (93%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid}/XidSerializer.java (98%)
rename flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyDialectFactory.java => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/derby/database/DerbyFactory.java (58%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/derby => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/derby/database}/dialect/DerbyDialect.java (91%)
rename flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyRowConverter.java => flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/derby/database/dialect/DerbyDialectConverter.java (81%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/internal/GenericJdbcSinkFunction.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/internal/JdbcOutputFormat.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/internal/JdbcOutputSerializer.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/internal/RowJdbcOutputFormat.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/internal/TableJdbcUpsertOutputFormat.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/internal/executor/InsertOrUpdateJdbcExecutor.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/internal/executor/JdbcBatchStatementExecutor.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/internal/executor/KeyedBatchStatementExecutor.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/internal/executor/SimpleBatchStatementExecutor.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableBufferReducedStatementExecutor.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableBufferedStatementExecutor.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableInsertOrUpdateStatementExecutor.java (91%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableSimpleStatementExecutor.java (90%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/internal/options/InternalJdbcConnectionOptions.java (96%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcDmlOptions.java (98%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcInsertOptions.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcReadOptions.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcTypedQueryOptions.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/split/CompositeJdbcParameterValuesProvider.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/split/JdbcGenericParameterValuesProvider.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/split/JdbcNumericBetweenParametersProvider.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/split/JdbcParameterValuesProvider.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/split/JdbcSlideTimingParameterProvider.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatement.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatementImpl.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/statement/StatementFactory.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/utils/ContinuousUnBoundingSettings.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/utils/JdbcTypeUtil.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/java/org/apache/flink/connector/jdbc/utils/JdbcUtils.java (97%)
rename flink-connector-jdbc/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.dialect.JdbcDialectFactory => flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory (52%)
copy {flink-connector-jdbc => flink-connector-jdbc-core}/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory (84%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/architecture/ProductionCodeArchitectureTest.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/architecture/TestCodeArchitectureTest.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/base/source/reader/splitreader/TestingSplitsChange.java (92%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/JdbcConnectionOptionsTest.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/JdbcDataTestBase.java (94%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/JdbcITCase.java (87%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/JdbcInputFormatTest.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/JdbcRowOutputFormatTest.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/JdbcTestBase.java (97%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/JdbcTestCheckpoint.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/JdbcTestFixture.java (99%)
rename flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtilsTest.java => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/database/catalog/AbstractJdbcCatalogTest.java (71%)
rename flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverterTest.java => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/database/dialect/JdbcDialectConverterTest.java (89%)
copy flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeTest.java => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/database/dialect/JdbcDialectTest.java (54%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream}/sink/AtLeastOnceJdbcSinkTest.java (96%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream}/sink/BaseJdbcSinkTest.java (95%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream}/sink/ExactlyOnceJdbcSinkTest.java (95%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream}/sink/writer/AlLeastOnceJdbcWriterTest.java (94%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream}/sink/writer/BaseJdbcWriterTest.java (94%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream}/sink/writer/ExactlyOnceJdbcWriterTest.java (95%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream}/sink/writer/JdbcWriterStateSerializerTest.java (85%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream}/sink/writer/JdbcWriterStateTest.java (86%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream}/source/JdbcSourceBuilderTest.java (93%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream}/source/JdbcSourceITCase.java (97%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream}/source/JdbcSourceStreamRelatedITCase.java (97%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream}/source/enumerator/JdbcSourceEnumStateSerializerTest.java (88%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream}/source/enumerator/JdbcSourceEnumeratorTest.java (91%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream}/source/reader/JdbcSourceReaderTest.java (90%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream}/source/reader/JdbcSourceSplitReaderTest.java (94%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream}/source/split/JdbcSourceSplitSerializerTest.java (94%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core}/table/JdbcDynamicTableFactoryTest.java (98%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core}/table/JdbcTablePlanTest.java (99%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/sink}/JdbcAppendOnlyWriterTest.java (96%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/sink}/JdbcDynamicTableSinkITCase.java (99%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/sink}/JdbcOutputFormatTest.java (99%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/source}/JdbcDynamicTableSourceITCase.java (99%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/source}/JdbcFilterPushdownPreparedStatementVisitorTest.java (98%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/source}/JdbcLookupTestBase.java (97%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/source}/JdbcRowDataInputFormatTest.java (99%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/source}/JdbcRowDataLookupFunctionTest.java (99%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/datasource/connections/xa/SimpleXaConnectionProviderTest.java (99%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/datasource/connections/xa/TransactionIdConnectionTest.java (99%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/domain/TransactionIdTest.java (100%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid}/XaXidTest.java (91%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid}/XidSerializersTest.java (95%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc}/derby/DerbyTestBase.java (89%)
copy flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectTypeTest.java => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/database/DerbyDialectTest.java (70%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc}/derby/table/DerbyDynamicTableSinkITCase.java (77%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc}/derby/table/DerbyDynamicTableSourceITCase.java (91%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/derby => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/testutils}/DerbyDatabase.java (52%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/derby => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/testutils}/DerbyMetadata.java (96%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/fakedb/FakeDBUtils.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeConnection.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeConnection1.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeConnection2.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeConnection3.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeDriver1.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeDriver2.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeDriver3.java (100%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc}/h2/H2XaTestBase.java (90%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2 => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils}/H2Metadata.java (92%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2 => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils}/H2XaDatabase.java (52%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2 => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils}/xa/H2XaConnectionWrapper.java (97%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2 => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils}/xa/H2XaDsWrapper.java (97%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2 => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils}/xa/H2XaResourceWrapper.java (99%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2 => flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils}/xa/package-info.java (84%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcFullTest.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcOutputSerializerTest.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcTableOutputFormatTest.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/internal/connection/SimpleJdbcConnectionProviderDriverClassConcurrentLoadingITCase.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/internal/connection/SimpleJdbcConnectionProviderTest.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/split/NumericBetweenParametersProviderTest.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseExtension.java (76%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseMetadata.java (100%)
create mode 100644 flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseResource.java
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseTest.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/testutils/JdbcITCaseBase.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/testutils/TableManaged.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/testutils/functions/JdbcResultSetBuilder.java (100%)
create mode 100644 flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/resources/DockerResource.java
create mode 100644 flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/resources/MemoryResource.java
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/TableBase.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/TableBuilder.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/TableBuilderTest.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/TableField.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/TableRow.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/templates/BooksTable.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/java/org/apache/flink/connector/jdbc/utils/JdbcTypeUtilTest.java (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/resources/META-INF/services/java.sql.Driver (100%)
rename {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/resources/archunit.properties (100%)
copy {flink-connector-jdbc => flink-connector-jdbc-core}/src/test/resources/log4j2-test.properties (100%)
rename {flink-connector-jdbc/src/test/resources/org/apache/flink/connector/jdbc => flink-connector-jdbc-core/src/test/resources/org/apache/flink/connector/jdbc/core}/table/JdbcTablePlanTest.xml (100%)
create mode 100644 flink-connector-jdbc-cratedb/pom.xml
rename flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectFactory.java => flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/cratedb/database/CrateDBFactory.java (54%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb => flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/cratedb/database}/catalog/CrateDBCatalog.java (97%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb => flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/cratedb/database}/catalog/CrateDBTablePath.java (91%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb => flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/cratedb/database}/catalog/CrateDBTypeMapper.java (92%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb => flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/cratedb/database}/dialect/CrateDBDialect.java (69%)
rename flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBRowConverter.java => flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/cratedb/database/dialect/CrateDBDialectConverter.java (73%)
copy flink-connector-jdbc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory => flink-connector-jdbc-cratedb/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory (85%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog => flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb}/CrateDBTestBase.java (89%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb => flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/database}/catalog/CrateDBCatalogITCase.java (97%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb => flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/database}/catalog/CrateDBCatalogTest.java (89%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb => flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/database}/catalog/CrateDBCatalogTestBase.java (92%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb => flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/database}/catalog/CrateDBTablePathTest.java (97%)
rename flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectTypeTest.java => flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/database/dialect/CrateDBDialectTest.java (86%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/cratedb => flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/testutils}/CrateDBDatabase.java (90%)
copy flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoImages.java => flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/testutils/CrateDBImages.java (85%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/cratedb => flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/testutils}/CrateDBMetadata.java (96%)
copy {flink-connector-jdbc => flink-connector-jdbc-cratedb}/src/test/resources/log4j2-test.properties (100%)
create mode 100644 flink-connector-jdbc-db2/pom.xml
rename flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectFactory.java => flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/db2/database/Db2Factory.java (58%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/db2 => flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/db2/database}/dialect/Db2Dialect.java (93%)
rename flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2RowConverter.java => flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/db2/database/dialect/Db2DialectConverter.java (80%)
copy flink-connector-jdbc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory => flink-connector-jdbc-db2/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory (85%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc}/db2/Db2TestBase.java (90%)
rename flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectTypeTest.java => flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/database/dialect/Db2DialectTest.java (85%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/db2 => flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/database}/dialect/Db2PreparedStatementTest.java (92%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/db2 => flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/database}/table/Db2DynamicTableSinkITCase.java (88%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/db2 => flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/database}/table/Db2DynamicTableSourceITCase.java (94%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/db2 => flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/testutils}/Db2Database.java (82%)
create mode 100644 flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/testutils/Db2Images.java
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/db2 => flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/testutils}/Db2Metadata.java (97%)
copy {flink-connector-jdbc => flink-connector-jdbc-db2}/src/test/resources/log4j2-test.properties (100%)
create mode 100644 flink-connector-jdbc-mysql/pom.xml
rename flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectFactory.java => flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/mysql/database/MySqlFactory.java (55%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/mysql => flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/mysql/database}/catalog/MySqlCatalog.java (95%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/mysql => flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/mysql/database}/catalog/MySqlTypeMapper.java (96%)
rename flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySQLRowConverter.java => flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/mysql/database/dialect/MySQLDialectConverter.java (81%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/mysql => flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/mysql/database}/dialect/MySqlDialect.java (93%)
copy flink-connector-jdbc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory => flink-connector-jdbc-mysql/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory (85%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc}/mysql/MySqlTestBase.java (89%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql => flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database}/catalog/MySqlCatalogITCase.java (87%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql => flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database}/catalog/MySqlCatalogTestBase.java (99%)
rename flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectTypeTest.java => flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/dialect/MySqlDialectTest.java (65%)
rename flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatementImplTest.java => flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/dialect/MysqlPreparedStatementTest.java (94%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc}/mysql/table/MySqlDynamicTableSinkITCase.java (88%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc}/mysql/table/MySqlDynamicTableSourceITCase.java (91%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc}/mysql/table/UnsignedTypeConversionITCase.java (97%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql => flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils}/MySqlContainer.java (99%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql => flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils}/MySqlDatabase.java (82%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql => flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils}/MySqlImages.java (82%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql => flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils}/MySqlMetadata.java (97%)
copy {flink-connector-jdbc => flink-connector-jdbc-mysql}/src/test/resources/log4j2-test.properties (100%)
create mode 100644 flink-connector-jdbc-oceanbase/pom.xml
rename flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectFactory.java => flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/oceanbase/database/OceanBaseFactory.java (59%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase => flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/oceanbase/database}/dialect/OceanBaseDialect.java (87%)
rename flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseRowConverter.java => flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/oceanbase/database/dialect/OceanBaseDialectConverter.java (95%)
copy flink-connector-jdbc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory => flink-connector-jdbc-oceanbase/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory (85%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc}/oceanbase/OceanBaseMysqlTestBase.java (86%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc}/oceanbase/OceanBaseOracleTestBase.java (73%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase => flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/database}/dialect/OceanBaseDialectTest.java (96%)
rename flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseMysqlDialectTypeTest.java => flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/database/dialect/OceanBaseMysqlDialectTest.java (85%)
rename flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseOracleDialectTypeTest.java => flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/database/dialect/OceanBaseOracleDialectTest.java (82%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc}/oceanbase/table/OceanBaseMySqlDynamicTableSinkITCase.java (93%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc}/oceanbase/table/OceanBaseMySqlDynamicTableSourceITCase.java (93%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc}/oceanbase/table/OceanBaseOracleDynamicTableSinkITCase.java (95%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc}/oceanbase/table/OceanBaseOracleDynamicTableSourceITCase.java (94%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc}/oceanbase/table/OceanBaseTableRow.java (96%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase => flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils}/OceanBaseDatabase.java (67%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase => flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils}/OceanBaseImages.java (81%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase => flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils}/OceanBaseMetadata.java (92%)
copy {flink-connector-jdbc => flink-connector-jdbc-oceanbase}/src/test/resources/log4j2-test.properties (100%)
create mode 100644 flink-connector-jdbc-oracle/pom.xml
rename flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectFactory.java => flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/oracle/database/OracleFactory.java (58%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/oracle => flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/oracle/database}/dialect/OracleDialect.java (94%)
rename flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleRowConverter.java => flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/oracle/database/dialect/OracleDialectConverter.java (96%)
copy flink-connector-jdbc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory => flink-connector-jdbc-oracle/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory (85%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc}/oracle/OracleTestBase.java (89%)
rename flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectTypeTest.java => flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/database/dialect/OracleDialectTest.java (85%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle => flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/database}/dialect/OraclePreparedStatementTest.java (97%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc}/oracle/table/OracleDynamicTableSinkITCase.java (58%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc}/oracle/table/OracleDynamicTableSourceITCase.java (56%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc}/oracle/table/OracleTableSourceITCase.java (75%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle => flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/testutils}/OracleDatabase.java (84%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle => flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/testutils}/OracleImages.java (88%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle => flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/testutils}/OracleMetadata.java (97%)
copy {flink-connector-jdbc => flink-connector-jdbc-oracle}/src/test/resources/log4j2-test.properties (100%)
create mode 100644 flink-connector-jdbc-postgres/pom.xml
rename flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectFactory.java => flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/PostgresFactory.java (54%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/postgres => flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database}/catalog/PostgresCatalog.java (95%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/postgres => flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database}/catalog/PostgresTablePath.java (98%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/postgres => flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database}/catalog/PostgresTypeMapper.java (97%)
rename flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialect.java => flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/dialect/CompatiblePostgresDialect.java (61%)
rename flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresRowConverter.java => flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/dialect/CompatiblePostgresDialectConverter.java (67%)
rename flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractPostgresCompatibleDialect.java => flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/dialect/PostgresDialect.java (85%)
rename flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractPostgresCompatibleRowConverter.java => flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/dialect/PostgresDialectConverter.java (87%)
copy flink-connector-jdbc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory => flink-connector-jdbc-postgres/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory (85%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc}/postgres/PostgresTestBase.java (89%)
rename flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/factory/JdbcCatalogFactoryTest.java => flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database/PostgresFactoryTest.java (75%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres => flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database}/catalog/PostgresCatalogITCase.java (97%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres => flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database}/catalog/PostgresCatalogTest.java (89%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres => flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database}/catalog/PostgresCatalogTestBase.java (98%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres => flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database}/catalog/PostgresTablePathTest.java (97%)
rename flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectTypeTest.java => flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database/dialect/PostgresDialectTest.java (86%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc}/postgres/table/PostgresDynamicTableSinkITCase.java (76%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc}/postgres/table/PostgresDynamicTableSourceITCase.java (90%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres => flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils}/PostgresDatabase.java (89%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres => flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils}/PostgresImages.java (84%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres => flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils}/PostgresMetadata.java (92%)
copy {flink-connector-jdbc => flink-connector-jdbc-postgres}/src/test/resources/log4j2-test.properties (100%)
create mode 100644 flink-connector-jdbc-sqlserver/pom.xml
rename flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialectFactory.java => flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/sqlserver/database/SqlServerFactory.java (57%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver => flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/sqlserver/database}/dialect/SqlServerDialect.java (94%)
rename flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerRowConverter.java => flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/sqlserver/database/dialect/SqlServerDialectConverter.java (84%)
copy flink-connector-jdbc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory => flink-connector-jdbc-sqlserver/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory (85%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc}/sqlserver/SqlServerTestBase.java (89%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver => flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/database}/dialect/SqlServerPreparedStatementTest.java (94%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc}/sqlserver/table/SqlServerDynamicTableSinkITCase.java (87%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc}/sqlserver/table/SqlServerDynamicTableSourceITCase.java (94%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc}/sqlserver/table/SqlServerTableSourceITCase.java (97%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver => flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/testutils}/SqlServerDatabase.java (89%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver => flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/testutils}/SqlServerImages.java (94%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver => flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/testutils}/SqlServerMetadata.java (97%)
copy {flink-connector-jdbc => flink-connector-jdbc-sqlserver}/src/test/resources/log4j2-test.properties (100%)
create mode 100644 flink-connector-jdbc-trino/pom.xml
rename flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectFactory.java => flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/trino/database/TrinoFactory.java (58%)
rename {flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/trino => flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/trino/database}/dialect/TrinoDialect.java (91%)
rename flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoRowConverter.java => flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/trino/database/dialect/TrinoDialectConverter.java (89%)
copy flink-connector-jdbc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory => flink-connector-jdbc-trino/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory (85%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc}/trino/TrinoTestBase.java (88%)
rename flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectTypeTest.java => flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/database/dialect/TrinoDialectTest.java (81%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/trino => flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/database}/dialect/TrinoPreparedStatementTest.java (95%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc}/trino/table/TrinoDynamicTableSinkITCase.java (89%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases => flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc}/trino/table/TrinoDynamicTableSourceITCase.java (91%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino => flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils}/TrinoDatabase.java (52%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino => flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils}/TrinoImages.java (88%)
rename {flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino => flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils}/TrinoMetadata.java (97%)
rename {flink-connector-jdbc => flink-connector-jdbc-trino}/src/test/resources/log4j2-test.properties (100%)
delete mode 100644 flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/db2/xa/Db2ExactlyOnceSinkE2eTest.java
delete mode 100644 flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/derby/xa/DerbyExactlyOnceSinkE2eTest.java
delete mode 100644 flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySql56CatalogITCase.java
delete mode 100644 flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySql57CatalogITCase.java
delete mode 100644 flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectTest.java
delete mode 100644 flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/xa/MySqlExactlyOnceSinkE2eTest.java
delete mode 100644 flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/xa/OracleExactlyOnceSinkE2eTest.java
delete mode 100644 flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/xa/PostgresExactlyOnceSinkE2eTest.java
delete mode 100644 flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/xa/SqlServerExactlyOnceSinkE2eTest.java
delete mode 100644 flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySql56Database.java
delete mode 100644 flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySql57Database.java
delete mode 100644 flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseContainer.java
delete mode 100644 flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseTestDatabase.java
(flink-connector-jdbc) 09/14: [FLINK-35367] Reorganize sinks
Posted by fa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git
commit 64b4c8246f3e050f57df159adc9acf2f3979738a
Author: Joao Boto <bo...@boto.pro>
AuthorDate: Mon Jul 8 15:39:02 2024 +0200
[FLINK-35367] Reorganize sinks
---
.../connector/jdbc/core/datastream/Jdbc.java} | 21 +++++++++---------
.../jdbc/{ => core/datastream}/sink/JdbcSink.java | 14 ++++++------
.../datastream}/sink/JdbcSinkBuilder.java | 2 +-
.../datastream}/sink/committer/JdbcCommitable.java | 2 +-
.../sink/committer/JdbcCommitableSerializer.java | 2 +-
.../datastream}/sink/committer/JdbcCommitter.java | 4 ++--
.../datastream}/sink/writer/JdbcWriter.java | 4 ++--
.../datastream}/sink/writer/JdbcWriterState.java | 2 +-
.../sink/writer/JdbcWriterStateSerializer.java | 2 +-
.../datasource/transactions/xa/XaTransaction.java | 2 +-
.../apache/flink/connector/jdbc/JdbcITCase.java | 22 ++++++++++++++++---
.../datastream}/sink/AtLeastOnceJdbcSinkTest.java | 2 +-
.../datastream}/sink/BaseJdbcSinkTest.java | 6 +++---
.../datastream}/sink/ExactlyOnceJdbcSinkTest.java | 2 +-
.../sink/writer/AlLeastOnceJdbcWriterTest.java | 4 ++--
.../sink/writer/BaseJdbcWriterTest.java | 10 ++++++---
.../sink/writer/ExactlyOnceJdbcWriterTest.java | 4 ++--
.../sink/writer/JdbcWriterStateSerializerTest.java | 7 ++++--
.../sink/writer/JdbcWriterStateTest.java | 7 ++++--
.../jdbc/xa/JdbcExactlyOnceSinkE2eTest.java | 25 ++++++++++++++++++++--
.../org/apache/flink/connector/jdbc/JdbcSink.java | 5 +++--
.../apache/flink/connector/jdbc/sink/JdbcSink.java | 14 ++++++------
.../flink/connector/jdbc/sink/JdbcSinkBuilder.java | 8 ++++++-
23 files changed, 113 insertions(+), 58 deletions(-)
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/ExactlyOnceJdbcSinkTest.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/Jdbc.java
similarity index 55%
copy from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/ExactlyOnceJdbcSinkTest.java
copy to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/Jdbc.java
index c0a31ea1..2e09c5f4 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/ExactlyOnceJdbcSinkTest.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/Jdbc.java
@@ -15,19 +15,18 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.sink;
+package org.apache.flink.connector.jdbc.core.datastream;
-import org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions;
-import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
+import org.apache.flink.annotation.PublicEvolving;
+import org.apache.flink.connector.jdbc.core.datastream.sink.JdbcSink;
+import org.apache.flink.connector.jdbc.core.datastream.sink.JdbcSinkBuilder;
-/** Smoke tests for the {@link JdbcSink} and the underlying classes. */
-class ExactlyOnceJdbcSinkTest extends BaseJdbcSinkTest {
+/** Facade to create JDBC stream sources and sinks. */
+@PublicEvolving
+public class Jdbc {
- @Override
- protected <T> JdbcSink<T> finishSink(JdbcSinkBuilder<T> builder) {
- return builder.withExecutionOptions(
- JdbcExecutionOptions.builder().withMaxRetries(0).build())
- .buildExactlyOnce(
- JdbcExactlyOnceOptions.defaults(), getMetadata().getXaSourceSupplier());
+ /** Create a JDBC sink builder. */
+ public static <IN> JdbcSinkBuilder<IN> sinkBuilder() {
+ return JdbcSink.builder();
}
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSink.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/JdbcSink.java
similarity index 87%
copy from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSink.java
copy to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/JdbcSink.java
index 986fcba1..8c0cf999 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSink.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/JdbcSink.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.sink;
+package org.apache.flink.connector.jdbc.core.datastream.sink;
import org.apache.flink.annotation.Internal;
import org.apache.flink.annotation.PublicEvolving;
@@ -25,15 +25,15 @@ import org.apache.flink.api.connector.sink2.TwoPhaseCommittingSink;
import org.apache.flink.connector.base.DeliveryGuarantee;
import org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions;
import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
+import org.apache.flink.connector.jdbc.core.datastream.sink.committer.JdbcCommitable;
+import org.apache.flink.connector.jdbc.core.datastream.sink.committer.JdbcCommitableSerializer;
+import org.apache.flink.connector.jdbc.core.datastream.sink.committer.JdbcCommitter;
+import org.apache.flink.connector.jdbc.core.datastream.sink.writer.JdbcWriter;
+import org.apache.flink.connector.jdbc.core.datastream.sink.writer.JdbcWriterState;
+import org.apache.flink.connector.jdbc.core.datastream.sink.writer.JdbcWriterStateSerializer;
import org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider;
import org.apache.flink.connector.jdbc.datasource.statements.JdbcQueryStatement;
import org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer;
-import org.apache.flink.connector.jdbc.sink.committer.JdbcCommitable;
-import org.apache.flink.connector.jdbc.sink.committer.JdbcCommitableSerializer;
-import org.apache.flink.connector.jdbc.sink.committer.JdbcCommitter;
-import org.apache.flink.connector.jdbc.sink.writer.JdbcWriter;
-import org.apache.flink.connector.jdbc.sink.writer.JdbcWriterState;
-import org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer;
import org.apache.flink.core.io.SimpleVersionedSerializer;
import java.io.IOException;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSinkBuilder.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/JdbcSinkBuilder.java
similarity index 98%
copy from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSinkBuilder.java
copy to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/JdbcSinkBuilder.java
index ede9a00e..12c5a3e7 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSinkBuilder.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/JdbcSinkBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.sink;
+package org.apache.flink.connector.jdbc.core.datastream.sink;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.connector.base.DeliveryGuarantee;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/committer/JdbcCommitable.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/committer/JdbcCommitable.java
similarity index 93%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/committer/JdbcCommitable.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/committer/JdbcCommitable.java
index 0a04aab0..97594d5b 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/committer/JdbcCommitable.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/committer/JdbcCommitable.java
@@ -1,4 +1,4 @@
-package org.apache.flink.connector.jdbc.sink.committer;
+package org.apache.flink.connector.jdbc.core.datastream.sink.committer;
import org.apache.flink.annotation.Internal;
import org.apache.flink.connector.jdbc.datasource.transactions.xa.XaTransaction;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/committer/JdbcCommitableSerializer.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/committer/JdbcCommitableSerializer.java
similarity index 94%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/committer/JdbcCommitableSerializer.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/committer/JdbcCommitableSerializer.java
index b950aced..56a4a21f 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/committer/JdbcCommitableSerializer.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/committer/JdbcCommitableSerializer.java
@@ -1,4 +1,4 @@
-package org.apache.flink.connector.jdbc.sink.committer;
+package org.apache.flink.connector.jdbc.core.datastream.sink.committer;
import org.apache.flink.annotation.Internal;
import org.apache.flink.api.common.typeutils.TypeSerializer;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/committer/JdbcCommitter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/committer/JdbcCommitter.java
similarity index 93%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/committer/JdbcCommitter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/committer/JdbcCommitter.java
index 1efa8133..a4576b84 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/committer/JdbcCommitter.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/committer/JdbcCommitter.java
@@ -1,14 +1,14 @@
-package org.apache.flink.connector.jdbc.sink.committer;
+package org.apache.flink.connector.jdbc.core.datastream.sink.committer;
import org.apache.flink.annotation.Internal;
import org.apache.flink.api.connector.sink2.Committer;
import org.apache.flink.connector.base.DeliveryGuarantee;
import org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions;
+import org.apache.flink.connector.jdbc.core.datastream.sink.writer.JdbcWriterState;
import org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider;
import org.apache.flink.connector.jdbc.datasource.connections.xa.XaConnectionProvider;
import org.apache.flink.connector.jdbc.datasource.transactions.xa.XaTransaction;
import org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId;
-import org.apache.flink.connector.jdbc.sink.writer.JdbcWriterState;
import org.apache.flink.util.FlinkRuntimeException;
import java.io.IOException;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/writer/JdbcWriter.java
similarity index 98%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/writer/JdbcWriter.java
index 2e167ddb..be7aa49c 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriter.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/writer/JdbcWriter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.sink.writer;
+package org.apache.flink.connector.jdbc.core.datastream.sink.writer;
import org.apache.flink.annotation.Internal;
import org.apache.flink.api.connector.sink2.Sink;
@@ -24,6 +24,7 @@ import org.apache.flink.api.connector.sink2.TwoPhaseCommittingSink;
import org.apache.flink.connector.base.DeliveryGuarantee;
import org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions;
import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
+import org.apache.flink.connector.jdbc.core.datastream.sink.committer.JdbcCommitable;
import org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider;
import org.apache.flink.connector.jdbc.datasource.connections.xa.XaConnectionProvider;
import org.apache.flink.connector.jdbc.datasource.statements.JdbcQueryStatement;
@@ -32,7 +33,6 @@ import org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.Transac
import org.apache.flink.connector.jdbc.internal.JdbcOutputFormat;
import org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer;
import org.apache.flink.connector.jdbc.internal.executor.JdbcBatchStatementExecutor;
-import org.apache.flink.connector.jdbc.sink.committer.JdbcCommitable;
import org.apache.flink.util.Preconditions;
import org.slf4j.Logger;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterState.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/writer/JdbcWriterState.java
similarity index 98%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterState.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/writer/JdbcWriterState.java
index 7c39827e..c5dece75 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterState.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/writer/JdbcWriterState.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.sink.writer;
+package org.apache.flink.connector.jdbc.core.datastream.sink.writer;
import org.apache.flink.annotation.Internal;
import org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterStateSerializer.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/writer/JdbcWriterStateSerializer.java
similarity index 97%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterStateSerializer.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/writer/JdbcWriterStateSerializer.java
index 89ba5a82..b11f6b45 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterStateSerializer.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/writer/JdbcWriterStateSerializer.java
@@ -1,4 +1,4 @@
-package org.apache.flink.connector.jdbc.sink.writer;
+package org.apache.flink.connector.jdbc.core.datastream.sink.writer;
import org.apache.flink.annotation.Internal;
import org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/XaTransaction.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/XaTransaction.java
index 6fcc1eb6..48896842 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/XaTransaction.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/XaTransaction.java
@@ -3,11 +3,11 @@ package org.apache.flink.connector.jdbc.datasource.transactions.xa;
import org.apache.flink.annotation.Internal;
import org.apache.flink.api.java.tuple.Tuple2;
import org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions;
+import org.apache.flink.connector.jdbc.core.datastream.sink.writer.JdbcWriterState;
import org.apache.flink.connector.jdbc.datasource.connections.xa.XaConnectionProvider;
import org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId;
import org.apache.flink.connector.jdbc.datasource.transactions.xa.exceptions.EmptyTransactionXaException;
import org.apache.flink.connector.jdbc.datasource.transactions.xa.exceptions.TransientXaException;
-import org.apache.flink.connector.jdbc.sink.writer.JdbcWriterState;
import org.apache.flink.util.ExceptionUtils;
import org.apache.flink.util.Preconditions;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcITCase.java
index ead2c44f..3b4c60e5 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcITCase.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcITCase.java
@@ -19,8 +19,13 @@ package org.apache.flink.connector.jdbc;
import org.apache.flink.api.common.restartstrategy.RestartStrategies;
import org.apache.flink.configuration.Configuration;
+import org.apache.flink.connector.jdbc.datasource.connections.SimpleJdbcConnectionProvider;
+import org.apache.flink.connector.jdbc.internal.GenericJdbcSinkFunction;
+import org.apache.flink.connector.jdbc.internal.JdbcOutputFormat;
+import org.apache.flink.connector.jdbc.internal.executor.JdbcBatchStatementExecutor;
import org.apache.flink.connector.jdbc.testutils.JdbcITCaseBase;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
+import org.apache.flink.streaming.api.functions.sink.SinkFunction;
import org.apache.flink.util.function.FunctionWithException;
import org.junit.jupiter.api.Test;
@@ -46,7 +51,7 @@ import static org.apache.flink.connector.jdbc.JdbcTestFixture.TestEntry;
import static org.apache.flink.util.Preconditions.checkNotNull;
import static org.assertj.core.api.Assertions.assertThat;
-/** Smoke tests for the {@link JdbcSink} and the underlying classes. */
+/** Smoke tests for the {@link GenericJdbcSinkFunction} and the underlying classes. */
public class JdbcITCase extends JdbcTestBase implements JdbcITCaseBase {
public static final JdbcStatementBuilder<TestEntry> TEST_ENTRY_JDBC_STATEMENT_BUILDER =
@@ -69,7 +74,7 @@ public class JdbcITCase extends JdbcTestBase implements JdbcITCaseBase {
env.setParallelism(1);
env.fromElements(TEST_DATA)
.addSink(
- JdbcSink.sink(
+ sink(
String.format(INSERT_TEMPLATE, INPUT_TABLE),
TEST_ENTRY_JDBC_STATEMENT_BUILDER,
new JdbcConnectionOptionsBuilder()
@@ -100,7 +105,7 @@ public class JdbcITCase extends JdbcTestBase implements JdbcITCaseBase {
return reused;
})
.addSink(
- JdbcSink.sink(
+ sink(
JdbcTestFixture.INSERT_INTO_WORDS_TEMPLATE,
(ps, e) -> {
ps.setInt(1, counter.getAndIncrement());
@@ -172,4 +177,15 @@ public class JdbcITCase extends JdbcTestBase implements JdbcITCaseBase {
T value = get.apply(rs);
return rs.wasNull() ? null : value;
}
+
+ private <T> SinkFunction<T> sink(
+ String sql,
+ JdbcStatementBuilder<T> statementBuilder,
+ JdbcConnectionOptions connectionOptions) {
+ return new GenericJdbcSinkFunction<>(
+ new JdbcOutputFormat<>(
+ new SimpleJdbcConnectionProvider(connectionOptions),
+ JdbcExecutionOptions.defaults(),
+ () -> JdbcBatchStatementExecutor.simple(sql, statementBuilder)));
+ }
}
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/AtLeastOnceJdbcSinkTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/sink/AtLeastOnceJdbcSinkTest.java
similarity index 96%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/AtLeastOnceJdbcSinkTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/sink/AtLeastOnceJdbcSinkTest.java
index e3a9d28d..7bf7afbc 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/AtLeastOnceJdbcSinkTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/sink/AtLeastOnceJdbcSinkTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.sink;
+package org.apache.flink.connector.jdbc.core.datastream.sink;
import org.apache.flink.connector.jdbc.JdbcConnectionOptions;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/BaseJdbcSinkTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/sink/BaseJdbcSinkTest.java
similarity index 96%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/BaseJdbcSinkTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/sink/BaseJdbcSinkTest.java
index 7224647a..219b374c 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/BaseJdbcSinkTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/sink/BaseJdbcSinkTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.sink;
+package org.apache.flink.connector.jdbc.core.datastream.sink;
import org.apache.flink.api.common.restartstrategy.RestartStrategies;
import org.apache.flink.connector.jdbc.derby.DerbyTestBase;
@@ -37,8 +37,8 @@ import static org.apache.flink.connector.jdbc.JdbcTestFixture.TEST_DATA;
import static org.assertj.core.api.Assertions.assertThat;
/**
- * Smoke tests for the {@link org.apache.flink.connector.jdbc.sink.JdbcSink} and the underlying
- * classes.
+ * Smoke tests for the {@link org.apache.flink.connector.jdbc.core.datastream.sink.JdbcSink} and the
+ * underlying classes.
*/
public abstract class BaseJdbcSinkTest implements DerbyTestBase {
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/ExactlyOnceJdbcSinkTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/sink/ExactlyOnceJdbcSinkTest.java
similarity index 95%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/ExactlyOnceJdbcSinkTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/sink/ExactlyOnceJdbcSinkTest.java
index c0a31ea1..f117d0f6 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/ExactlyOnceJdbcSinkTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/sink/ExactlyOnceJdbcSinkTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.sink;
+package org.apache.flink.connector.jdbc.core.datastream.sink;
import org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions;
import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/AlLeastOnceJdbcWriterTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/sink/writer/AlLeastOnceJdbcWriterTest.java
similarity index 94%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/AlLeastOnceJdbcWriterTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/sink/writer/AlLeastOnceJdbcWriterTest.java
index b22b1b1f..59fb1e4a 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/AlLeastOnceJdbcWriterTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/sink/writer/AlLeastOnceJdbcWriterTest.java
@@ -1,11 +1,11 @@
-package org.apache.flink.connector.jdbc.sink.writer;
+package org.apache.flink.connector.jdbc.core.datastream.sink.writer;
import org.apache.flink.connector.base.DeliveryGuarantee;
import org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions;
import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
+import org.apache.flink.connector.jdbc.core.datastream.sink.committer.JdbcCommitable;
import org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider;
import org.apache.flink.connector.jdbc.datasource.connections.SimpleJdbcConnectionProvider;
-import org.apache.flink.connector.jdbc.sink.committer.JdbcCommitable;
import org.apache.flink.connector.jdbc.testutils.tables.templates.BooksTable;
import org.junit.jupiter.api.Test;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/BaseJdbcWriterTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/sink/writer/BaseJdbcWriterTest.java
similarity index 94%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/BaseJdbcWriterTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/sink/writer/BaseJdbcWriterTest.java
index 914a2fbf..cfcc2030 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/BaseJdbcWriterTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/sink/writer/BaseJdbcWriterTest.java
@@ -1,4 +1,4 @@
-package org.apache.flink.connector.jdbc.sink.writer;
+package org.apache.flink.connector.jdbc.core.datastream.sink.writer;
import org.apache.flink.api.common.JobID;
import org.apache.flink.api.connector.sink2.Sink;
@@ -6,12 +6,12 @@ import org.apache.flink.api.connector.sink2.SinkWriter;
import org.apache.flink.connector.base.DeliveryGuarantee;
import org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions;
import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
+import org.apache.flink.connector.jdbc.core.datastream.sink.committer.JdbcCommitable;
import org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider;
import org.apache.flink.connector.jdbc.datasource.statements.JdbcQueryStatement;
import org.apache.flink.connector.jdbc.datasource.statements.SimpleJdbcQueryStatement;
import org.apache.flink.connector.jdbc.derby.DerbyTestBase;
import org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer;
-import org.apache.flink.connector.jdbc.sink.committer.JdbcCommitable;
import org.apache.flink.connector.jdbc.testutils.TableManaged;
import org.apache.flink.connector.jdbc.testutils.tables.templates.BooksTable;
import org.apache.flink.util.StringUtils;
@@ -29,7 +29,11 @@ import static org.apache.flink.connector.jdbc.JdbcTestFixture.TEST_DATA;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.doReturn;
-/** Base smoke tests for the {@link JdbcWriter} and the underlying classes. */
+/**
+ * Base smoke tests for the {@link
+ * org.apache.flink.connector.jdbc.core.datastream.sink.writer.JdbcWriter} and the underlying
+ * classes.
+ */
abstract class BaseJdbcWriterTest implements DerbyTestBase {
private static final String JOBID = "6b64d8a9a951e2e8767ae952ad951706";
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/ExactlyOnceJdbcWriterTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/sink/writer/ExactlyOnceJdbcWriterTest.java
similarity index 95%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/ExactlyOnceJdbcWriterTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/sink/writer/ExactlyOnceJdbcWriterTest.java
index ab0153d2..409879a2 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/ExactlyOnceJdbcWriterTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/sink/writer/ExactlyOnceJdbcWriterTest.java
@@ -1,11 +1,11 @@
-package org.apache.flink.connector.jdbc.sink.writer;
+package org.apache.flink.connector.jdbc.core.datastream.sink.writer;
import org.apache.flink.connector.base.DeliveryGuarantee;
import org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions;
import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
+import org.apache.flink.connector.jdbc.core.datastream.sink.committer.JdbcCommitable;
import org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider;
import org.apache.flink.connector.jdbc.datasource.connections.xa.SimpleXaConnectionProvider;
-import org.apache.flink.connector.jdbc.sink.committer.JdbcCommitable;
import org.apache.flink.connector.jdbc.testutils.tables.templates.BooksTable;
import org.junit.jupiter.api.Test;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterStateSerializerTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/sink/writer/JdbcWriterStateSerializerTest.java
similarity index 85%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterStateSerializerTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/sink/writer/JdbcWriterStateSerializerTest.java
index 7b8c8e91..8bd14f84 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterStateSerializerTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/sink/writer/JdbcWriterStateSerializerTest.java
@@ -1,4 +1,4 @@
-package org.apache.flink.connector.jdbc.sink.writer;
+package org.apache.flink.connector.jdbc.core.datastream.sink.writer;
import org.apache.flink.api.common.JobID;
import org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId;
@@ -10,7 +10,10 @@ import java.util.Arrays;
import static org.assertj.core.api.Assertions.assertThat;
-/** Smoke test for {@link JdbcWriterStateSerializer}. */
+/**
+ * Smoke test for {@link
+ * org.apache.flink.connector.jdbc.core.datastream.sink.writer.JdbcWriterStateSerializer}.
+ */
class JdbcWriterStateSerializerTest {
@Test
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterStateTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/sink/writer/JdbcWriterStateTest.java
similarity index 86%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterStateTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/sink/writer/JdbcWriterStateTest.java
index f454f8be..889a7eed 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterStateTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/sink/writer/JdbcWriterStateTest.java
@@ -1,4 +1,4 @@
-package org.apache.flink.connector.jdbc.sink.writer;
+package org.apache.flink.connector.jdbc.core.datastream.sink.writer;
import org.apache.flink.api.common.JobID;
import org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId;
@@ -9,7 +9,10 @@ import java.util.Arrays;
import static org.assertj.core.api.Assertions.assertThat;
-/** Smoke test for {@link JdbcWriterState}. */
+/**
+ * Smoke test for {@link
+ * org.apache.flink.connector.jdbc.core.datastream.sink.writer.JdbcWriterState}.
+ */
class JdbcWriterStateTest {
@Test
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcExactlyOnceSinkE2eTest.java
index 85db5e37..eb8569db 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcExactlyOnceSinkE2eTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcExactlyOnceSinkE2eTest.java
@@ -25,7 +25,7 @@ import org.apache.flink.api.common.time.Time;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions;
import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
-import org.apache.flink.connector.jdbc.JdbcSink;
+import org.apache.flink.connector.jdbc.JdbcStatementBuilder;
import org.apache.flink.connector.jdbc.testutils.DatabaseTest;
import org.apache.flink.connector.jdbc.testutils.TableManaged;
import org.apache.flink.connector.jdbc.testutils.tables.templates.BooksTable;
@@ -35,10 +35,12 @@ import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration;
import org.apache.flink.streaming.api.CheckpointingMode;
import org.apache.flink.streaming.api.checkpoint.CheckpointedFunction;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
+import org.apache.flink.streaming.api.functions.sink.SinkFunction;
import org.apache.flink.streaming.api.functions.source.RichParallelSourceFunction;
import org.apache.flink.streaming.api.functions.source.SourceFunction;
import org.apache.flink.test.junit5.MiniClusterExtension;
import org.apache.flink.util.ExceptionUtils;
+import org.apache.flink.util.function.SerializableSupplier;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
@@ -46,6 +48,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.sql.XADataSource;
+
import java.time.Duration;
import java.util.Collections;
import java.util.List;
@@ -140,7 +144,7 @@ public abstract class JdbcExactlyOnceSinkE2eTest implements DatabaseTest {
.setParallelism(PARALLELISM)
.map(new FailingMapper(numElementsPerCheckpoint + (numElementsPerCheckpoint / 2)))
.addSink(
- JdbcSink.exactlyOnceSink(
+ exactlyOnceSink(
OUTPUT_TABLE.getInsertIntoQuery(),
OUTPUT_TABLE.getStatementBuilder(),
JdbcExecutionOptions.builder().withMaxRetries(0).build(),
@@ -166,6 +170,23 @@ public abstract class JdbcExactlyOnceSinkE2eTest implements DatabaseTest {
System.currentTimeMillis() - started);
}
+ private <T> SinkFunction<T> exactlyOnceSink(
+ String sql,
+ JdbcStatementBuilder<T> statementBuilder,
+ JdbcExecutionOptions executionOptions,
+ JdbcExactlyOnceOptions exactlyOnceOptions,
+ SerializableSupplier<XADataSource> dataSourceSupplier) {
+ return new JdbcXaSinkFunction<>(
+ sql,
+ statementBuilder,
+ XaFacade.fromXaDataSourceSupplier(
+ dataSourceSupplier,
+ exactlyOnceOptions.getTimeoutSec(),
+ exactlyOnceOptions.isTransactionPerConnection()),
+ executionOptions,
+ exactlyOnceOptions);
+ }
+
/**
* {@link SourceFunction} emits {@link BooksTable.BookEntry test entries} and waits for the
* checkpoint.
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/JdbcSink.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcSink.java
similarity index 96%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/JdbcSink.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcSink.java
index efd976e2..a46601f6 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/JdbcSink.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcSink.java
@@ -18,11 +18,11 @@
package org.apache.flink.connector.jdbc;
import org.apache.flink.annotation.PublicEvolving;
+import org.apache.flink.connector.jdbc.core.datastream.sink.JdbcSinkBuilder;
import org.apache.flink.connector.jdbc.datasource.connections.SimpleJdbcConnectionProvider;
import org.apache.flink.connector.jdbc.internal.GenericJdbcSinkFunction;
import org.apache.flink.connector.jdbc.internal.JdbcOutputFormat;
import org.apache.flink.connector.jdbc.internal.executor.JdbcBatchStatementExecutor;
-import org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder;
import org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunction;
import org.apache.flink.connector.jdbc.xa.XaFacade;
import org.apache.flink.streaming.api.functions.sink.SinkFunction;
@@ -32,6 +32,7 @@ import javax.sql.XADataSource;
/** Facade to create JDBC {@link SinkFunction sinks}. */
@PublicEvolving
+@Deprecated
public class JdbcSink {
/**
@@ -109,7 +110,7 @@ public class JdbcSink {
}
public static <IN> JdbcSinkBuilder<IN> builder() {
- return org.apache.flink.connector.jdbc.sink.JdbcSink.builder();
+ return org.apache.flink.connector.jdbc.core.datastream.sink.JdbcSink.builder();
}
private JdbcSink() {}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSink.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSink.java
similarity index 87%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSink.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSink.java
index 986fcba1..a1f8a4b4 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSink.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSink.java
@@ -25,15 +25,15 @@ import org.apache.flink.api.connector.sink2.TwoPhaseCommittingSink;
import org.apache.flink.connector.base.DeliveryGuarantee;
import org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions;
import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
+import org.apache.flink.connector.jdbc.core.datastream.sink.committer.JdbcCommitable;
+import org.apache.flink.connector.jdbc.core.datastream.sink.committer.JdbcCommitableSerializer;
+import org.apache.flink.connector.jdbc.core.datastream.sink.committer.JdbcCommitter;
+import org.apache.flink.connector.jdbc.core.datastream.sink.writer.JdbcWriter;
+import org.apache.flink.connector.jdbc.core.datastream.sink.writer.JdbcWriterState;
+import org.apache.flink.connector.jdbc.core.datastream.sink.writer.JdbcWriterStateSerializer;
import org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider;
import org.apache.flink.connector.jdbc.datasource.statements.JdbcQueryStatement;
import org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer;
-import org.apache.flink.connector.jdbc.sink.committer.JdbcCommitable;
-import org.apache.flink.connector.jdbc.sink.committer.JdbcCommitableSerializer;
-import org.apache.flink.connector.jdbc.sink.committer.JdbcCommitter;
-import org.apache.flink.connector.jdbc.sink.writer.JdbcWriter;
-import org.apache.flink.connector.jdbc.sink.writer.JdbcWriterState;
-import org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer;
import org.apache.flink.core.io.SimpleVersionedSerializer;
import java.io.IOException;
@@ -44,8 +44,10 @@ import java.util.Collections;
* Flink Sink to produce data into a jdbc database.
*
* @see JdbcSinkBuilder on how to construct a JdbcSink
+ * @deprecated please use {@link org.apache.flink.connector.jdbc.core.datastream.sink.JdbcSink}
*/
@PublicEvolving
+@Deprecated
public class JdbcSink<IN>
implements StatefulSink<IN, JdbcWriterState>, TwoPhaseCommittingSink<IN, JdbcCommitable> {
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSinkBuilder.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSinkBuilder.java
similarity index 96%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSinkBuilder.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSinkBuilder.java
index ede9a00e..3b073568 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSinkBuilder.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSinkBuilder.java
@@ -36,8 +36,14 @@ import javax.sql.XADataSource;
import static org.apache.flink.util.Preconditions.checkNotNull;
-/** Builder to construct {@link JdbcSink}. */
+/**
+ * Builder to construct {@link JdbcSink}.
+ *
+ * @deprecated please use {@link
+ * org.apache.flink.connector.jdbc.core.datastream.sink.JdbcSinkBuilder}
+ */
@PublicEvolving
+@Deprecated
public class JdbcSinkBuilder<IN> {
private JdbcExecutionOptions executionOptions;
(flink-connector-jdbc) 06/14: [FLINK-35366] Reorganize database modules packages
Posted by fa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git
commit 2f8995c1b893c995378ac71508f84cddbfb906b8
Author: Joao Boto <bo...@boto.pro>
AuthorDate: Thu May 30 11:54:19 2024 +0200
[FLINK-35366] Reorganize database modules packages
---
.../backward/compatibility/DataStreamSinkTest.java | 2 +-
.../compatibility/DataStreamSourceTest.java | 2 +-
.../compatibility/DynamicTableSinkTest.java | 2 +-
.../compatibility/DynamicTableSourceTest.java | 2 +-
.../jdbc/core/{table => database}/JdbcFactory.java | 6 +--
.../{table => database}/JdbcFactoryLoader.java | 6 +--
.../catalog/AbstractJdbcCatalog.java | 2 +-
.../{table => database}/catalog/JdbcCatalog.java | 2 +-
.../catalog/JdbcCatalogTypeMapper.java | 2 +-
.../catalog/factory/JdbcCatalogFactory.java | 16 +++---
.../catalog/factory/JdbcCatalogFactoryOptions.java | 4 +-
.../dialect/AbstractDialect.java | 12 ++---
.../dialect/AbstractDialectConverter.java | 2 +-
.../{table => database}/dialect/JdbcDialect.java | 4 +-
.../dialect/JdbcDialectConverter.java | 2 +-
.../dialect => derby/database}/DerbyFactory.java | 9 ++--
.../database}/dialect/DerbyDialect.java | 6 +--
.../database}/dialect/DerbyDialectConverter.java | 4 +-
.../TableInsertOrUpdateStatementExecutor.java | 2 +-
.../executor/TableSimpleStatementExecutor.java | 2 +-
.../options/InternalJdbcConnectionOptions.java | 4 +-
.../jdbc/internal/options/JdbcDmlOptions.java | 2 +-
.../jdbc/table/JdbcDynamicTableFactory.java | 4 +-
.../jdbc/table/JdbcDynamicTableSource.java | 2 +-
.../jdbc/table/JdbcOutputFormatBuilder.java | 4 +-
.../jdbc/table/JdbcRowDataInputFormat.java | 2 +-
.../jdbc/table/JdbcRowDataLookupFunction.java | 4 +-
.../jdbc/table/RowDataResultExtractor.java | 2 +-
.../flink/connector/jdbc/utils/JdbcUtils.java | 4 +-
....flink.connector.jdbc.core.database.JdbcFactory | 2 +-
.../org.apache.flink.table.factories.Factory | 2 +-
.../flink/connector/jdbc/JdbcDataTestBase.java | 2 +-
.../apache/flink/connector/jdbc/JdbcTestBase.java | 2 +-
.../flink/connector/jdbc/JdbcTestFixture.java | 2 +-
.../catalog/AbstractJdbcCatalogTest.java | 2 +-
.../dialect/JdbcDialectConverterTest.java | 2 +-
.../dialect/JdbcDialectTest.java | 63 +++++-----------------
.../xa/SimpleXaConnectionProviderTest.java | 2 +-
.../xa/TransactionIdConnectionTest.java | 2 +-
.../jdbc/{databases => }/derby/DerbyTestBase.java | 4 +-
.../jdbc/derby/database/DerbyDialectTest.java | 33 ++++++------
.../derby/table/DerbyDynamicTableSinkITCase.java | 6 +--
.../derby/table/DerbyDynamicTableSourceITCase.java | 6 +--
.../derby => derby/testutils}/DerbyDatabase.java | 2 +-
.../derby => derby/testutils}/DerbyMetadata.java | 2 +-
.../derby/xa/DerbyExactlyOnceSinkE2eTest.java | 4 +-
.../jdbc/{databases => }/h2/H2XaTestBase.java | 4 +-
.../databases/h2 => h2/testutils}/H2Metadata.java | 4 +-
.../h2 => h2/testutils}/H2XaDatabase.java | 2 +-
.../testutils}/xa/H2XaConnectionWrapper.java | 2 +-
.../h2 => h2/testutils}/xa/H2XaDsWrapper.java | 2 +-
.../testutils}/xa/H2XaResourceWrapper.java | 2 +-
.../h2 => h2/testutils}/xa/package-info.java | 4 +-
.../connector/jdbc/sink/BaseJdbcSinkTest.java | 2 +-
.../jdbc/sink/writer/BaseJdbcWriterTest.java | 2 +-
.../jdbc/table/JdbcAppendOnlyWriterTest.java | 2 +-
...FilterPushdownPreparedStatementVisitorTest.java | 4 +-
.../connector/jdbc/table/JdbcLookupTestBase.java | 2 +-
.../jdbc/table/JdbcRowDataInputFormatTest.java | 2 +-
.../flink/connector/jdbc/xa/JdbcXaSinkH2Test.java | 6 +--
.../connector/jdbc/xa/JdbcXaSinkMigrationTest.java | 2 +-
.../jdbc/xa/JdbcXaSinkNoInsertionTest.java | 4 +-
.../database}/CrateDBFactory.java | 11 ++--
.../database}/catalog/CrateDBCatalog.java | 4 +-
.../database}/catalog/CrateDBTablePath.java | 4 +-
.../database}/catalog/CrateDBTypeMapper.java | 4 +-
.../database}/dialect/CrateDBDialect.java | 4 +-
.../database}/dialect/CrateDBDialectConverter.java | 4 +-
....flink.connector.jdbc.core.database.JdbcFactory | 2 +-
...che.flink.connector.jdbc.core.table.JdbcFactory | 16 ------
.../catalog => cratedb}/CrateDBTestBase.java | 4 +-
.../database}/catalog/CrateDBCatalogITCase.java | 4 +-
.../database}/catalog/CrateDBCatalogTest.java | 2 +-
.../database}/catalog/CrateDBCatalogTestBase.java | 5 +-
.../database}/catalog/CrateDBTablePathTest.java | 2 +-
.../database}/dialect/CrateDBDialectTest.java | 12 ++---
.../testutils}/CrateDBDatabase.java | 2 +-
.../testutils}/CrateDBMetadata.java | 2 +-
.../db2/dialect => db2/database}/Db2Factory.java | 9 ++--
.../db2 => db2/database}/dialect/Db2Dialect.java | 6 +--
.../database}/dialect/Db2DialectConverter.java | 4 +-
....flink.connector.jdbc.core.database.JdbcFactory | 2 +-
.../jdbc/{databases => }/db2/Db2TestBase.java | 4 +-
.../database}/dialect/Db2DialectTest.java | 13 ++---
.../dialect/Db2PreparedStatementTest.java | 6 +--
.../database}/table/Db2DynamicTableSinkITCase.java | 6 +--
.../table/Db2DynamicTableSourceITCase.java | 6 +--
.../db2 => db2/testutils}/Db2Database.java | 2 +-
.../db2 => db2/testutils}/Db2Metadata.java | 2 +-
.../db2/xa/Db2ExactlyOnceSinkE2eTest.java | 4 +-
.../dialect => mysql/database}/MySqlFactory.java | 11 ++--
.../database}/catalog/MySqlCatalog.java | 6 +--
.../database}/catalog/MySqlTypeMapper.java | 4 +-
.../database}/dialect/MySQLDialectConverter.java | 4 +-
.../database}/dialect/MySqlDialect.java | 6 +--
....flink.connector.jdbc.core.database.JdbcFactory | 2 +-
.../jdbc/{databases => }/mysql/MySqlTestBase.java | 4 +-
.../database}/catalog/MySql56CatalogITCase.java | 4 +-
.../database}/catalog/MySql57CatalogITCase.java | 4 +-
.../database}/catalog/MySqlCatalogITCase.java | 4 +-
.../database}/catalog/MySqlCatalogTestBase.java | 2 +-
.../database}/dialect/MySqlDialectTest.java | 12 ++---
.../dialect/MysqlPreparedStatementTest.java} | 9 ++--
.../mysql/table/MySqlDynamicTableSinkITCase.java | 6 +--
.../mysql/table/MySqlDynamicTableSourceITCase.java | 6 +--
.../mysql/table/UnsignedTypeConversionITCase.java | 4 +-
.../mysql => mysql/testutils}/MySql56Database.java | 2 +-
.../mysql => mysql/testutils}/MySql57Database.java | 2 +-
.../mysql => mysql/testutils}/MySqlContainer.java | 2 +-
.../mysql => mysql/testutils}/MySqlDatabase.java | 2 +-
.../mysql => mysql/testutils}/MySqlImages.java | 2 +-
.../mysql => mysql/testutils}/MySqlMetadata.java | 2 +-
.../mysql/xa/MySqlExactlyOnceSinkE2eTest.java | 4 +-
.../database}/OceanBaseFactory.java | 9 ++--
.../database}/dialect/OceanBaseDialect.java | 10 ++--
.../dialect/OceanBaseDialectConverter.java | 4 +-
....flink.connector.jdbc.core.database.JdbcFactory | 2 +-
...che.flink.connector.jdbc.core.table.JdbcFactory | 16 ------
.../oceanbase/OceanBaseMysqlTestBase.java | 6 +--
.../oceanbase/OceanBaseOracleTestBase.java | 6 +--
.../database}/dialect/OceanBaseDialectTest.java | 2 +-
.../dialect/OceanBaseMysqlDialectTest.java | 14 ++---
.../dialect/OceanBaseOracleDialectTest.java | 14 ++---
.../OceanBaseMySqlDynamicTableSinkITCase.java | 4 +-
.../OceanBaseMySqlDynamicTableSourceITCase.java | 4 +-
.../OceanBaseOracleDynamicTableSinkITCase.java | 4 +-
.../OceanBaseOracleDynamicTableSourceITCase.java | 4 +-
.../oceanbase/table/OceanBaseTableRow.java | 2 +-
.../testutils}/OceanBaseContainer.java | 2 +-
.../testutils}/OceanBaseDatabase.java | 2 +-
.../testutils}/OceanBaseImages.java | 2 +-
.../testutils}/OceanBaseMetadata.java | 2 +-
.../testutils}/OceanBaseTestDatabase.java | 2 +-
.../dialect => oracle/database}/OracleFactory.java | 9 ++--
.../database}/dialect/OracleDialect.java | 6 +--
.../database}/dialect/OracleDialectConverter.java | 4 +-
....flink.connector.jdbc.core.database.JdbcFactory | 2 +-
...che.flink.connector.jdbc.core.table.JdbcFactory | 16 ------
.../{databases => }/oracle/OracleTestBase.java | 4 +-
.../database}/dialect/OracleDialectTest.java | 12 ++---
.../dialect/OraclePreparedStatementTest.java | 6 +--
.../oracle/table/OracleDynamicTableSinkITCase.java | 6 +--
.../table/OracleDynamicTableSourceITCase.java | 6 +--
.../oracle/table/OracleTableSourceITCase.java | 6 +--
.../testutils}/OracleDatabase.java | 2 +-
.../oracle => oracle/testutils}/OracleImages.java | 2 +-
.../testutils}/OracleMetadata.java | 2 +-
.../oracle/xa/OracleExactlyOnceSinkE2eTest.java | 4 +-
.../database}/PostgresFactory.java | 11 ++--
.../database}/catalog/PostgresCatalog.java | 6 +--
.../database}/catalog/PostgresTablePath.java | 2 +-
.../database}/catalog/PostgresTypeMapper.java | 4 +-
.../dialect/CompatiblePostgresDialect.java | 2 +-
.../CompatiblePostgresDialectConverter.java | 2 +-
.../database}/dialect/PostgresDialect.java | 4 +-
.../dialect/PostgresDialectConverter.java | 4 +-
....flink.connector.jdbc.core.database.JdbcFactory | 2 +-
...che.flink.connector.jdbc.core.table.JdbcFactory | 16 ------
.../{databases => }/postgres/PostgresTestBase.java | 4 +-
.../database/PostgresFactoryTest.java} | 16 +++---
.../database}/catalog/PostgresCatalogITCase.java | 4 +-
.../database}/catalog/PostgresCatalogTest.java | 2 +-
.../database}/catalog/PostgresCatalogTestBase.java | 6 +--
.../database}/catalog/PostgresTablePathTest.java | 2 +-
.../database}/dialect/PostgresDialectTest.java | 12 ++---
.../table/PostgresDynamicTableSinkITCase.java | 6 +--
.../table/PostgresDynamicTableSourceITCase.java | 6 +--
.../testutils}/PostgresDatabase.java | 2 +-
.../testutils}/PostgresImages.java | 2 +-
.../testutils}/PostgresMetadata.java | 2 +-
.../xa/PostgresExactlyOnceSinkE2eTest.java | 4 +-
.../database}/SqlServerFactory.java | 9 ++--
.../database}/dialect/SqlServerDialect.java | 6 +--
.../dialect/SqlServerDialectConverter.java | 4 +-
....flink.connector.jdbc.core.database.JdbcFactory | 2 +-
...che.flink.connector.jdbc.core.table.JdbcFactory | 16 ------
.../sqlserver/SqlServerTestBase.java | 4 +-
.../dialect/SqlServerPreparedStatementTest.java | 6 +--
.../table/SqlServerDynamicTableSinkITCase.java | 6 +--
.../table/SqlServerDynamicTableSourceITCase.java | 6 +--
.../table/SqlServerTableSourceITCase.java | 6 +--
.../testutils}/SqlServerDatabase.java | 2 +-
.../testutils}/SqlServerImages.java | 2 +-
.../testutils}/SqlServerMetadata.java | 2 +-
.../xa/SqlServerExactlyOnceSinkE2eTest.java | 4 +-
.../dialect => trino/database}/TrinoFactory.java | 9 ++--
.../database}/dialect/TrinoDialect.java | 6 +--
.../database}/dialect/TrinoDialectConverter.java | 4 +-
....flink.connector.jdbc.core.database.JdbcFactory | 2 +-
.../jdbc/{databases => }/trino/TrinoTestBase.java | 4 +-
.../database}/dialect/TrinoDialectTest.java | 12 ++---
.../dialect/TrinoPreparedStatementTest.java | 6 +--
.../trino/table/TrinoDynamicTableSinkITCase.java | 6 +--
.../trino/table/TrinoDynamicTableSourceITCase.java | 6 +--
.../trino => trino/testutils}/TrinoDatabase.java | 8 +--
.../trino => trino/testutils}/TrinoImages.java | 2 +-
.../trino => trino/testutils}/TrinoMetadata.java | 2 +-
.../jdbc/catalog/AbstractJdbcCatalog.java | 2 +-
.../flink/connector/jdbc/catalog/JdbcCatalog.java | 7 ++-
.../connector/jdbc/catalog/JdbcCatalogUtils.java | 18 +++----
.../jdbc/catalog/factory/JdbcCatalogFactory.java | 14 ++---
.../jdbc/converter/AbstractJdbcRowConverter.java | 2 +-
.../connector/jdbc/converter/JdbcRowConverter.java | 2 +-
.../connector/jdbc/dialect/AbstractDialect.java | 4 +-
.../flink/connector/jdbc/dialect/JdbcDialect.java | 4 +-
.../connector/jdbc/dialect/JdbcDialectFactory.java | 2 +-
.../jdbc/dialect/JdbcDialectTypeMapper.java | 2 +-
.../jdbc/dialect/JdbcDialectTypeTest.java | 5 +-
208 files changed, 469 insertions(+), 605 deletions(-)
diff --git a/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DataStreamSinkTest.java b/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DataStreamSinkTest.java
index 30f97812..dcf4dd42 100644
--- a/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DataStreamSinkTest.java
+++ b/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DataStreamSinkTest.java
@@ -23,7 +23,7 @@ import org.apache.flink.connector.jdbc.JdbcConnectionOptions;
import org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions;
import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
import org.apache.flink.connector.jdbc.JdbcSink;
-import org.apache.flink.connector.jdbc.databases.postgres.PostgresTestBase;
+import org.apache.flink.connector.jdbc.postgres.PostgresTestBase;
import org.apache.flink.connector.jdbc.testutils.TableManaged;
import org.apache.flink.connector.jdbc.testutils.tables.templates.BooksTable;
import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration;
diff --git a/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DataStreamSourceTest.java b/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DataStreamSourceTest.java
index 3ac60f25..14a144bb 100644
--- a/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DataStreamSourceTest.java
+++ b/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DataStreamSourceTest.java
@@ -22,7 +22,7 @@ import org.apache.flink.api.common.eventtime.WatermarkStrategy;
import org.apache.flink.api.common.restartstrategy.RestartStrategies;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.connector.jdbc.JdbcTestFixture;
-import org.apache.flink.connector.jdbc.databases.postgres.PostgresTestBase;
+import org.apache.flink.connector.jdbc.postgres.PostgresTestBase;
import org.apache.flink.connector.jdbc.source.JdbcSource;
import org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor;
import org.apache.flink.connector.jdbc.split.JdbcGenericParameterValuesProvider;
diff --git a/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DynamicTableSinkTest.java b/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DynamicTableSinkTest.java
index c926e6bf..f45d446e 100644
--- a/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DynamicTableSinkTest.java
+++ b/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DynamicTableSinkTest.java
@@ -18,7 +18,7 @@
package org.apache.flink.connector.jdbc.backward.compatibility;
-import org.apache.flink.connector.jdbc.databases.postgres.PostgresTestBase;
+import org.apache.flink.connector.jdbc.postgres.PostgresTestBase;
import org.apache.flink.connector.jdbc.testutils.TableManaged;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration;
diff --git a/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DynamicTableSourceTest.java b/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DynamicTableSourceTest.java
index abf92aba..6b796769 100644
--- a/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DynamicTableSourceTest.java
+++ b/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DynamicTableSourceTest.java
@@ -1,7 +1,7 @@
package org.apache.flink.connector.jdbc.backward.compatibility;
import org.apache.flink.configuration.Configuration;
-import org.apache.flink.connector.jdbc.databases.postgres.PostgresTestBase;
+import org.apache.flink.connector.jdbc.postgres.PostgresTestBase;
import org.apache.flink.connector.jdbc.testutils.TableManaged;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/JdbcFactory.java
similarity index 94%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcFactory.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/JdbcFactory.java
index 250c6d65..65fc1f05 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/JdbcFactory.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.core.table;
+package org.apache.flink.connector.jdbc.core.database;
import org.apache.flink.annotation.PublicEvolving;
-import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.database.catalog.JdbcCatalog;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
import org.apache.flink.util.StringUtils;
/**
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcFactoryLoader.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/JdbcFactoryLoader.java
similarity index 96%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcFactoryLoader.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/JdbcFactoryLoader.java
index a9db62cc..ff5ddd11 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcFactoryLoader.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/JdbcFactoryLoader.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.core.table;
+package org.apache.flink.connector.jdbc.core.database;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.database.catalog.JdbcCatalog;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/AbstractJdbcCatalog.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/AbstractJdbcCatalog.java
similarity index 99%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/AbstractJdbcCatalog.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/AbstractJdbcCatalog.java
index a3c27c47..63d1e90f 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/AbstractJdbcCatalog.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/AbstractJdbcCatalog.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.core.table.catalog;
+package org.apache.flink.connector.jdbc.core.database.catalog;
import org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory;
import org.apache.flink.table.api.Schema;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/JdbcCatalog.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/JdbcCatalog.java
similarity index 80%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/JdbcCatalog.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/JdbcCatalog.java
index 5c70deee..b317405f 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/JdbcCatalog.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/JdbcCatalog.java
@@ -1,4 +1,4 @@
-package org.apache.flink.connector.jdbc.core.table.catalog;
+package org.apache.flink.connector.jdbc.core.database.catalog;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.table.catalog.Catalog;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/JdbcCatalogTypeMapper.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/JdbcCatalogTypeMapper.java
similarity index 95%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/JdbcCatalogTypeMapper.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/JdbcCatalogTypeMapper.java
index fa3e4cf4..ca4c0ee5 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/JdbcCatalogTypeMapper.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/JdbcCatalogTypeMapper.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.core.table.catalog;
+package org.apache.flink.connector.jdbc.core.database.catalog;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.table.catalog.ObjectPath;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/factory/JdbcCatalogFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/factory/JdbcCatalogFactory.java
similarity index 77%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/factory/JdbcCatalogFactory.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/factory/JdbcCatalogFactory.java
index b1fd7ca5..ca27d36b 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/factory/JdbcCatalogFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/factory/JdbcCatalogFactory.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.core.table.catalog.factory;
+package org.apache.flink.connector.jdbc.core.database.catalog.factory;
import org.apache.flink.configuration.ConfigOption;
-import org.apache.flink.connector.jdbc.core.table.JdbcFactoryLoader;
-import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
+import org.apache.flink.connector.jdbc.core.database.JdbcFactoryLoader;
+import org.apache.flink.connector.jdbc.core.database.catalog.JdbcCatalog;
import org.apache.flink.table.catalog.Catalog;
import org.apache.flink.table.factories.CatalogFactory;
import org.apache.flink.table.factories.FactoryUtil;
@@ -31,11 +31,11 @@ import org.slf4j.LoggerFactory;
import java.util.HashSet;
import java.util.Set;
-import static org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions.BASE_URL;
-import static org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions.COMPATIBLE_MODE;
-import static org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions.DEFAULT_DATABASE;
-import static org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions.PASSWORD;
-import static org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions.USERNAME;
+import static org.apache.flink.connector.jdbc.core.database.catalog.factory.JdbcCatalogFactoryOptions.BASE_URL;
+import static org.apache.flink.connector.jdbc.core.database.catalog.factory.JdbcCatalogFactoryOptions.COMPATIBLE_MODE;
+import static org.apache.flink.connector.jdbc.core.database.catalog.factory.JdbcCatalogFactoryOptions.DEFAULT_DATABASE;
+import static org.apache.flink.connector.jdbc.core.database.catalog.factory.JdbcCatalogFactoryOptions.PASSWORD;
+import static org.apache.flink.connector.jdbc.core.database.catalog.factory.JdbcCatalogFactoryOptions.USERNAME;
import static org.apache.flink.table.factories.FactoryUtil.PROPERTY_VERSION;
/** Factory for {@link JdbcCatalog}. */
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/factory/JdbcCatalogFactoryOptions.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/factory/JdbcCatalogFactoryOptions.java
similarity index 93%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/factory/JdbcCatalogFactoryOptions.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/factory/JdbcCatalogFactoryOptions.java
index b13f5c68..08faa228 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/factory/JdbcCatalogFactoryOptions.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/factory/JdbcCatalogFactoryOptions.java
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.core.table.catalog.factory;
+package org.apache.flink.connector.jdbc.core.database.catalog.factory;
import org.apache.flink.annotation.Internal;
import org.apache.flink.configuration.ConfigOption;
import org.apache.flink.configuration.ConfigOptions;
-import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
+import org.apache.flink.connector.jdbc.core.database.catalog.JdbcCatalog;
import org.apache.flink.connector.jdbc.table.JdbcConnectorOptions;
import org.apache.flink.table.catalog.CommonCatalogOptions;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/dialect/AbstractDialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/dialect/AbstractDialect.java
similarity index 97%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/dialect/AbstractDialect.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/dialect/AbstractDialect.java
index 29b58427..bae56895 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/dialect/AbstractDialect.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/dialect/AbstractDialect.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.core.table.dialect;
+package org.apache.flink.connector.jdbc.core.database.dialect;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.table.api.ValidationException;
@@ -57,7 +57,7 @@ public abstract class AbstractDialect implements JdbcDialect {
&& Integer.MAX_VALUE
!= ((VarBinaryType) field.getType()).getLength())) {
throw new ValidationException(
- String.format(
+ format(
"The %s dialect doesn't support type: %s.",
dialectName(), field.getType()));
}
@@ -68,14 +68,14 @@ public abstract class AbstractDialect implements JdbcDialect {
.orElseThrow(
() ->
new IllegalStateException(
- String.format(
+ format(
"JdbcDialect %s supports DECIMAL type but no precision range has been set. "
+ "Ensure AbstractDialect#decimalPrecisionRange() is overriden to return a valid Range",
dialectName())));
int precision = ((DecimalType) field.getType()).getPrecision();
if (precision > range.max || precision < range.min) {
throw new ValidationException(
- String.format(
+ format(
"The precision of field '%s' is out of the DECIMAL "
+ "precision range [%d, %d] supported by %s dialect.",
field.getName(), range.min, range.max, dialectName()));
@@ -88,14 +88,14 @@ public abstract class AbstractDialect implements JdbcDialect {
.orElseThrow(
() ->
new IllegalStateException(
- String.format(
+ format(
"JdbcDialect %s supports TIMESTAMP type but no precision range has been set."
+ "Ensure AbstractDialect#timestampPrecisionRange() is overriden to return a valid Range",
dialectName())));
int precision = ((TimestampType) field.getType()).getPrecision();
if (precision > range.max || precision < range.min) {
throw new ValidationException(
- String.format(
+ format(
"The precision of field '%s' is out of the TIMESTAMP "
+ "precision range [%d, %d] supported by %s dialect.",
field.getName(), range.min, range.max, dialectName()));
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/dialect/AbstractDialectConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/dialect/AbstractDialectConverter.java
similarity index 99%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/dialect/AbstractDialectConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/dialect/AbstractDialectConverter.java
index 95d9bcdd..e27dd852 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/dialect/AbstractDialectConverter.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/dialect/AbstractDialectConverter.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.core.table.dialect;
+package org.apache.flink.connector.jdbc.core.database.dialect;
import org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatement;
import org.apache.flink.connector.jdbc.utils.JdbcTypeUtil;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/dialect/JdbcDialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/dialect/JdbcDialect.java
similarity index 97%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/dialect/JdbcDialect.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/dialect/JdbcDialect.java
index b748d308..d3060076 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/dialect/JdbcDialect.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/dialect/JdbcDialect.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.core.table.dialect;
+package org.apache.flink.connector.jdbc.core.database.dialect;
import org.apache.flink.annotation.PublicEvolving;
-import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.database.JdbcFactory;
import org.apache.flink.table.api.ValidationException;
import org.apache.flink.table.types.logical.RowType;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/dialect/JdbcDialectConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/dialect/JdbcDialectConverter.java
similarity index 96%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/dialect/JdbcDialectConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/dialect/JdbcDialectConverter.java
index 77bb961e..f3620c28 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/dialect/JdbcDialectConverter.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/dialect/JdbcDialectConverter.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.core.table.dialect;
+package org.apache.flink.connector.jdbc.core.database.dialect;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatement;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/derby/database/DerbyFactory.java
similarity index 81%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyFactory.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/derby/database/DerbyFactory.java
index 7df224fc..db265d03 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/derby/database/DerbyFactory.java
@@ -16,12 +16,13 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.derby.dialect;
+package org.apache.flink.connector.jdbc.derby.database;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
-import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.database.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.database.catalog.JdbcCatalog;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.derby.database.dialect.DerbyDialect;
/** Factory for {@link DerbyDialect}. */
@Internal
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyDialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/derby/database/dialect/DerbyDialect.java
similarity index 94%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyDialect.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/derby/database/dialect/DerbyDialect.java
index 93c6c325..b11da606 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyDialect.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/derby/database/dialect/DerbyDialect.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.derby.dialect;
+package org.apache.flink.connector.jdbc.derby.database.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialect;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
+import org.apache.flink.connector.jdbc.core.database.dialect.AbstractDialect;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectConverter;
import org.apache.flink.table.types.logical.LogicalTypeRoot;
import org.apache.flink.table.types.logical.RowType;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyDialectConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/derby/database/dialect/DerbyDialectConverter.java
similarity index 89%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyDialectConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/derby/database/dialect/DerbyDialectConverter.java
index 846f2c16..7a4362c3 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyDialectConverter.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/derby/database/dialect/DerbyDialectConverter.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.derby.dialect;
+package org.apache.flink.connector.jdbc.derby.database.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialectConverter;
+import org.apache.flink.connector.jdbc.core.database.dialect.AbstractDialectConverter;
import org.apache.flink.table.types.logical.RowType;
/**
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableInsertOrUpdateStatementExecutor.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableInsertOrUpdateStatementExecutor.java
index 17a25c6f..61ef4cc4 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableInsertOrUpdateStatementExecutor.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableInsertOrUpdateStatementExecutor.java
@@ -18,7 +18,7 @@
package org.apache.flink.connector.jdbc.internal.executor;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectConverter;
import org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatement;
import org.apache.flink.connector.jdbc.statement.StatementFactory;
import org.apache.flink.table.data.RowData;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableSimpleStatementExecutor.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableSimpleStatementExecutor.java
index 59866b51..a3fc7b7e 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableSimpleStatementExecutor.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableSimpleStatementExecutor.java
@@ -18,7 +18,7 @@
package org.apache.flink.connector.jdbc.internal.executor;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectConverter;
import org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatement;
import org.apache.flink.connector.jdbc.statement.StatementFactory;
import org.apache.flink.table.data.RowData;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/InternalJdbcConnectionOptions.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/InternalJdbcConnectionOptions.java
index 753e5cab..de9e67b7 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/InternalJdbcConnectionOptions.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/InternalJdbcConnectionOptions.java
@@ -20,8 +20,8 @@ package org.apache.flink.connector.jdbc.internal.options;
import org.apache.flink.annotation.Internal;
import org.apache.flink.connector.jdbc.JdbcConnectionOptions;
-import org.apache.flink.connector.jdbc.core.table.JdbcFactoryLoader;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.database.JdbcFactoryLoader;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
import org.apache.flink.util.Preconditions;
import javax.annotation.Nonnull;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcDmlOptions.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcDmlOptions.java
index 776fe431..4a918164 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcDmlOptions.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcDmlOptions.java
@@ -17,7 +17,7 @@
package org.apache.flink.connector.jdbc.internal.options;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
import org.apache.flink.util.Preconditions;
import javax.annotation.Nullable;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactory.java
index 17ba340d..4e427027 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactory.java
@@ -23,8 +23,8 @@ import org.apache.flink.configuration.ConfigOption;
import org.apache.flink.configuration.ConfigOptions;
import org.apache.flink.configuration.ReadableConfig;
import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
-import org.apache.flink.connector.jdbc.core.table.JdbcFactoryLoader;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.database.JdbcFactoryLoader;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
import org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions;
import org.apache.flink.connector.jdbc.internal.options.JdbcDmlOptions;
import org.apache.flink.connector.jdbc.internal.options.JdbcReadOptions;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSource.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSource.java
index bc2c1732..08716bc8 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSource.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSource.java
@@ -19,7 +19,7 @@
package org.apache.flink.connector.jdbc.table;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
import org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions;
import org.apache.flink.connector.jdbc.internal.options.JdbcReadOptions;
import org.apache.flink.connector.jdbc.split.CompositeJdbcParameterValuesProvider;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatBuilder.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatBuilder.java
index 554aaaf2..1bd2fc5d 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatBuilder.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatBuilder.java
@@ -19,8 +19,8 @@
package org.apache.flink.connector.jdbc.table;
import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectConverter;
import org.apache.flink.connector.jdbc.datasource.connections.SimpleJdbcConnectionProvider;
import org.apache.flink.connector.jdbc.internal.JdbcOutputFormat;
import org.apache.flink.connector.jdbc.internal.executor.JdbcBatchStatementExecutor;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormat.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormat.java
index a4990a73..812c1891 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormat.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormat.java
@@ -27,7 +27,7 @@ import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.api.java.typeutils.ResultTypeQueryable;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.connector.jdbc.JdbcConnectionOptions;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectConverter;
import org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider;
import org.apache.flink.connector.jdbc.datasource.connections.SimpleJdbcConnectionProvider;
import org.apache.flink.connector.jdbc.split.JdbcParameterValuesProvider;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunction.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunction.java
index d3e95b31..9bbe8939 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunction.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunction.java
@@ -20,8 +20,8 @@ package org.apache.flink.connector.jdbc.table;
import org.apache.flink.annotation.Internal;
import org.apache.flink.annotation.VisibleForTesting;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectConverter;
import org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider;
import org.apache.flink.connector.jdbc.datasource.connections.SimpleJdbcConnectionProvider;
import org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/RowDataResultExtractor.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/RowDataResultExtractor.java
index 3fc1e422..2bb65b80 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/RowDataResultExtractor.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/RowDataResultExtractor.java
@@ -18,7 +18,7 @@
package org.apache.flink.connector.jdbc.table;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectConverter;
import org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor;
import org.apache.flink.table.data.RowData;
import org.apache.flink.util.Preconditions;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/utils/JdbcUtils.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/utils/JdbcUtils.java
index bf405a20..53023cd2 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/utils/JdbcUtils.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/utils/JdbcUtils.java
@@ -33,8 +33,8 @@ import java.util.Objects;
import java.util.Properties;
import static org.apache.flink.connector.jdbc.JdbcConnectionOptions.getBriefAuthProperties;
-import static org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions.PASSWORD;
-import static org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions.USERNAME;
+import static org.apache.flink.connector.jdbc.core.database.catalog.factory.JdbcCatalogFactoryOptions.PASSWORD;
+import static org.apache.flink.connector.jdbc.core.database.catalog.factory.JdbcCatalogFactoryOptions.USERNAME;
/** Utils for jdbc connectors. */
public class JdbcUtils {
diff --git a/flink-connector-jdbc-db2/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory b/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
similarity index 92%
copy from flink-connector-jdbc-db2/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
copy to flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
index 762b3ce1..0d57ddaf 100644
--- a/flink-connector-jdbc-db2/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
+++ b/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.flink.connector.jdbc.databases.db2.dialect.Db2Factory
+org.apache.flink.connector.jdbc.derby.database.DerbyFactory
diff --git a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
index 41de0904..b0c68772 100644
--- a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
+++ b/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
@@ -14,4 +14,4 @@
# limitations under the License.
org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory
-org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactory
+org.apache.flink.connector.jdbc.core.database.catalog.factory.JdbcCatalogFactory
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcDataTestBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcDataTestBase.java
index 2a24f97e..d61100ef 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcDataTestBase.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcDataTestBase.java
@@ -17,8 +17,8 @@
package org.apache.flink.connector.jdbc;
+import org.apache.flink.connector.jdbc.derby.testutils.DerbyMetadata;
import org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor;
-import org.apache.flink.connector.jdbc.testutils.databases.derby.DerbyMetadata;
import org.apache.flink.table.data.GenericRowData;
import org.apache.flink.table.data.RowData;
import org.apache.flink.table.data.StringData;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcTestBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcTestBase.java
index ed33918d..e016ad18 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcTestBase.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcTestBase.java
@@ -22,7 +22,7 @@ import org.apache.flink.api.common.JobID;
import org.apache.flink.api.common.functions.RuntimeContext;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.api.common.typeutils.TypeSerializer;
-import org.apache.flink.connector.jdbc.databases.derby.DerbyTestBase;
+import org.apache.flink.connector.jdbc.derby.DerbyTestBase;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcTestFixture.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcTestFixture.java
index 4c7519dd..c77834c8 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcTestFixture.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcTestFixture.java
@@ -20,7 +20,7 @@ package org.apache.flink.connector.jdbc;
import org.apache.flink.api.common.typeinfo.BasicTypeInfo;
import org.apache.flink.api.java.typeutils.RowTypeInfo;
-import org.apache.flink.connector.jdbc.databases.derby.DerbyTestBase;
+import org.apache.flink.connector.jdbc.derby.DerbyTestBase;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
import org.apache.flink.table.types.logical.RowType;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/catalog/AbstractJdbcCatalogTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/database/catalog/AbstractJdbcCatalogTest.java
similarity index 95%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/catalog/AbstractJdbcCatalogTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/database/catalog/AbstractJdbcCatalogTest.java
index cde094a0..371140d3 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/catalog/AbstractJdbcCatalogTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/database/catalog/AbstractJdbcCatalogTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.core.table.catalog;
+package org.apache.flink.connector.jdbc.core.database.catalog;
import org.junit.jupiter.api.Test;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/dialect/JdbcDialectConverterTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/database/dialect/JdbcDialectConverterTest.java
similarity index 97%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/dialect/JdbcDialectConverterTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/database/dialect/JdbcDialectConverterTest.java
index d39bf355..f4261afd 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/dialect/JdbcDialectConverterTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/database/dialect/JdbcDialectConverterTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.core.table.dialect;
+package org.apache.flink.connector.jdbc.core.database.dialect;
import org.apache.flink.table.data.RowData;
import org.apache.flink.table.types.logical.IntType;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/dialect/JdbcDialectTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/database/dialect/JdbcDialectTest.java
similarity index 54%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/dialect/JdbcDialectTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/database/dialect/JdbcDialectTest.java
index 99ad42ff..576aad22 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/dialect/JdbcDialectTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/database/dialect/JdbcDialectTest.java
@@ -16,8 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.core.table.dialect;
+package org.apache.flink.connector.jdbc.core.database.dialect;
+import org.apache.flink.connector.jdbc.testutils.DatabaseTest;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
@@ -27,7 +28,6 @@ import org.junit.jupiter.params.provider.MethodSource;
import javax.annotation.Nullable;
-import java.util.Arrays;
import java.util.List;
import static org.apache.flink.core.testutils.FlinkAssertions.anyCauseMatches;
@@ -35,63 +35,30 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
/** Tests for all DataTypes and Dialects of JDBC connector. */
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public class JdbcDialectTest {
+public abstract class JdbcDialectTest implements DatabaseTest {
protected String ddlFormat =
"CREATE TABLE T (f0 %s)"
+ " WITH ("
+ " 'connector'='jdbc',"
- + " 'url'='jdbc:%s:memory:test',"
+ + " 'url'='%s',"
+ " 'table-name'='myTable'"
+ ")";
- protected String testDialect() {
- return "derby";
- }
-
- protected List<TestItem> testData() {
- return Arrays.asList(
- createTestItem("CHAR"),
- createTestItem("VARCHAR"),
- createTestItem("BOOLEAN"),
- createTestItem("TINYINT"),
- createTestItem("SMALLINT"),
- createTestItem("INTEGER"),
- createTestItem("BIGINT"),
- createTestItem("FLOAT"),
- createTestItem("DOUBLE"),
- createTestItem("DECIMAL(10, 4)"),
- createTestItem("DATE"),
- createTestItem("TIME"),
- createTestItem("TIMESTAMP(3)"),
- createTestItem("TIMESTAMP WITHOUT TIME ZONE"),
- createTestItem("TIMESTAMP(9) WITHOUT TIME ZONE"),
- createTestItem("VARBINARY"),
-
- // Not valid data
- createTestItem("BINARY", "The Derby dialect doesn't support type: BINARY(1)."),
- createTestItem(
- "VARBINARY(10)", "The Derby dialect doesn't support type: VARBINARY(10)."),
- createTestItem(
- "TIMESTAMP_LTZ(3)",
- "The Derby dialect doesn't support type: TIMESTAMP_LTZ(3)."),
- createTestItem(
- "DECIMAL(38, 18)",
- "The precision of field 'f0' is out of the DECIMAL precision range [1, 31] supported by Derby dialect."));
- }
+ protected abstract List<TestItem> testData();
protected TestItem createTestItem(String dataType) {
- return TestItem.of(testDialect(), dataType);
+ return TestItem.of(dataType);
}
protected TestItem createTestItem(String dataType, String expectError) {
- return TestItem.of(testDialect(), dataType, expectError);
+ return TestItem.of(dataType, expectError);
}
@ParameterizedTest
@MethodSource("testData")
void testDataTypeValidate(TestItem testItem) {
- String sqlDDL = String.format(ddlFormat, testItem.dataTypeExpr, testItem.dialect);
+ String sqlDDL = String.format(ddlFormat, testItem.dataTypeExpr, getMetadata().getJdbcUrl());
StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
StreamTableEnvironment tEnv = StreamTableEnvironment.create(env);
@@ -109,27 +76,25 @@ public class JdbcDialectTest {
// ~ Inner Class
/** Test item for parameterized test. */
public static class TestItem {
- private final String dialect;
private final String dataTypeExpr;
private final String expectError;
- private TestItem(String dialect, String dataTypeExpr, @Nullable String expectError) {
- this.dialect = dialect;
+ private TestItem(String dataTypeExpr, @Nullable String expectError) {
this.dataTypeExpr = dataTypeExpr;
this.expectError = expectError;
}
- static TestItem of(String dialect, String dataTypeExpr) {
- return new TestItem(dialect, dataTypeExpr, null);
+ static TestItem of(String dataTypeExpr) {
+ return new TestItem(dataTypeExpr, null);
}
- static TestItem of(String dialect, String dataTypeExpr, String expectError) {
- return new TestItem(dialect, dataTypeExpr, expectError);
+ static TestItem of(String dataTypeExpr, String expectError) {
+ return new TestItem(dataTypeExpr, expectError);
}
@Override
public String toString() {
- return String.format("Dialect: %s, DataType: %s", dialect, dataTypeExpr);
+ return String.format("DataType: %s", dataTypeExpr);
}
}
}
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/connections/xa/SimpleXaConnectionProviderTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/connections/xa/SimpleXaConnectionProviderTest.java
index f7602059..84316ec0 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/connections/xa/SimpleXaConnectionProviderTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/connections/xa/SimpleXaConnectionProviderTest.java
@@ -1,8 +1,8 @@
package org.apache.flink.connector.jdbc.datasource.connections.xa;
-import org.apache.flink.connector.jdbc.databases.derby.DerbyTestBase;
import org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId;
import org.apache.flink.connector.jdbc.datasource.transactions.xa.exceptions.EmptyTransactionXaException;
+import org.apache.flink.connector.jdbc.derby.DerbyTestBase;
import org.apache.flink.connector.jdbc.testutils.TableManaged;
import org.apache.flink.connector.jdbc.testutils.tables.templates.BooksTable;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/connections/xa/TransactionIdConnectionTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/connections/xa/TransactionIdConnectionTest.java
index 8116d25f..d190ef5a 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/connections/xa/TransactionIdConnectionTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/connections/xa/TransactionIdConnectionTest.java
@@ -1,9 +1,9 @@
package org.apache.flink.connector.jdbc.datasource.connections.xa;
import org.apache.flink.api.common.JobID;
-import org.apache.flink.connector.jdbc.databases.derby.DerbyTestBase;
import org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId;
import org.apache.flink.connector.jdbc.datasource.transactions.xa.exceptions.EmptyTransactionXaException;
+import org.apache.flink.connector.jdbc.derby.DerbyTestBase;
import org.apache.flink.connector.jdbc.testutils.TableManaged;
import org.apache.flink.connector.jdbc.testutils.tables.templates.BooksTable;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/derby/DerbyTestBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/DerbyTestBase.java
similarity index 89%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/derby/DerbyTestBase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/DerbyTestBase.java
index b8f32fdc..5e2937ca 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/derby/DerbyTestBase.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/DerbyTestBase.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.derby;
+package org.apache.flink.connector.jdbc.derby;
+import org.apache.flink.connector.jdbc.derby.testutils.DerbyDatabase;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
import org.apache.flink.connector.jdbc.testutils.DatabaseTest;
-import org.apache.flink.connector.jdbc.testutils.databases.derby.DerbyDatabase;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/database/DerbyDialectTest.java
similarity index 64%
copy from flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectTest.java
copy to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/database/DerbyDialectTest.java
index a0973a28..cb4c94fe 100644
--- a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/database/DerbyDialectTest.java
@@ -16,20 +16,21 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.postgres.dialect;
+package org.apache.flink.connector.jdbc.derby.database;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectTest;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectTest;
+import org.apache.flink.connector.jdbc.derby.DerbyTestBase;
import java.util.Arrays;
import java.util.List;
-/** The PostgresSql params for {@link JdbcDialectTest}. */
-class PostgresDialectTest extends JdbcDialectTest {
+/** The Derby params for {@link JdbcDialectTest}. */
+public class DerbyDialectTest extends JdbcDialectTest implements DerbyTestBase {
- @Override
- protected String testDialect() {
- return "postgresql";
- }
+ // @Override
+ // protected String testDialect() {
+ // return "derby";
+ // }
@Override
protected List<TestItem> testData() {
@@ -44,22 +45,22 @@ class PostgresDialectTest extends JdbcDialectTest {
createTestItem("FLOAT"),
createTestItem("DOUBLE"),
createTestItem("DECIMAL(10, 4)"),
- createTestItem("DECIMAL(38, 18)"),
createTestItem("DATE"),
createTestItem("TIME"),
createTestItem("TIMESTAMP(3)"),
createTestItem("TIMESTAMP WITHOUT TIME ZONE"),
+ createTestItem("TIMESTAMP(9) WITHOUT TIME ZONE"),
createTestItem("VARBINARY"),
- createTestItem("ARRAY<INTEGER>"),
// Not valid data
- createTestItem("BINARY", "The PostgreSQL dialect doesn't support type: BINARY(1)."),
+ createTestItem("BINARY", "The Derby dialect doesn't support type: BINARY(1)."),
+ createTestItem(
+ "VARBINARY(10)", "The Derby dialect doesn't support type: VARBINARY(10)."),
createTestItem(
- "VARBINARY(10)",
- "The PostgreSQL dialect doesn't support type: VARBINARY(10)."),
+ "TIMESTAMP_LTZ(3)",
+ "The Derby dialect doesn't support type: TIMESTAMP_LTZ(3)."),
createTestItem(
- "TIMESTAMP(9) WITHOUT TIME ZONE",
- "The precision of field 'f0' is out of the TIMESTAMP precision range [1, 6] supported by PostgreSQL dialect."),
- createTestItem("TIMESTAMP_LTZ(3)", "Unsupported type:TIMESTAMP_LTZ(3)"));
+ "DECIMAL(38, 18)",
+ "The precision of field 'f0' is out of the DECIMAL precision range [1, 31] supported by Derby dialect."));
}
}
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/derby/table/DerbyDynamicTableSinkITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/table/DerbyDynamicTableSinkITCase.java
similarity index 83%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/derby/table/DerbyDynamicTableSinkITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/table/DerbyDynamicTableSinkITCase.java
index 80b54b75..6912bae7 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/derby/table/DerbyDynamicTableSinkITCase.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/table/DerbyDynamicTableSinkITCase.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.derby.table;
+package org.apache.flink.connector.jdbc.derby.table;
-import org.apache.flink.connector.jdbc.databases.derby.DerbyTestBase;
-import org.apache.flink.connector.jdbc.databases.derby.dialect.DerbyDialect;
+import org.apache.flink.connector.jdbc.derby.DerbyTestBase;
+import org.apache.flink.connector.jdbc.derby.database.dialect.DerbyDialect;
import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSinkITCase;
/** The Table Sink ITCase for {@link DerbyDialect}. */
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/derby/table/DerbyDynamicTableSourceITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/table/DerbyDynamicTableSourceITCase.java
similarity index 93%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/derby/table/DerbyDynamicTableSourceITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/table/DerbyDynamicTableSourceITCase.java
index dd5e4939..5d201227 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/derby/table/DerbyDynamicTableSourceITCase.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/table/DerbyDynamicTableSourceITCase.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.derby.table;
+package org.apache.flink.connector.jdbc.derby.table;
-import org.apache.flink.connector.jdbc.databases.derby.DerbyTestBase;
-import org.apache.flink.connector.jdbc.databases.derby.dialect.DerbyDialect;
+import org.apache.flink.connector.jdbc.derby.DerbyTestBase;
+import org.apache.flink.connector.jdbc.derby.database.dialect.DerbyDialect;
import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/derby/DerbyDatabase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/testutils/DerbyDatabase.java
similarity index 97%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/derby/DerbyDatabase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/testutils/DerbyDatabase.java
index 61c5541f..b8a7439d 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/derby/DerbyDatabase.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/testutils/DerbyDatabase.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.derby;
+package org.apache.flink.connector.jdbc.derby.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/derby/DerbyMetadata.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/testutils/DerbyMetadata.java
similarity index 96%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/derby/DerbyMetadata.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/testutils/DerbyMetadata.java
index b5df6ef6..e5ba36c6 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/derby/DerbyMetadata.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/testutils/DerbyMetadata.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.derby;
+package org.apache.flink.connector.jdbc.derby.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/derby/xa/DerbyExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/xa/DerbyExactlyOnceSinkE2eTest.java
similarity index 89%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/derby/xa/DerbyExactlyOnceSinkE2eTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/xa/DerbyExactlyOnceSinkE2eTest.java
index 6c938fd0..2cf93981 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/derby/xa/DerbyExactlyOnceSinkE2eTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/xa/DerbyExactlyOnceSinkE2eTest.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.derby.xa;
+package org.apache.flink.connector.jdbc.derby.xa;
-import org.apache.flink.connector.jdbc.databases.derby.DerbyTestBase;
+import org.apache.flink.connector.jdbc.derby.DerbyTestBase;
import org.apache.flink.connector.jdbc.xa.JdbcExactlyOnceSinkE2eTest;
/**
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/h2/H2XaTestBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/H2XaTestBase.java
similarity index 90%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/h2/H2XaTestBase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/H2XaTestBase.java
index 3c588c73..3701f896 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/h2/H2XaTestBase.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/H2XaTestBase.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.h2;
+package org.apache.flink.connector.jdbc.h2;
+import org.apache.flink.connector.jdbc.h2.testutils.H2XaDatabase;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
import org.apache.flink.connector.jdbc.testutils.DatabaseTest;
-import org.apache.flink.connector.jdbc.testutils.databases.h2.H2XaDatabase;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/H2Metadata.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils/H2Metadata.java
similarity index 92%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/H2Metadata.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils/H2Metadata.java
index cf308eac..c54b8ad3 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/H2Metadata.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils/H2Metadata.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.h2;
+package org.apache.flink.connector.jdbc.h2.testutils;
+import org.apache.flink.connector.jdbc.h2.testutils.xa.H2XaDsWrapper;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
-import org.apache.flink.connector.jdbc.testutils.databases.h2.xa.H2XaDsWrapper;
import javax.sql.XADataSource;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/H2XaDatabase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils/H2XaDatabase.java
similarity index 96%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/H2XaDatabase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils/H2XaDatabase.java
index 731d2b43..edca8ad0 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/H2XaDatabase.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils/H2XaDatabase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.h2;
+package org.apache.flink.connector.jdbc.h2.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/H2XaConnectionWrapper.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils/xa/H2XaConnectionWrapper.java
similarity index 97%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/H2XaConnectionWrapper.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils/xa/H2XaConnectionWrapper.java
index 274093bd..5de58fb6 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/H2XaConnectionWrapper.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils/xa/H2XaConnectionWrapper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.h2.xa;
+package org.apache.flink.connector.jdbc.h2.testutils.xa;
import javax.sql.ConnectionEventListener;
import javax.sql.StatementEventListener;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/H2XaDsWrapper.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils/xa/H2XaDsWrapper.java
similarity index 97%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/H2XaDsWrapper.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils/xa/H2XaDsWrapper.java
index e4a3b227..6ccb563a 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/H2XaDsWrapper.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils/xa/H2XaDsWrapper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.h2.xa;
+package org.apache.flink.connector.jdbc.h2.testutils.xa;
import javax.sql.XAConnection;
import javax.sql.XADataSource;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/H2XaResourceWrapper.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils/xa/H2XaResourceWrapper.java
similarity index 99%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/H2XaResourceWrapper.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils/xa/H2XaResourceWrapper.java
index c168fc36..0cd7245d 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/H2XaResourceWrapper.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils/xa/H2XaResourceWrapper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.h2.xa;
+package org.apache.flink.connector.jdbc.h2.testutils.xa;
import org.apache.flink.util.function.ThrowingRunnable;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/package-info.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils/xa/package-info.java
similarity index 84%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/package-info.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils/xa/package-info.java
index 8e46a4fd..714d9b36 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/package-info.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils/xa/package-info.java
@@ -17,6 +17,6 @@
/**
* This package holds some workarounds for the H2 XA client, plus {@link
- * org.apache.flink.connector.jdbc.testutils.databases.h2.H2Metadata}. Used only for testing.
+ * org.apache.flink.connector.jdbc.h2.testutils.H2Metadata}. Used only for testing.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.h2.xa;
+package org.apache.flink.connector.jdbc.h2.testutils.xa;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/BaseJdbcSinkTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/BaseJdbcSinkTest.java
index 80156213..7224647a 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/BaseJdbcSinkTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/BaseJdbcSinkTest.java
@@ -18,7 +18,7 @@
package org.apache.flink.connector.jdbc.sink;
import org.apache.flink.api.common.restartstrategy.RestartStrategies;
-import org.apache.flink.connector.jdbc.databases.derby.DerbyTestBase;
+import org.apache.flink.connector.jdbc.derby.DerbyTestBase;
import org.apache.flink.connector.jdbc.testutils.TableManaged;
import org.apache.flink.connector.jdbc.testutils.tables.templates.BooksTable;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/BaseJdbcWriterTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/BaseJdbcWriterTest.java
index 61b28962..914a2fbf 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/BaseJdbcWriterTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/BaseJdbcWriterTest.java
@@ -6,10 +6,10 @@ import org.apache.flink.api.connector.sink2.SinkWriter;
import org.apache.flink.connector.base.DeliveryGuarantee;
import org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions;
import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
-import org.apache.flink.connector.jdbc.databases.derby.DerbyTestBase;
import org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider;
import org.apache.flink.connector.jdbc.datasource.statements.JdbcQueryStatement;
import org.apache.flink.connector.jdbc.datasource.statements.SimpleJdbcQueryStatement;
+import org.apache.flink.connector.jdbc.derby.DerbyTestBase;
import org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer;
import org.apache.flink.connector.jdbc.sink.committer.JdbcCommitable;
import org.apache.flink.connector.jdbc.testutils.TableManaged;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcAppendOnlyWriterTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcAppendOnlyWriterTest.java
index cad629f0..17ea9260 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcAppendOnlyWriterTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcAppendOnlyWriterTest.java
@@ -20,7 +20,7 @@ package org.apache.flink.connector.jdbc.table;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.connector.jdbc.JdbcTestBase;
-import org.apache.flink.connector.jdbc.core.table.JdbcFactoryLoader;
+import org.apache.flink.connector.jdbc.core.database.JdbcFactoryLoader;
import org.apache.flink.connector.jdbc.internal.JdbcOutputFormat;
import org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer;
import org.apache.flink.connector.jdbc.internal.RowJdbcOutputFormat;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcFilterPushdownPreparedStatementVisitorTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcFilterPushdownPreparedStatementVisitorTest.java
index 147a254e..1f5a0493 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcFilterPushdownPreparedStatementVisitorTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcFilterPushdownPreparedStatementVisitorTest.java
@@ -19,8 +19,8 @@
package org.apache.flink.connector.jdbc.table;
import org.apache.flink.connector.jdbc.JdbcTestBase;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.databases.derby.dialect.DerbyFactory;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.derby.database.DerbyFactory;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.table.api.TableEnvironment;
import org.apache.flink.table.api.TableException;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcLookupTestBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcLookupTestBase.java
index a37ed5ff..1c8cbdd9 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcLookupTestBase.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcLookupTestBase.java
@@ -18,7 +18,7 @@
package org.apache.flink.connector.jdbc.table;
-import org.apache.flink.connector.jdbc.databases.derby.DerbyTestBase;
+import org.apache.flink.connector.jdbc.derby.DerbyTestBase;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormatTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormatTest.java
index 3f8d19ea..259c3746 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormatTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormatTest.java
@@ -20,7 +20,7 @@ package org.apache.flink.connector.jdbc.table;
import org.apache.flink.connector.jdbc.JdbcDataTestBase;
import org.apache.flink.connector.jdbc.JdbcTestFixture;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
import org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions;
import org.apache.flink.connector.jdbc.split.JdbcGenericParameterValuesProvider;
import org.apache.flink.connector.jdbc.split.JdbcNumericBetweenParametersProvider;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkH2Test.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkH2Test.java
index 8045ace7..d080bbcf 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkH2Test.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkH2Test.java
@@ -18,10 +18,10 @@
package org.apache.flink.connector.jdbc.xa;
import org.apache.flink.connector.jdbc.JdbcTestFixture;
-import org.apache.flink.connector.jdbc.databases.h2.H2XaTestBase;
+import org.apache.flink.connector.jdbc.h2.H2XaTestBase;
+import org.apache.flink.connector.jdbc.h2.testutils.H2XaDatabase;
+import org.apache.flink.connector.jdbc.h2.testutils.xa.H2XaDsWrapper;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
-import org.apache.flink.connector.jdbc.testutils.databases.h2.H2XaDatabase;
-import org.apache.flink.connector.jdbc.testutils.databases.h2.xa.H2XaDsWrapper;
import org.junit.jupiter.api.Test;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkMigrationTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkMigrationTest.java
index 01abbd77..3a4d4df4 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkMigrationTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkMigrationTest.java
@@ -22,7 +22,7 @@ import org.apache.flink.configuration.Configuration;
import org.apache.flink.connector.jdbc.JdbcTestBase;
import org.apache.flink.connector.jdbc.JdbcTestFixture;
import org.apache.flink.connector.jdbc.JdbcTestFixture.TestEntry;
-import org.apache.flink.connector.jdbc.testutils.databases.derby.DerbyDatabase;
+import org.apache.flink.connector.jdbc.derby.testutils.DerbyDatabase;
import org.apache.flink.runtime.checkpoint.OperatorSubtaskState;
import org.apache.flink.streaming.api.operators.StreamSink;
import org.apache.flink.streaming.util.OneInputStreamOperatorTestHarness;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkNoInsertionTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkNoInsertionTest.java
index d9a2c064..48972a97 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkNoInsertionTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkNoInsertionTest.java
@@ -18,9 +18,9 @@
package org.apache.flink.connector.jdbc.xa;
import org.apache.flink.connector.jdbc.JdbcTestFixture;
-import org.apache.flink.connector.jdbc.databases.h2.H2XaTestBase;
+import org.apache.flink.connector.jdbc.h2.H2XaTestBase;
+import org.apache.flink.connector.jdbc.h2.testutils.H2XaDatabase;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
-import org.apache.flink.connector.jdbc.testutils.databases.h2.H2XaDatabase;
import org.junit.jupiter.api.Test;
diff --git a/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBFactory.java b/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/cratedb/database/CrateDBFactory.java
similarity index 78%
rename from flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBFactory.java
rename to flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/cratedb/database/CrateDBFactory.java
index 94179408..ee52ab1b 100644
--- a/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBFactory.java
+++ b/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/cratedb/database/CrateDBFactory.java
@@ -16,13 +16,14 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.cratedb.dialect;
+package org.apache.flink.connector.jdbc.cratedb.database;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
-import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.databases.cratedb.catalog.CrateDBCatalog;
+import org.apache.flink.connector.jdbc.core.database.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.database.catalog.JdbcCatalog;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.cratedb.database.catalog.CrateDBCatalog;
+import org.apache.flink.connector.jdbc.cratedb.database.dialect.CrateDBDialect;
/** Factory for {@link CrateDBDialect}. */
@Internal
diff --git a/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalog.java b/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/cratedb/database/catalog/CrateDBCatalog.java
similarity index 97%
rename from flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalog.java
rename to flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/cratedb/database/catalog/CrateDBCatalog.java
index 3b00495f..a28f3de7 100644
--- a/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalog.java
+++ b/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/cratedb/database/catalog/CrateDBCatalog.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.cratedb.catalog;
+package org.apache.flink.connector.jdbc.cratedb.database.catalog;
import org.apache.flink.annotation.Internal;
import org.apache.flink.annotation.VisibleForTesting;
-import org.apache.flink.connector.jdbc.databases.postgres.catalog.PostgresCatalog;
+import org.apache.flink.connector.jdbc.postgres.database.catalog.PostgresCatalog;
import org.apache.flink.table.catalog.ObjectPath;
import org.apache.flink.table.catalog.exceptions.CatalogException;
import org.apache.flink.table.catalog.exceptions.DatabaseNotExistException;
diff --git a/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTablePath.java b/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/cratedb/database/catalog/CrateDBTablePath.java
similarity index 93%
rename from flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTablePath.java
rename to flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/cratedb/database/catalog/CrateDBTablePath.java
index de7d57cd..c0f77cdd 100644
--- a/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTablePath.java
+++ b/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/cratedb/database/catalog/CrateDBTablePath.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.cratedb.catalog;
+package org.apache.flink.connector.jdbc.cratedb.database.catalog;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.databases.postgres.catalog.PostgresTablePath;
+import org.apache.flink.connector.jdbc.postgres.database.catalog.PostgresTablePath;
import static org.apache.flink.util.Preconditions.checkArgument;
diff --git a/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTypeMapper.java b/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/cratedb/database/catalog/CrateDBTypeMapper.java
similarity index 92%
rename from flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTypeMapper.java
rename to flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/cratedb/database/catalog/CrateDBTypeMapper.java
index 3532a1e5..43a6e43f 100644
--- a/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTypeMapper.java
+++ b/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/cratedb/database/catalog/CrateDBTypeMapper.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.cratedb.catalog;
+package org.apache.flink.connector.jdbc.cratedb.database.catalog;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.databases.postgres.catalog.PostgresTypeMapper;
+import org.apache.flink.connector.jdbc.postgres.database.catalog.PostgresTypeMapper;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.table.types.DataType;
diff --git a/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialect.java b/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/cratedb/database/dialect/CrateDBDialect.java
similarity index 90%
rename from flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialect.java
rename to flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/cratedb/database/dialect/CrateDBDialect.java
index 03869f82..be7802c1 100644
--- a/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialect.java
+++ b/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/cratedb/database/dialect/CrateDBDialect.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.cratedb.dialect;
+package org.apache.flink.connector.jdbc.cratedb.database.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.databases.postgres.dialect.CompatiblePostgresDialect;
+import org.apache.flink.connector.jdbc.postgres.database.dialect.CompatiblePostgresDialect;
import org.apache.flink.table.types.logical.RowType;
import java.util.Optional;
diff --git a/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectConverter.java b/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/cratedb/database/dialect/CrateDBDialectConverter.java
similarity index 88%
rename from flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectConverter.java
rename to flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/cratedb/database/dialect/CrateDBDialectConverter.java
index e88c7881..a4c4c430 100644
--- a/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectConverter.java
+++ b/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/cratedb/database/dialect/CrateDBDialectConverter.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.cratedb.dialect;
+package org.apache.flink.connector.jdbc.cratedb.database.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.databases.postgres.dialect.CompatiblePostgresDialectConverter;
+import org.apache.flink.connector.jdbc.postgres.database.dialect.CompatiblePostgresDialectConverter;
import org.apache.flink.table.types.logical.RowType;
/**
diff --git a/flink-connector-jdbc-mysql/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory b/flink-connector-jdbc-cratedb/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
similarity index 92%
rename from flink-connector-jdbc-mysql/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
rename to flink-connector-jdbc-cratedb/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
index 2d13e8fa..3a7bad0b 100644
--- a/flink-connector-jdbc-mysql/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
+++ b/flink-connector-jdbc-cratedb/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.flink.connector.jdbc.databases.mysql.dialect.MySqlFactory
\ No newline at end of file
+org.apache.flink.connector.jdbc.cratedb.database.CrateDBFactory
diff --git a/flink-connector-jdbc-cratedb/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory b/flink-connector-jdbc-cratedb/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
deleted file mode 100644
index 0a32851c..00000000
--- a/flink-connector-jdbc-cratedb/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-org.apache.flink.connector.jdbc.databases.cratedb.dialect.CrateDBFactory
diff --git a/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTestBase.java b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/CrateDBTestBase.java
similarity index 89%
rename from flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTestBase.java
rename to flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/CrateDBTestBase.java
index 96f2c355..fa738a95 100644
--- a/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTestBase.java
+++ b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/CrateDBTestBase.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.cratedb.catalog;
+package org.apache.flink.connector.jdbc.cratedb;
+import org.apache.flink.connector.jdbc.cratedb.testutils.CrateDBDatabase;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
import org.apache.flink.connector.jdbc.testutils.DatabaseTest;
-import org.apache.flink.connector.jdbc.testutils.databases.cratedb.CrateDBDatabase;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogITCase.java b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/database/catalog/CrateDBCatalogITCase.java
similarity index 97%
rename from flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogITCase.java
rename to flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/database/catalog/CrateDBCatalogITCase.java
index 11bf61d0..eff0f9a5 100644
--- a/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogITCase.java
+++ b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/database/catalog/CrateDBCatalogITCase.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.cratedb.catalog;
+package org.apache.flink.connector.jdbc.cratedb.database.catalog;
import org.apache.flink.table.api.EnvironmentSettings;
import org.apache.flink.table.api.TableEnvironment;
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test;
import java.util.List;
-import static org.apache.flink.connector.jdbc.databases.cratedb.catalog.CrateDBCatalog.DEFAULT_DATABASE;
+import static org.apache.flink.connector.jdbc.cratedb.database.catalog.CrateDBCatalog.DEFAULT_DATABASE;
import static org.apache.flink.table.api.config.ExecutionConfigOptions.TABLE_EXEC_RESOURCE_DEFAULT_PARALLELISM;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogTest.java b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/database/catalog/CrateDBCatalogTest.java
similarity index 99%
rename from flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogTest.java
rename to flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/database/catalog/CrateDBCatalogTest.java
index f65446b1..46da5546 100644
--- a/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogTest.java
+++ b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/database/catalog/CrateDBCatalogTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.cratedb.catalog;
+package org.apache.flink.connector.jdbc.cratedb.database.catalog;
import org.apache.flink.table.api.Schema;
import org.apache.flink.table.catalog.CatalogBaseTable;
diff --git a/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogTestBase.java b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/database/catalog/CrateDBCatalogTestBase.java
similarity index 98%
rename from flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogTestBase.java
rename to flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/database/catalog/CrateDBCatalogTestBase.java
index 9a9fdd09..b180ef01 100644
--- a/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogTestBase.java
+++ b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/database/catalog/CrateDBCatalogTestBase.java
@@ -16,8 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.cratedb.catalog;
+package org.apache.flink.connector.jdbc.cratedb.database.catalog;
+import org.apache.flink.connector.jdbc.cratedb.CrateDBTestBase;
import org.apache.flink.connector.jdbc.testutils.JdbcITCaseBase;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.table.api.Schema;
@@ -32,7 +33,7 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.TimeZone;
-import static org.apache.flink.connector.jdbc.testutils.databases.cratedb.CrateDBDatabase.CONTAINER;
+import static org.apache.flink.connector.jdbc.cratedb.testutils.CrateDBDatabase.CONTAINER;
/** Test base for {@link CrateDBCatalog}. */
class CrateDBCatalogTestBase implements JdbcITCaseBase, CrateDBTestBase {
diff --git a/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTablePathTest.java b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/database/catalog/CrateDBTablePathTest.java
similarity index 97%
rename from flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTablePathTest.java
rename to flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/database/catalog/CrateDBTablePathTest.java
index 76af0858..d46f0fb9 100644
--- a/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTablePathTest.java
+++ b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/database/catalog/CrateDBTablePathTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.cratedb.catalog;
+package org.apache.flink.connector.jdbc.cratedb.database.catalog;
import org.junit.jupiter.api.Test;
diff --git a/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectTest.java b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/database/dialect/CrateDBDialectTest.java
similarity index 88%
rename from flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectTest.java
rename to flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/database/dialect/CrateDBDialectTest.java
index 65922f52..8b75eb13 100644
--- a/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectTest.java
+++ b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/database/dialect/CrateDBDialectTest.java
@@ -16,20 +16,16 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.cratedb.dialect;
+package org.apache.flink.connector.jdbc.cratedb.database.dialect;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectTest;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectTest;
+import org.apache.flink.connector.jdbc.cratedb.CrateDBTestBase;
import java.util.Arrays;
import java.util.List;
/** The CrateDB params for {@link JdbcDialectTest}. */
-class CrateDBDialectTest extends JdbcDialectTest {
-
- @Override
- protected String testDialect() {
- return "crate";
- }
+class CrateDBDialectTest extends JdbcDialectTest implements CrateDBTestBase {
@Override
protected List<TestItem> testData() {
diff --git a/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/cratedb/CrateDBDatabase.java b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/testutils/CrateDBDatabase.java
similarity index 98%
rename from flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/cratedb/CrateDBDatabase.java
rename to flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/testutils/CrateDBDatabase.java
index eae2148c..34869cbe 100644
--- a/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/cratedb/CrateDBDatabase.java
+++ b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/testutils/CrateDBDatabase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.cratedb;
+package org.apache.flink.connector.jdbc.cratedb.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
diff --git a/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/cratedb/CrateDBMetadata.java b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/testutils/CrateDBMetadata.java
similarity index 96%
rename from flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/cratedb/CrateDBMetadata.java
rename to flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/testutils/CrateDBMetadata.java
index b44792dc..0ed86294 100644
--- a/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/cratedb/CrateDBMetadata.java
+++ b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/testutils/CrateDBMetadata.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.cratedb;
+package org.apache.flink.connector.jdbc.cratedb.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
diff --git a/flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Factory.java b/flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/db2/database/Db2Factory.java
similarity index 81%
rename from flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Factory.java
rename to flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/db2/database/Db2Factory.java
index 4b0165cc..61644709 100644
--- a/flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Factory.java
+++ b/flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/db2/database/Db2Factory.java
@@ -16,12 +16,13 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.db2.dialect;
+package org.apache.flink.connector.jdbc.db2.database;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
-import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.database.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.database.catalog.JdbcCatalog;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.db2.database.dialect.Db2Dialect;
/** Factory for {@link Db2Dialect}. */
@Internal
diff --git a/flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Dialect.java b/flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/db2/database/dialect/Db2Dialect.java
similarity index 96%
rename from flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Dialect.java
rename to flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/db2/database/dialect/Db2Dialect.java
index 3e2931ef..68ba6b1b 100644
--- a/flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Dialect.java
+++ b/flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/db2/database/dialect/Db2Dialect.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.db2.dialect;
+package org.apache.flink.connector.jdbc.db2.database.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialect;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
+import org.apache.flink.connector.jdbc.core.database.dialect.AbstractDialect;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectConverter;
import org.apache.flink.table.types.logical.LogicalTypeRoot;
import org.apache.flink.table.types.logical.RowType;
diff --git a/flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectConverter.java b/flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/db2/database/dialect/Db2DialectConverter.java
similarity index 91%
rename from flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectConverter.java
rename to flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/db2/database/dialect/Db2DialectConverter.java
index 1e06dcd7..2f919466 100644
--- a/flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectConverter.java
+++ b/flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/db2/database/dialect/Db2DialectConverter.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.db2.dialect;
+package org.apache.flink.connector.jdbc.db2.database.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialectConverter;
+import org.apache.flink.connector.jdbc.core.database.dialect.AbstractDialectConverter;
import org.apache.flink.table.types.logical.LogicalType;
import org.apache.flink.table.types.logical.RowType;
diff --git a/flink-connector-jdbc-trino/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory b/flink-connector-jdbc-db2/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
similarity index 91%
rename from flink-connector-jdbc-trino/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
rename to flink-connector-jdbc-db2/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
index 3ca0824d..edbde290 100644
--- a/flink-connector-jdbc-trino/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
+++ b/flink-connector-jdbc-db2/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.flink.connector.jdbc.databases.trino.dialect.TrinoFactory
+org.apache.flink.connector.jdbc.db2.database.Db2Factory
diff --git a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/Db2TestBase.java b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/Db2TestBase.java
similarity index 90%
rename from flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/Db2TestBase.java
rename to flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/Db2TestBase.java
index 280828ba..30b80647 100644
--- a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/Db2TestBase.java
+++ b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/Db2TestBase.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.db2;
+package org.apache.flink.connector.jdbc.db2;
+import org.apache.flink.connector.jdbc.db2.testutils.Db2Database;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
import org.apache.flink.connector.jdbc.testutils.DatabaseTest;
-import org.apache.flink.connector.jdbc.testutils.databases.db2.Db2Database;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectTest.java b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/database/dialect/Db2DialectTest.java
similarity index 85%
rename from flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectTest.java
rename to flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/database/dialect/Db2DialectTest.java
index 04fbe3c9..f84d3280 100644
--- a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectTest.java
+++ b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/database/dialect/Db2DialectTest.java
@@ -16,20 +16,15 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.db2.dialect;
+package org.apache.flink.connector.jdbc.db2.database.dialect;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectTest;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectTest;
+import org.apache.flink.connector.jdbc.db2.Db2TestBase;
import java.util.Arrays;
import java.util.List;
-/** The Db2 params for {@link JdbcDialectTest}. */
-class Db2DialectTest extends JdbcDialectTest {
-
- @Override
- protected String testDialect() {
- return "db2";
- }
+class Db2DialectTest extends JdbcDialectTest implements Db2TestBase {
@Override
protected List<TestItem> testData() {
diff --git a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2PreparedStatementTest.java b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/database/dialect/Db2PreparedStatementTest.java
similarity index 95%
rename from flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2PreparedStatementTest.java
rename to flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/database/dialect/Db2PreparedStatementTest.java
index 8a8ea588..821ffe63 100644
--- a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2PreparedStatementTest.java
+++ b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/database/dialect/Db2PreparedStatementTest.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.db2.dialect;
+package org.apache.flink.connector.jdbc.db2.database.dialect;
-import org.apache.flink.connector.jdbc.core.table.JdbcFactoryLoader;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.database.JdbcFactoryLoader;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
import org.junit.jupiter.api.Test;
diff --git a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/table/Db2DynamicTableSinkITCase.java b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/database/table/Db2DynamicTableSinkITCase.java
similarity index 91%
rename from flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/table/Db2DynamicTableSinkITCase.java
rename to flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/database/table/Db2DynamicTableSinkITCase.java
index d486b999..769177c4 100644
--- a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/table/Db2DynamicTableSinkITCase.java
+++ b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/database/table/Db2DynamicTableSinkITCase.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.db2.table;
+package org.apache.flink.connector.jdbc.db2.database.table;
-import org.apache.flink.connector.jdbc.databases.db2.Db2TestBase;
-import org.apache.flink.connector.jdbc.databases.db2.dialect.Db2Dialect;
+import org.apache.flink.connector.jdbc.db2.Db2TestBase;
+import org.apache.flink.connector.jdbc.db2.database.dialect.Db2Dialect;
import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSinkITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
diff --git a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/table/Db2DynamicTableSourceITCase.java b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/database/table/Db2DynamicTableSourceITCase.java
similarity index 96%
rename from flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/table/Db2DynamicTableSourceITCase.java
rename to flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/database/table/Db2DynamicTableSourceITCase.java
index c632ec4a..13c6d603 100644
--- a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/table/Db2DynamicTableSourceITCase.java
+++ b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/database/table/Db2DynamicTableSourceITCase.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.db2.table;
+package org.apache.flink.connector.jdbc.db2.database.table;
-import org.apache.flink.connector.jdbc.databases.db2.Db2TestBase;
-import org.apache.flink.connector.jdbc.databases.db2.dialect.Db2Dialect;
+import org.apache.flink.connector.jdbc.db2.Db2TestBase;
+import org.apache.flink.connector.jdbc.db2.database.dialect.Db2Dialect;
import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
diff --git a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/db2/Db2Database.java b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/testutils/Db2Database.java
similarity index 97%
rename from flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/db2/Db2Database.java
rename to flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/testutils/Db2Database.java
index 83025550..a6e1f3db 100644
--- a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/db2/Db2Database.java
+++ b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/testutils/Db2Database.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.db2;
+package org.apache.flink.connector.jdbc.db2.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
diff --git a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/db2/Db2Metadata.java b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/testutils/Db2Metadata.java
similarity index 97%
rename from flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/db2/Db2Metadata.java
rename to flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/testutils/Db2Metadata.java
index 1610b842..fe52317e 100644
--- a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/db2/Db2Metadata.java
+++ b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/testutils/Db2Metadata.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.db2;
+package org.apache.flink.connector.jdbc.db2.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
diff --git a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/xa/Db2ExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/xa/Db2ExactlyOnceSinkE2eTest.java
similarity index 89%
rename from flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/xa/Db2ExactlyOnceSinkE2eTest.java
rename to flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/xa/Db2ExactlyOnceSinkE2eTest.java
index d375b702..bfce4eb2 100644
--- a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/xa/Db2ExactlyOnceSinkE2eTest.java
+++ b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/xa/Db2ExactlyOnceSinkE2eTest.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.db2.xa;
+package org.apache.flink.connector.jdbc.db2.xa;
-import org.apache.flink.connector.jdbc.databases.db2.Db2TestBase;
+import org.apache.flink.connector.jdbc.db2.Db2TestBase;
import org.apache.flink.connector.jdbc.xa.JdbcExactlyOnceSinkE2eTest;
/** A simple end-to-end test for {@link JdbcExactlyOnceSinkE2eTest}. */
diff --git a/flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlFactory.java b/flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/mysql/database/MySqlFactory.java
similarity index 78%
rename from flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlFactory.java
rename to flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/mysql/database/MySqlFactory.java
index 87051f23..68e7973d 100644
--- a/flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlFactory.java
+++ b/flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/mysql/database/MySqlFactory.java
@@ -16,13 +16,14 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.mysql.dialect;
+package org.apache.flink.connector.jdbc.mysql.database;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
-import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.databases.mysql.catalog.MySqlCatalog;
+import org.apache.flink.connector.jdbc.core.database.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.database.catalog.JdbcCatalog;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.mysql.database.catalog.MySqlCatalog;
+import org.apache.flink.connector.jdbc.mysql.database.dialect.MySqlDialect;
/** Factory for {@link MySqlDialect}. */
@Internal
diff --git a/flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalog.java b/flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/mysql/database/catalog/MySqlCatalog.java
similarity index 96%
rename from flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalog.java
rename to flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/mysql/database/catalog/MySqlCatalog.java
index 982b92e9..efd16138 100644
--- a/flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalog.java
+++ b/flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/mysql/database/catalog/MySqlCatalog.java
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.mysql.catalog;
+package org.apache.flink.connector.jdbc.mysql.database.catalog;
import org.apache.flink.annotation.Internal;
import org.apache.flink.annotation.VisibleForTesting;
-import org.apache.flink.connector.jdbc.core.table.catalog.AbstractJdbcCatalog;
-import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalogTypeMapper;
+import org.apache.flink.connector.jdbc.core.database.catalog.AbstractJdbcCatalog;
+import org.apache.flink.connector.jdbc.core.database.catalog.JdbcCatalogTypeMapper;
import org.apache.flink.table.catalog.ObjectPath;
import org.apache.flink.table.catalog.exceptions.CatalogException;
import org.apache.flink.table.catalog.exceptions.DatabaseNotExistException;
diff --git a/flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlTypeMapper.java b/flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/mysql/database/catalog/MySqlTypeMapper.java
similarity index 98%
rename from flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlTypeMapper.java
rename to flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/mysql/database/catalog/MySqlTypeMapper.java
index f3ca932d..086dd6c6 100644
--- a/flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlTypeMapper.java
+++ b/flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/mysql/database/catalog/MySqlTypeMapper.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.mysql.catalog;
+package org.apache.flink.connector.jdbc.mysql.database.catalog;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalogTypeMapper;
+import org.apache.flink.connector.jdbc.core.database.catalog.JdbcCatalogTypeMapper;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.table.catalog.ObjectPath;
import org.apache.flink.table.catalog.exceptions.CatalogException;
diff --git a/flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySQLDialectConverter.java b/flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/mysql/database/dialect/MySQLDialectConverter.java
similarity index 89%
rename from flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySQLDialectConverter.java
rename to flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/mysql/database/dialect/MySQLDialectConverter.java
index c9c883f8..318699e2 100644
--- a/flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySQLDialectConverter.java
+++ b/flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/mysql/database/dialect/MySQLDialectConverter.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.mysql.dialect;
+package org.apache.flink.connector.jdbc.mysql.database.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialectConverter;
+import org.apache.flink.connector.jdbc.core.database.dialect.AbstractDialectConverter;
import org.apache.flink.table.types.logical.RowType;
/**
diff --git a/flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialect.java b/flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/mysql/database/dialect/MySqlDialect.java
similarity index 95%
rename from flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialect.java
rename to flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/mysql/database/dialect/MySqlDialect.java
index ba25e0eb..3c55d384 100644
--- a/flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialect.java
+++ b/flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/mysql/database/dialect/MySqlDialect.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.mysql.dialect;
+package org.apache.flink.connector.jdbc.mysql.database.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialect;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
+import org.apache.flink.connector.jdbc.core.database.dialect.AbstractDialect;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectConverter;
import org.apache.flink.table.types.logical.LogicalTypeRoot;
import org.apache.flink.table.types.logical.RowType;
diff --git a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory b/flink-connector-jdbc-mysql/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
similarity index 91%
rename from flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
rename to flink-connector-jdbc-mysql/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
index b129ed3e..178b30f5 100644
--- a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
+++ b/flink-connector-jdbc-mysql/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.flink.connector.jdbc.databases.derby.dialect.DerbyFactory
+org.apache.flink.connector.jdbc.mysql.database.MySqlFactory
\ No newline at end of file
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/MySqlTestBase.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/MySqlTestBase.java
similarity index 89%
rename from flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/MySqlTestBase.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/MySqlTestBase.java
index 73e30bb2..3d625f4f 100644
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/MySqlTestBase.java
+++ b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/MySqlTestBase.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.mysql;
+package org.apache.flink.connector.jdbc.mysql;
+import org.apache.flink.connector.jdbc.mysql.testutils.MySqlDatabase;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
import org.apache.flink.connector.jdbc.testutils.DatabaseTest;
-import org.apache.flink.connector.jdbc.testutils.databases.mysql.MySqlDatabase;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySql56CatalogITCase.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/catalog/MySql56CatalogITCase.java
similarity index 89%
rename from flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySql56CatalogITCase.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/catalog/MySql56CatalogITCase.java
index ef56ce11..f5cd0b99 100644
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySql56CatalogITCase.java
+++ b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/catalog/MySql56CatalogITCase.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.mysql.catalog;
+package org.apache.flink.connector.jdbc.mysql.database.catalog;
+import org.apache.flink.connector.jdbc.mysql.testutils.MySql56Database;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
-import org.apache.flink.connector.jdbc.testutils.databases.mysql.MySql56Database;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySql57CatalogITCase.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/catalog/MySql57CatalogITCase.java
similarity index 89%
rename from flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySql57CatalogITCase.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/catalog/MySql57CatalogITCase.java
index 39ac27a9..894d0cf3 100644
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySql57CatalogITCase.java
+++ b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/catalog/MySql57CatalogITCase.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.mysql.catalog;
+package org.apache.flink.connector.jdbc.mysql.database.catalog;
+import org.apache.flink.connector.jdbc.mysql.testutils.MySql57Database;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
-import org.apache.flink.connector.jdbc.testutils.databases.mysql.MySql57Database;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalogITCase.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/catalog/MySqlCatalogITCase.java
similarity index 87%
rename from flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalogITCase.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/catalog/MySqlCatalogITCase.java
index f55cf3ae..515b5f27 100644
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalogITCase.java
+++ b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/catalog/MySqlCatalogITCase.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.mysql.catalog;
+package org.apache.flink.connector.jdbc.mysql.database.catalog;
-import org.apache.flink.connector.jdbc.databases.mysql.MySqlTestBase;
+import org.apache.flink.connector.jdbc.mysql.MySqlTestBase;
/** E2E test for {@link MySqlCatalog}. */
class MySqlCatalogITCase extends MySqlCatalogTestBase implements MySqlTestBase {}
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalogTestBase.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/catalog/MySqlCatalogTestBase.java
similarity index 99%
rename from flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalogTestBase.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/catalog/MySqlCatalogTestBase.java
index aa744f2e..07477811 100644
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalogTestBase.java
+++ b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/catalog/MySqlCatalogTestBase.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.mysql.catalog;
+package org.apache.flink.connector.jdbc.mysql.database.catalog;
import org.apache.flink.connector.jdbc.testutils.DatabaseTest;
import org.apache.flink.connector.jdbc.testutils.JdbcITCaseBase;
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectTest.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/dialect/MySqlDialectTest.java
similarity index 92%
rename from flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectTest.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/dialect/MySqlDialectTest.java
index 5491d398..7467b17f 100644
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectTest.java
+++ b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/dialect/MySqlDialectTest.java
@@ -16,9 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.mysql.dialect;
+package org.apache.flink.connector.jdbc.mysql.database.dialect;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectTest;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectTest;
+import org.apache.flink.connector.jdbc.mysql.MySqlTestBase;
import org.junit.jupiter.api.Test;
@@ -28,12 +29,7 @@ import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
/** The MySql params for {@link JdbcDialectTest}. */
-class MySqlDialectTest extends JdbcDialectTest {
-
- @Override
- protected String testDialect() {
- return "mysql";
- }
+class MySqlDialectTest extends JdbcDialectTest implements MySqlTestBase {
@Override
protected List<TestItem> testData() {
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatementImplTest.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/dialect/MysqlPreparedStatementTest.java
similarity index 96%
rename from flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatementImplTest.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/dialect/MysqlPreparedStatementTest.java
index ff969b7d..46ff0574 100644
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatementImplTest.java
+++ b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/dialect/MysqlPreparedStatementTest.java
@@ -16,10 +16,11 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.statement;
+package org.apache.flink.connector.jdbc.mysql.database.dialect;
-import org.apache.flink.connector.jdbc.core.table.JdbcFactoryLoader;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.database.JdbcFactoryLoader;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatementImpl;
import org.junit.jupiter.api.Test;
@@ -32,7 +33,7 @@ import static java.util.Collections.singletonList;
import static org.assertj.core.api.Assertions.assertThat;
/** Tests for {@link FieldNamedPreparedStatementImpl}. */
-class FieldNamedPreparedStatementImplTest {
+class MysqlPreparedStatementTest {
private final JdbcDialect dialect =
JdbcFactoryLoader.loadDialect(
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/MySqlDynamicTableSinkITCase.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/table/MySqlDynamicTableSinkITCase.java
similarity index 91%
rename from flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/MySqlDynamicTableSinkITCase.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/table/MySqlDynamicTableSinkITCase.java
index c742edc7..3b48699a 100644
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/MySqlDynamicTableSinkITCase.java
+++ b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/table/MySqlDynamicTableSinkITCase.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.mysql.table;
+package org.apache.flink.connector.jdbc.mysql.table;
-import org.apache.flink.connector.jdbc.databases.mysql.MySqlTestBase;
-import org.apache.flink.connector.jdbc.databases.mysql.dialect.MySqlDialect;
+import org.apache.flink.connector.jdbc.mysql.MySqlTestBase;
+import org.apache.flink.connector.jdbc.mysql.database.dialect.MySqlDialect;
import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSinkITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/MySqlDynamicTableSourceITCase.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/table/MySqlDynamicTableSourceITCase.java
similarity index 93%
rename from flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/MySqlDynamicTableSourceITCase.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/table/MySqlDynamicTableSourceITCase.java
index d5b27dc9..ff335e5e 100644
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/MySqlDynamicTableSourceITCase.java
+++ b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/table/MySqlDynamicTableSourceITCase.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.mysql.table;
+package org.apache.flink.connector.jdbc.mysql.table;
-import org.apache.flink.connector.jdbc.databases.mysql.MySqlTestBase;
-import org.apache.flink.connector.jdbc.databases.mysql.dialect.MySqlDialect;
+import org.apache.flink.connector.jdbc.mysql.MySqlTestBase;
+import org.apache.flink.connector.jdbc.mysql.database.dialect.MySqlDialect;
import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/UnsignedTypeConversionITCase.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/table/UnsignedTypeConversionITCase.java
similarity index 97%
rename from flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/UnsignedTypeConversionITCase.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/table/UnsignedTypeConversionITCase.java
index 531d6312..a0de352b 100644
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/UnsignedTypeConversionITCase.java
+++ b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/table/UnsignedTypeConversionITCase.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.mysql.table;
+package org.apache.flink.connector.jdbc.mysql.table;
-import org.apache.flink.connector.jdbc.databases.mysql.MySqlTestBase;
+import org.apache.flink.connector.jdbc.mysql.MySqlTestBase;
import org.apache.flink.connector.jdbc.testutils.TableManaged;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySql56Database.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySql56Database.java
similarity index 96%
rename from flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySql56Database.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySql56Database.java
index 6a6d123e..674a85a4 100644
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySql56Database.java
+++ b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySql56Database.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.mysql;
+package org.apache.flink.connector.jdbc.mysql.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySql57Database.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySql57Database.java
similarity index 96%
rename from flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySql57Database.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySql57Database.java
index c100f340..64ee1579 100644
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySql57Database.java
+++ b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySql57Database.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.mysql;
+package org.apache.flink.connector.jdbc.mysql.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlContainer.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySqlContainer.java
similarity index 99%
rename from flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlContainer.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySqlContainer.java
index 5859bdfd..f100886f 100644
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlContainer.java
+++ b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySqlContainer.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.mysql;
+package org.apache.flink.connector.jdbc.mysql.testutils;
import org.apache.flink.util.ExceptionUtils;
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlDatabase.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySqlDatabase.java
similarity index 96%
rename from flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlDatabase.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySqlDatabase.java
index 2ce66c18..cdcd57ff 100644
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlDatabase.java
+++ b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySqlDatabase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.mysql;
+package org.apache.flink.connector.jdbc.mysql.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlImages.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySqlImages.java
similarity index 93%
rename from flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlImages.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySqlImages.java
index 93a176aa..d4a43693 100644
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlImages.java
+++ b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySqlImages.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.mysql;
+package org.apache.flink.connector.jdbc.mysql.testutils;
/** MySql docker images. */
public interface MySqlImages {
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlMetadata.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySqlMetadata.java
similarity index 97%
rename from flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlMetadata.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySqlMetadata.java
index e92c65d2..fa5ea3b6 100644
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlMetadata.java
+++ b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySqlMetadata.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.mysql;
+package org.apache.flink.connector.jdbc.mysql.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/xa/MySqlExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/xa/MySqlExactlyOnceSinkE2eTest.java
similarity index 89%
rename from flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/xa/MySqlExactlyOnceSinkE2eTest.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/xa/MySqlExactlyOnceSinkE2eTest.java
index 18371cd3..56010465 100644
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/xa/MySqlExactlyOnceSinkE2eTest.java
+++ b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/xa/MySqlExactlyOnceSinkE2eTest.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.mysql.xa;
+package org.apache.flink.connector.jdbc.mysql.xa;
-import org.apache.flink.connector.jdbc.databases.mysql.MySqlTestBase;
+import org.apache.flink.connector.jdbc.mysql.MySqlTestBase;
import org.apache.flink.connector.jdbc.xa.JdbcExactlyOnceSinkE2eTest;
/**
diff --git a/flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseFactory.java b/flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/oceanbase/database/OceanBaseFactory.java
similarity index 83%
rename from flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseFactory.java
rename to flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/oceanbase/database/OceanBaseFactory.java
index 2f30aa3c..0ead1184 100644
--- a/flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseFactory.java
+++ b/flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/oceanbase/database/OceanBaseFactory.java
@@ -16,12 +16,13 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.oceanbase.dialect;
+package org.apache.flink.connector.jdbc.oceanbase.database;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
-import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.database.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.database.catalog.JdbcCatalog;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.oceanbase.database.dialect.OceanBaseDialect;
import javax.annotation.Nonnull;
diff --git a/flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialect.java b/flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/oceanbase/database/dialect/OceanBaseDialect.java
similarity index 90%
rename from flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialect.java
rename to flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/oceanbase/database/dialect/OceanBaseDialect.java
index d190ea6a..41914b47 100644
--- a/flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialect.java
+++ b/flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/oceanbase/database/dialect/OceanBaseDialect.java
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.oceanbase.dialect;
+package org.apache.flink.connector.jdbc.oceanbase.database.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialect;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
-import org.apache.flink.connector.jdbc.databases.mysql.dialect.MySqlDialect;
-import org.apache.flink.connector.jdbc.databases.oracle.dialect.OracleDialect;
+import org.apache.flink.connector.jdbc.core.database.dialect.AbstractDialect;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectConverter;
+import org.apache.flink.connector.jdbc.mysql.database.dialect.MySqlDialect;
+import org.apache.flink.connector.jdbc.oracle.database.dialect.OracleDialect;
import org.apache.flink.table.types.logical.LogicalTypeRoot;
import org.apache.flink.table.types.logical.RowType;
diff --git a/flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectConverter.java b/flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/oceanbase/database/dialect/OceanBaseDialectConverter.java
similarity index 97%
rename from flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectConverter.java
rename to flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/oceanbase/database/dialect/OceanBaseDialectConverter.java
index 1bc66254..69bf6e3d 100644
--- a/flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectConverter.java
+++ b/flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/oceanbase/database/dialect/OceanBaseDialectConverter.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.oceanbase.dialect;
+package org.apache.flink.connector.jdbc.oceanbase.database.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialectConverter;
+import org.apache.flink.connector.jdbc.core.database.dialect.AbstractDialectConverter;
import org.apache.flink.table.data.DecimalData;
import org.apache.flink.table.data.StringData;
import org.apache.flink.table.data.TimestampData;
diff --git a/flink-connector-jdbc-db2/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory b/flink-connector-jdbc-oceanbase/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
similarity index 92%
copy from flink-connector-jdbc-db2/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
copy to flink-connector-jdbc-oceanbase/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
index 762b3ce1..08151318 100644
--- a/flink-connector-jdbc-db2/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
+++ b/flink-connector-jdbc-oceanbase/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.flink.connector.jdbc.databases.db2.dialect.Db2Factory
+org.apache.flink.connector.jdbc.oceanbase.database.OceanBaseFactory
diff --git a/flink-connector-jdbc-oceanbase/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory b/flink-connector-jdbc-oceanbase/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
deleted file mode 100644
index 3015f7d9..00000000
--- a/flink-connector-jdbc-oceanbase/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-org.apache.flink.connector.jdbc.databases.oceanbase.dialect.OceanBaseFactory
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/OceanBaseMysqlTestBase.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/OceanBaseMysqlTestBase.java
similarity index 86%
rename from flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/OceanBaseMysqlTestBase.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/OceanBaseMysqlTestBase.java
index 4cac1d60..ae99523e 100644
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/OceanBaseMysqlTestBase.java
+++ b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/OceanBaseMysqlTestBase.java
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.oceanbase;
+package org.apache.flink.connector.jdbc.oceanbase;
-import org.apache.flink.connector.jdbc.databases.oceanbase.table.OceanBaseTableRow;
+import org.apache.flink.connector.jdbc.oceanbase.table.OceanBaseTableRow;
+import org.apache.flink.connector.jdbc.oceanbase.testutils.OceanBaseDatabase;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
import org.apache.flink.connector.jdbc.testutils.DatabaseTest;
-import org.apache.flink.connector.jdbc.testutils.databases.oceanbase.OceanBaseDatabase;
import org.apache.flink.connector.jdbc.testutils.tables.TableField;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/OceanBaseOracleTestBase.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/OceanBaseOracleTestBase.java
similarity index 87%
rename from flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/OceanBaseOracleTestBase.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/OceanBaseOracleTestBase.java
index 31aad559..ab82655c 100644
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/OceanBaseOracleTestBase.java
+++ b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/OceanBaseOracleTestBase.java
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.oceanbase;
+package org.apache.flink.connector.jdbc.oceanbase;
-import org.apache.flink.connector.jdbc.databases.oceanbase.table.OceanBaseTableRow;
+import org.apache.flink.connector.jdbc.oceanbase.table.OceanBaseTableRow;
+import org.apache.flink.connector.jdbc.oceanbase.testutils.OceanBaseTestDatabase;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
import org.apache.flink.connector.jdbc.testutils.DatabaseTest;
-import org.apache.flink.connector.jdbc.testutils.databases.oceanbase.OceanBaseTestDatabase;
import org.apache.flink.connector.jdbc.testutils.tables.TableField;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectTest.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/database/dialect/OceanBaseDialectTest.java
similarity index 96%
rename from flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectTest.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/database/dialect/OceanBaseDialectTest.java
index 7edeef75..07143d1a 100644
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectTest.java
+++ b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/database/dialect/OceanBaseDialectTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.oceanbase.dialect;
+package org.apache.flink.connector.jdbc.oceanbase.database.dialect;
import org.junit.jupiter.api.Test;
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseMysqlDialectTest.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/database/dialect/OceanBaseMysqlDialectTest.java
similarity index 88%
rename from flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseMysqlDialectTest.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/database/dialect/OceanBaseMysqlDialectTest.java
index 7b74b3a7..f601106f 100644
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseMysqlDialectTest.java
+++ b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/database/dialect/OceanBaseMysqlDialectTest.java
@@ -16,32 +16,28 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.oceanbase.dialect;
+package org.apache.flink.connector.jdbc.oceanbase.database.dialect;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectTest;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectTest;
+import org.apache.flink.connector.jdbc.oceanbase.OceanBaseMysqlTestBase;
import java.util.Arrays;
import java.util.List;
/** The OceanBase MySql mode params for {@link JdbcDialectTest}. */
-class OceanBaseMysqlDialectTest extends JdbcDialectTest {
+class OceanBaseMysqlDialectTest extends JdbcDialectTest implements OceanBaseMysqlTestBase {
public OceanBaseMysqlDialectTest() {
ddlFormat =
"CREATE TABLE T (f0 %s)"
+ " WITH ("
+ " 'connector'='jdbc',"
- + " 'url'='jdbc:%s:memory:test',"
+ + " 'url'='%s',"
+ " 'table-name'='myTable',"
+ " 'compatible-mode'='mysql'"
+ ")";
}
- @Override
- protected String testDialect() {
- return "oceanbase";
- }
-
@Override
protected List<TestItem> testData() {
return Arrays.asList(
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseOracleDialectTest.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/database/dialect/OceanBaseOracleDialectTest.java
similarity index 86%
rename from flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseOracleDialectTest.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/database/dialect/OceanBaseOracleDialectTest.java
index ebc519f1..a8f3d579 100644
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseOracleDialectTest.java
+++ b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/database/dialect/OceanBaseOracleDialectTest.java
@@ -16,32 +16,28 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.oceanbase.dialect;
+package org.apache.flink.connector.jdbc.oceanbase.database.dialect;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectTest;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectTest;
+import org.apache.flink.connector.jdbc.oceanbase.OceanBaseOracleTestBase;
import java.util.Arrays;
import java.util.List;
/** The OceanBase Oracle mode params for {@link JdbcDialectTest}. */
-class OceanBaseOracleDialectTest extends JdbcDialectTest {
+class OceanBaseOracleDialectTest extends JdbcDialectTest implements OceanBaseOracleTestBase {
public OceanBaseOracleDialectTest() {
ddlFormat =
"CREATE TABLE T (f0 %s)"
+ " WITH ("
+ " 'connector'='jdbc',"
- + " 'url'='jdbc:%s:memory:test',"
+ + " 'url'='%s',"
+ " 'table-name'='myTable',"
+ " 'compatible-mode'='oracle'"
+ ")";
}
- @Override
- protected String testDialect() {
- return "oceanbase";
- }
-
@Override
protected List<TestItem> testData() {
return Arrays.asList(
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseMySqlDynamicTableSinkITCase.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseMySqlDynamicTableSinkITCase.java
similarity index 95%
rename from flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseMySqlDynamicTableSinkITCase.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseMySqlDynamicTableSinkITCase.java
index aecde26a..03532644 100644
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseMySqlDynamicTableSinkITCase.java
+++ b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseMySqlDynamicTableSinkITCase.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.oceanbase.table;
+package org.apache.flink.connector.jdbc.oceanbase.table;
-import org.apache.flink.connector.jdbc.databases.oceanbase.OceanBaseMysqlTestBase;
+import org.apache.flink.connector.jdbc.oceanbase.OceanBaseMysqlTestBase;
import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSinkITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseMySqlDynamicTableSourceITCase.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseMySqlDynamicTableSourceITCase.java
similarity index 95%
rename from flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseMySqlDynamicTableSourceITCase.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseMySqlDynamicTableSourceITCase.java
index 5e96be83..0af6da0a 100644
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseMySqlDynamicTableSourceITCase.java
+++ b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseMySqlDynamicTableSourceITCase.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.oceanbase.table;
+package org.apache.flink.connector.jdbc.oceanbase.table;
-import org.apache.flink.connector.jdbc.databases.oceanbase.OceanBaseMysqlTestBase;
+import org.apache.flink.connector.jdbc.oceanbase.OceanBaseMysqlTestBase;
import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseOracleDynamicTableSinkITCase.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseOracleDynamicTableSinkITCase.java
similarity index 96%
rename from flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseOracleDynamicTableSinkITCase.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseOracleDynamicTableSinkITCase.java
index 7569b7bb..711d64ae 100644
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseOracleDynamicTableSinkITCase.java
+++ b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseOracleDynamicTableSinkITCase.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.oceanbase.table;
+package org.apache.flink.connector.jdbc.oceanbase.table;
-import org.apache.flink.connector.jdbc.databases.oceanbase.OceanBaseOracleTestBase;
+import org.apache.flink.connector.jdbc.oceanbase.OceanBaseOracleTestBase;
import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSinkITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseOracleDynamicTableSourceITCase.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseOracleDynamicTableSourceITCase.java
similarity index 96%
rename from flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseOracleDynamicTableSourceITCase.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseOracleDynamicTableSourceITCase.java
index 9f94fa73..03dd6ab9 100644
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseOracleDynamicTableSourceITCase.java
+++ b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseOracleDynamicTableSourceITCase.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.oceanbase.table;
+package org.apache.flink.connector.jdbc.oceanbase.table;
-import org.apache.flink.connector.jdbc.databases.oceanbase.OceanBaseOracleTestBase;
+import org.apache.flink.connector.jdbc.oceanbase.OceanBaseOracleTestBase;
import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseTableRow.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseTableRow.java
similarity index 96%
rename from flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseTableRow.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseTableRow.java
index 29f79b35..acffc0d0 100644
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseTableRow.java
+++ b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseTableRow.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.oceanbase.table;
+package org.apache.flink.connector.jdbc.oceanbase.table;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
import org.apache.flink.connector.jdbc.testutils.tables.TableField;
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseContainer.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseContainer.java
similarity index 96%
rename from flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseContainer.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseContainer.java
index ba31718e..a76954a5 100644
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseContainer.java
+++ b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseContainer.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.oceanbase;
+package org.apache.flink.connector.jdbc.oceanbase.testutils;
import org.testcontainers.containers.JdbcDatabaseContainer;
import org.testcontainers.utility.DockerImageName;
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseDatabase.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseDatabase.java
similarity index 97%
rename from flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseDatabase.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseDatabase.java
index 50001f65..6db2c728 100644
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseDatabase.java
+++ b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseDatabase.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.oceanbase;
+package org.apache.flink.connector.jdbc.oceanbase.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseImages.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseImages.java
similarity index 93%
rename from flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseImages.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseImages.java
index 70194da4..b3ebf8b6 100644
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseImages.java
+++ b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseImages.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.oceanbase;
+package org.apache.flink.connector.jdbc.oceanbase.testutils;
/** OceanBase docker images. */
public interface OceanBaseImages {
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseMetadata.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseMetadata.java
similarity index 97%
rename from flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseMetadata.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseMetadata.java
index b9df95e5..9b8b3e4c 100644
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseMetadata.java
+++ b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseMetadata.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.oceanbase;
+package org.apache.flink.connector.jdbc.oceanbase.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseTestDatabase.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseTestDatabase.java
similarity index 91%
rename from flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseTestDatabase.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseTestDatabase.java
index bf4353fb..b3cb6839 100644
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseTestDatabase.java
+++ b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseTestDatabase.java
@@ -1,4 +1,4 @@
-package org.apache.flink.connector.jdbc.testutils.databases.oceanbase;
+package org.apache.flink.connector.jdbc.oceanbase.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
diff --git a/flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleFactory.java b/flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/oracle/database/OracleFactory.java
similarity index 81%
rename from flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleFactory.java
rename to flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/oracle/database/OracleFactory.java
index fa63b9dc..09418fea 100644
--- a/flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleFactory.java
+++ b/flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/oracle/database/OracleFactory.java
@@ -16,12 +16,13 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.oracle.dialect;
+package org.apache.flink.connector.jdbc.oracle.database;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
-import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.database.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.database.catalog.JdbcCatalog;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.oracle.database.dialect.OracleDialect;
/** Factory for {@link OracleDialect}. */
@Internal
diff --git a/flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialect.java b/flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/oracle/database/dialect/OracleDialect.java
similarity index 96%
rename from flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialect.java
rename to flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/oracle/database/dialect/OracleDialect.java
index d15a4a5b..2ec4546e 100644
--- a/flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialect.java
+++ b/flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/oracle/database/dialect/OracleDialect.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.oracle.dialect;
+package org.apache.flink.connector.jdbc.oracle.database.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialect;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
+import org.apache.flink.connector.jdbc.core.database.dialect.AbstractDialect;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectConverter;
import org.apache.flink.table.types.logical.LogicalTypeRoot;
import org.apache.flink.table.types.logical.RowType;
diff --git a/flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectConverter.java b/flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/oracle/database/dialect/OracleDialectConverter.java
similarity index 98%
rename from flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectConverter.java
rename to flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/oracle/database/dialect/OracleDialectConverter.java
index 4acc8f97..9aab3950 100644
--- a/flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectConverter.java
+++ b/flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/oracle/database/dialect/OracleDialectConverter.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.oracle.dialect;
+package org.apache.flink.connector.jdbc.oracle.database.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialectConverter;
+import org.apache.flink.connector.jdbc.core.database.dialect.AbstractDialectConverter;
import org.apache.flink.table.data.DecimalData;
import org.apache.flink.table.data.StringData;
import org.apache.flink.table.data.TimestampData;
diff --git a/flink-connector-jdbc-db2/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory b/flink-connector-jdbc-oracle/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
similarity index 92%
copy from flink-connector-jdbc-db2/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
copy to flink-connector-jdbc-oracle/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
index 762b3ce1..329fc77a 100644
--- a/flink-connector-jdbc-db2/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
+++ b/flink-connector-jdbc-oracle/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.flink.connector.jdbc.databases.db2.dialect.Db2Factory
+org.apache.flink.connector.jdbc.oracle.database.OracleFactory
diff --git a/flink-connector-jdbc-oracle/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory b/flink-connector-jdbc-oracle/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
deleted file mode 100644
index 81ed614f..00000000
--- a/flink-connector-jdbc-oracle/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-org.apache.flink.connector.jdbc.databases.oracle.dialect.OracleFactory
diff --git a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleTestBase.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/OracleTestBase.java
similarity index 89%
rename from flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleTestBase.java
rename to flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/OracleTestBase.java
index db773ede..3f609512 100644
--- a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleTestBase.java
+++ b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/OracleTestBase.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.oracle;
+package org.apache.flink.connector.jdbc.oracle;
+import org.apache.flink.connector.jdbc.oracle.testutils.OracleDatabase;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
import org.apache.flink.connector.jdbc.testutils.DatabaseTest;
-import org.apache.flink.connector.jdbc.testutils.databases.oracle.OracleDatabase;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectTest.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/database/dialect/OracleDialectTest.java
similarity index 87%
rename from flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectTest.java
rename to flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/database/dialect/OracleDialectTest.java
index 6619b262..72423f33 100644
--- a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectTest.java
+++ b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/database/dialect/OracleDialectTest.java
@@ -16,20 +16,16 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.oracle.dialect;
+package org.apache.flink.connector.jdbc.oracle.database.dialect;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectTest;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectTest;
+import org.apache.flink.connector.jdbc.oracle.OracleTestBase;
import java.util.Arrays;
import java.util.List;
/** The Oracle params for {@link JdbcDialectTest}. */
-class OracleDialectTest extends JdbcDialectTest {
-
- @Override
- protected String testDialect() {
- return "oracle";
- }
+class OracleDialectTest extends JdbcDialectTest implements OracleTestBase {
@Override
protected List<TestItem> testData() {
diff --git a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OraclePreparedStatementTest.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/database/dialect/OraclePreparedStatementTest.java
similarity index 97%
rename from flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OraclePreparedStatementTest.java
rename to flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/database/dialect/OraclePreparedStatementTest.java
index 372493b2..26bf27c9 100644
--- a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OraclePreparedStatementTest.java
+++ b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/database/dialect/OraclePreparedStatementTest.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.oracle.dialect;
+package org.apache.flink.connector.jdbc.oracle.database.dialect;
-import org.apache.flink.connector.jdbc.core.table.JdbcFactoryLoader;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.database.JdbcFactoryLoader;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
import org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatementImpl;
import org.junit.jupiter.api.Test;
diff --git a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSinkITCase.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/table/OracleDynamicTableSinkITCase.java
similarity index 94%
rename from flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSinkITCase.java
rename to flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/table/OracleDynamicTableSinkITCase.java
index 39e7ce21..b467cb72 100644
--- a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSinkITCase.java
+++ b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/table/OracleDynamicTableSinkITCase.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.oracle.table;
+package org.apache.flink.connector.jdbc.oracle.table;
-import org.apache.flink.connector.jdbc.databases.oracle.OracleTestBase;
-import org.apache.flink.connector.jdbc.databases.oracle.dialect.OracleDialect;
+import org.apache.flink.connector.jdbc.oracle.OracleTestBase;
+import org.apache.flink.connector.jdbc.oracle.database.dialect.OracleDialect;
import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSinkITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableBuilder;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
diff --git a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSourceITCase.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/table/OracleDynamicTableSourceITCase.java
similarity index 95%
rename from flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSourceITCase.java
rename to flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/table/OracleDynamicTableSourceITCase.java
index 9376ecdd..97ff3924 100644
--- a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSourceITCase.java
+++ b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/table/OracleDynamicTableSourceITCase.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.oracle.table;
+package org.apache.flink.connector.jdbc.oracle.table;
-import org.apache.flink.connector.jdbc.databases.oracle.OracleTestBase;
-import org.apache.flink.connector.jdbc.databases.oracle.dialect.OracleDialect;
+import org.apache.flink.connector.jdbc.oracle.OracleTestBase;
+import org.apache.flink.connector.jdbc.oracle.database.dialect.OracleDialect;
import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableBuilder;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
diff --git a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleTableSourceITCase.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/table/OracleTableSourceITCase.java
similarity index 97%
rename from flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleTableSourceITCase.java
rename to flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/table/OracleTableSourceITCase.java
index 7667c3a1..b99d9ad1 100644
--- a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleTableSourceITCase.java
+++ b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/table/OracleTableSourceITCase.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.oracle.table;
+package org.apache.flink.connector.jdbc.oracle.table;
-import org.apache.flink.connector.jdbc.databases.oracle.OracleTestBase;
-import org.apache.flink.connector.jdbc.databases.oracle.dialect.OracleDialect;
+import org.apache.flink.connector.jdbc.oracle.OracleTestBase;
+import org.apache.flink.connector.jdbc.oracle.database.dialect.OracleDialect;
import org.apache.flink.connector.jdbc.testutils.TableManaged;
import org.apache.flink.connector.jdbc.testutils.tables.TableBuilder;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
diff --git a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleDatabase.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/testutils/OracleDatabase.java
similarity index 96%
rename from flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleDatabase.java
rename to flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/testutils/OracleDatabase.java
index f9225816..37197292 100644
--- a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleDatabase.java
+++ b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/testutils/OracleDatabase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.oracle;
+package org.apache.flink.connector.jdbc.oracle.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
diff --git a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleImages.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/testutils/OracleImages.java
similarity index 93%
rename from flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleImages.java
rename to flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/testutils/OracleImages.java
index 8c31b517..0c40e9e3 100644
--- a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleImages.java
+++ b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/testutils/OracleImages.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.oracle;
+package org.apache.flink.connector.jdbc.oracle.testutils;
/** Oracle docker images. */
public interface OracleImages {
diff --git a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleMetadata.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/testutils/OracleMetadata.java
similarity index 97%
rename from flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleMetadata.java
rename to flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/testutils/OracleMetadata.java
index 93094205..2c7da897 100644
--- a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleMetadata.java
+++ b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/testutils/OracleMetadata.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.oracle;
+package org.apache.flink.connector.jdbc.oracle.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
diff --git a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/xa/OracleExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/xa/OracleExactlyOnceSinkE2eTest.java
similarity index 88%
rename from flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/xa/OracleExactlyOnceSinkE2eTest.java
rename to flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/xa/OracleExactlyOnceSinkE2eTest.java
index 5498b551..4d5d4d17 100644
--- a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/xa/OracleExactlyOnceSinkE2eTest.java
+++ b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/xa/OracleExactlyOnceSinkE2eTest.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.oracle.xa;
+package org.apache.flink.connector.jdbc.oracle.xa;
-import org.apache.flink.connector.jdbc.databases.oracle.OracleTestBase;
+import org.apache.flink.connector.jdbc.oracle.OracleTestBase;
import org.apache.flink.connector.jdbc.xa.JdbcExactlyOnceSinkE2eTest;
/** A simple end-to-end test for {@link JdbcExactlyOnceSinkE2eTest}. */
diff --git a/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresFactory.java b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/PostgresFactory.java
similarity index 77%
rename from flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresFactory.java
rename to flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/PostgresFactory.java
index 5c5310ed..ddf6172a 100644
--- a/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresFactory.java
+++ b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/PostgresFactory.java
@@ -16,13 +16,14 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.postgres.dialect;
+package org.apache.flink.connector.jdbc.postgres.database;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
-import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.databases.postgres.catalog.PostgresCatalog;
+import org.apache.flink.connector.jdbc.core.database.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.database.catalog.JdbcCatalog;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.postgres.database.catalog.PostgresCatalog;
+import org.apache.flink.connector.jdbc.postgres.database.dialect.PostgresDialect;
/** Factory for {@link PostgresDialect}. */
@Internal
diff --git a/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalog.java b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/catalog/PostgresCatalog.java
similarity index 97%
rename from flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalog.java
rename to flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/catalog/PostgresCatalog.java
index 301691b7..537332be 100644
--- a/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalog.java
+++ b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/catalog/PostgresCatalog.java
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.postgres.catalog;
+package org.apache.flink.connector.jdbc.postgres.database.catalog;
import org.apache.flink.annotation.Internal;
import org.apache.flink.annotation.VisibleForTesting;
-import org.apache.flink.connector.jdbc.core.table.catalog.AbstractJdbcCatalog;
-import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalogTypeMapper;
+import org.apache.flink.connector.jdbc.core.database.catalog.AbstractJdbcCatalog;
+import org.apache.flink.connector.jdbc.core.database.catalog.JdbcCatalogTypeMapper;
import org.apache.flink.table.catalog.ObjectPath;
import org.apache.flink.table.catalog.exceptions.CatalogException;
import org.apache.flink.table.catalog.exceptions.DatabaseNotExistException;
diff --git a/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTablePath.java b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/catalog/PostgresTablePath.java
similarity index 98%
rename from flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTablePath.java
rename to flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/catalog/PostgresTablePath.java
index d811e729..57deeec0 100644
--- a/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTablePath.java
+++ b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/catalog/PostgresTablePath.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.postgres.catalog;
+package org.apache.flink.connector.jdbc.postgres.database.catalog;
import org.apache.flink.annotation.Internal;
import org.apache.flink.util.StringUtils;
diff --git a/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTypeMapper.java b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/catalog/PostgresTypeMapper.java
similarity index 98%
rename from flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTypeMapper.java
rename to flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/catalog/PostgresTypeMapper.java
index c6b92605..5fc19ea3 100644
--- a/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTypeMapper.java
+++ b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/catalog/PostgresTypeMapper.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.postgres.catalog;
+package org.apache.flink.connector.jdbc.postgres.database.catalog;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalogTypeMapper;
+import org.apache.flink.connector.jdbc.core.database.catalog.JdbcCatalogTypeMapper;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.table.catalog.ObjectPath;
import org.apache.flink.table.types.DataType;
diff --git a/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/CompatiblePostgresDialect.java b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/dialect/CompatiblePostgresDialect.java
similarity index 96%
rename from flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/CompatiblePostgresDialect.java
rename to flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/dialect/CompatiblePostgresDialect.java
index b50cdbcf..12ebb29c 100644
--- a/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/CompatiblePostgresDialect.java
+++ b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/dialect/CompatiblePostgresDialect.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.postgres.dialect;
+package org.apache.flink.connector.jdbc.postgres.database.dialect;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.table.types.logical.RowType;
diff --git a/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/CompatiblePostgresDialectConverter.java b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/dialect/CompatiblePostgresDialectConverter.java
similarity index 95%
rename from flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/CompatiblePostgresDialectConverter.java
rename to flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/dialect/CompatiblePostgresDialectConverter.java
index fc79df3f..9670652a 100644
--- a/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/CompatiblePostgresDialectConverter.java
+++ b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/dialect/CompatiblePostgresDialectConverter.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.postgres.dialect;
+package org.apache.flink.connector.jdbc.postgres.database.dialect;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.table.types.logical.RowType;
diff --git a/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialect.java b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/dialect/PostgresDialect.java
similarity index 97%
rename from flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialect.java
rename to flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/dialect/PostgresDialect.java
index 026f8b0d..7848a12f 100644
--- a/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialect.java
+++ b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/dialect/PostgresDialect.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.postgres.dialect;
+package org.apache.flink.connector.jdbc.postgres.database.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialect;
+import org.apache.flink.connector.jdbc.core.database.dialect.AbstractDialect;
import org.apache.flink.table.types.logical.LogicalTypeRoot;
import org.apache.flink.table.types.logical.RowType;
diff --git a/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectConverter.java b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/dialect/PostgresDialectConverter.java
similarity index 96%
rename from flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectConverter.java
rename to flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/dialect/PostgresDialectConverter.java
index 45a272e0..c0cf6cfe 100644
--- a/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectConverter.java
+++ b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/postgres/database/dialect/PostgresDialectConverter.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.postgres.dialect;
+package org.apache.flink.connector.jdbc.postgres.database.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialectConverter;
+import org.apache.flink.connector.jdbc.core.database.dialect.AbstractDialectConverter;
import org.apache.flink.table.data.GenericArrayData;
import org.apache.flink.table.types.logical.ArrayType;
import org.apache.flink.table.types.logical.LogicalType;
diff --git a/flink-connector-jdbc-db2/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory b/flink-connector-jdbc-postgres/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
similarity index 92%
copy from flink-connector-jdbc-db2/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
copy to flink-connector-jdbc-postgres/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
index 762b3ce1..45239427 100644
--- a/flink-connector-jdbc-db2/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
+++ b/flink-connector-jdbc-postgres/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.flink.connector.jdbc.databases.db2.dialect.Db2Factory
+org.apache.flink.connector.jdbc.postgres.database.PostgresFactory
diff --git a/flink-connector-jdbc-postgres/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory b/flink-connector-jdbc-postgres/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
deleted file mode 100644
index 58a60ede..00000000
--- a/flink-connector-jdbc-postgres/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-org.apache.flink.connector.jdbc.databases.postgres.dialect.PostgresFactory
diff --git a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/PostgresTestBase.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/PostgresTestBase.java
similarity index 89%
rename from flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/PostgresTestBase.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/PostgresTestBase.java
index 8f29ecdc..6790a9ac 100644
--- a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/PostgresTestBase.java
+++ b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/PostgresTestBase.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.postgres;
+package org.apache.flink.connector.jdbc.postgres;
+import org.apache.flink.connector.jdbc.postgres.testutils.PostgresDatabase;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
import org.apache.flink.connector.jdbc.testutils.DatabaseTest;
-import org.apache.flink.connector.jdbc.testutils.databases.postgres.PostgresDatabase;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/factory/JdbcCatalogFactoryTest.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database/PostgresFactoryTest.java
similarity index 83%
rename from flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/factory/JdbcCatalogFactoryTest.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database/PostgresFactoryTest.java
index 0cb69d80..1b3d2330 100644
--- a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/factory/JdbcCatalogFactoryTest.java
+++ b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database/PostgresFactoryTest.java
@@ -16,14 +16,14 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.postgres.catalog.factory;
+package org.apache.flink.connector.jdbc.postgres.database;
-import org.apache.flink.connector.jdbc.core.table.JdbcFactoryLoader;
-import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
-import org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactory;
-import org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions;
-import org.apache.flink.connector.jdbc.databases.postgres.PostgresTestBase;
-import org.apache.flink.connector.jdbc.databases.postgres.catalog.PostgresCatalog;
+import org.apache.flink.connector.jdbc.core.database.JdbcFactoryLoader;
+import org.apache.flink.connector.jdbc.core.database.catalog.JdbcCatalog;
+import org.apache.flink.connector.jdbc.core.database.catalog.factory.JdbcCatalogFactory;
+import org.apache.flink.connector.jdbc.core.database.catalog.factory.JdbcCatalogFactoryOptions;
+import org.apache.flink.connector.jdbc.postgres.PostgresTestBase;
+import org.apache.flink.connector.jdbc.postgres.database.catalog.PostgresCatalog;
import org.apache.flink.table.catalog.Catalog;
import org.apache.flink.table.catalog.CommonCatalogOptions;
import org.apache.flink.table.factories.FactoryUtil;
@@ -37,7 +37,7 @@ import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
/** Test for {@link JdbcCatalogFactory}. */
-class JdbcCatalogFactoryTest implements PostgresTestBase {
+class PostgresFactoryTest implements PostgresTestBase {
protected static String baseUrl;
protected static JdbcCatalog catalog;
diff --git a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogITCase.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database/catalog/PostgresCatalogITCase.java
similarity index 97%
rename from flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogITCase.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database/catalog/PostgresCatalogITCase.java
index 29c4c884..ff7eabd7 100644
--- a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogITCase.java
+++ b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database/catalog/PostgresCatalogITCase.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.postgres.catalog;
+package org.apache.flink.connector.jdbc.postgres.database.catalog;
import org.apache.flink.table.api.EnvironmentSettings;
import org.apache.flink.table.api.TableEnvironment;
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test;
import java.util.List;
-import static org.apache.flink.connector.jdbc.databases.postgres.catalog.PostgresCatalog.DEFAULT_DATABASE;
+import static org.apache.flink.connector.jdbc.postgres.database.catalog.PostgresCatalog.DEFAULT_DATABASE;
import static org.apache.flink.table.api.config.ExecutionConfigOptions.TABLE_EXEC_RESOURCE_DEFAULT_PARALLELISM;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTest.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database/catalog/PostgresCatalogTest.java
similarity index 99%
rename from flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTest.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database/catalog/PostgresCatalogTest.java
index 4e5d78b3..56da37c3 100644
--- a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTest.java
+++ b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database/catalog/PostgresCatalogTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.postgres.catalog;
+package org.apache.flink.connector.jdbc.postgres.database.catalog;
import org.apache.flink.table.api.Schema;
import org.apache.flink.table.catalog.CatalogBaseTable;
diff --git a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTestBase.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database/catalog/PostgresCatalogTestBase.java
similarity index 98%
rename from flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTestBase.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database/catalog/PostgresCatalogTestBase.java
index c8d2b126..f3d0d1c2 100644
--- a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTestBase.java
+++ b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database/catalog/PostgresCatalogTestBase.java
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.postgres.catalog;
+package org.apache.flink.connector.jdbc.postgres.database.catalog;
-import org.apache.flink.connector.jdbc.databases.postgres.PostgresTestBase;
+import org.apache.flink.connector.jdbc.postgres.PostgresTestBase;
+import org.apache.flink.connector.jdbc.postgres.testutils.PostgresDatabase;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
import org.apache.flink.connector.jdbc.testutils.JdbcITCaseBase;
-import org.apache.flink.connector.jdbc.testutils.databases.postgres.PostgresDatabase;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.table.api.Schema;
import org.apache.flink.table.types.logical.DecimalType;
diff --git a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTablePathTest.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database/catalog/PostgresTablePathTest.java
similarity index 97%
rename from flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTablePathTest.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database/catalog/PostgresTablePathTest.java
index 38625be2..e6a0a5d7 100644
--- a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTablePathTest.java
+++ b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database/catalog/PostgresTablePathTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.postgres.catalog;
+package org.apache.flink.connector.jdbc.postgres.database.catalog;
import org.junit.jupiter.api.Test;
diff --git a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectTest.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database/dialect/PostgresDialectTest.java
similarity index 89%
rename from flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectTest.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database/dialect/PostgresDialectTest.java
index a0973a28..115a6445 100644
--- a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectTest.java
+++ b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/database/dialect/PostgresDialectTest.java
@@ -16,20 +16,16 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.postgres.dialect;
+package org.apache.flink.connector.jdbc.postgres.database.dialect;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectTest;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectTest;
+import org.apache.flink.connector.jdbc.postgres.PostgresTestBase;
import java.util.Arrays;
import java.util.List;
/** The PostgresSql params for {@link JdbcDialectTest}. */
-class PostgresDialectTest extends JdbcDialectTest {
-
- @Override
- protected String testDialect() {
- return "postgresql";
- }
+class PostgresDialectTest extends JdbcDialectTest implements PostgresTestBase {
@Override
protected List<TestItem> testData() {
diff --git a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/table/PostgresDynamicTableSinkITCase.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/table/PostgresDynamicTableSinkITCase.java
similarity index 82%
rename from flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/table/PostgresDynamicTableSinkITCase.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/table/PostgresDynamicTableSinkITCase.java
index e8c258f1..2947a3a9 100644
--- a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/table/PostgresDynamicTableSinkITCase.java
+++ b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/table/PostgresDynamicTableSinkITCase.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.postgres.table;
+package org.apache.flink.connector.jdbc.postgres.table;
-import org.apache.flink.connector.jdbc.databases.postgres.PostgresTestBase;
-import org.apache.flink.connector.jdbc.databases.postgres.dialect.PostgresDialect;
+import org.apache.flink.connector.jdbc.postgres.PostgresTestBase;
+import org.apache.flink.connector.jdbc.postgres.database.dialect.PostgresDialect;
import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSinkITCase;
/** The Table Sink ITCase for {@link PostgresDialect}. */
diff --git a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/table/PostgresDynamicTableSourceITCase.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/table/PostgresDynamicTableSourceITCase.java
similarity index 92%
rename from flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/table/PostgresDynamicTableSourceITCase.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/table/PostgresDynamicTableSourceITCase.java
index 1919eb84..f2c43e88 100644
--- a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/table/PostgresDynamicTableSourceITCase.java
+++ b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/table/PostgresDynamicTableSourceITCase.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.postgres.table;
+package org.apache.flink.connector.jdbc.postgres.table;
-import org.apache.flink.connector.jdbc.databases.postgres.PostgresTestBase;
-import org.apache.flink.connector.jdbc.databases.postgres.dialect.PostgresDialect;
+import org.apache.flink.connector.jdbc.postgres.PostgresTestBase;
+import org.apache.flink.connector.jdbc.postgres.database.dialect.PostgresDialect;
import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
diff --git a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresDatabase.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils/PostgresDatabase.java
similarity index 98%
rename from flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresDatabase.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils/PostgresDatabase.java
index 4d33d783..a4445e22 100644
--- a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresDatabase.java
+++ b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils/PostgresDatabase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.postgres;
+package org.apache.flink.connector.jdbc.postgres.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
diff --git a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresImages.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils/PostgresImages.java
similarity index 93%
rename from flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresImages.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils/PostgresImages.java
index 6cfc715c..9c33b8ef 100644
--- a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresImages.java
+++ b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils/PostgresImages.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.postgres;
+package org.apache.flink.connector.jdbc.postgres.testutils;
/** Postgres docker images. */
public interface PostgresImages {
diff --git a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresMetadata.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils/PostgresMetadata.java
similarity index 97%
rename from flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresMetadata.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils/PostgresMetadata.java
index 1d66d0d3..219f4961 100644
--- a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresMetadata.java
+++ b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils/PostgresMetadata.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.postgres;
+package org.apache.flink.connector.jdbc.postgres.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
diff --git a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/xa/PostgresExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/xa/PostgresExactlyOnceSinkE2eTest.java
similarity index 89%
rename from flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/xa/PostgresExactlyOnceSinkE2eTest.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/xa/PostgresExactlyOnceSinkE2eTest.java
index 97440647..67210a51 100644
--- a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/xa/PostgresExactlyOnceSinkE2eTest.java
+++ b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/xa/PostgresExactlyOnceSinkE2eTest.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.postgres.xa;
+package org.apache.flink.connector.jdbc.postgres.xa;
-import org.apache.flink.connector.jdbc.databases.postgres.PostgresTestBase;
+import org.apache.flink.connector.jdbc.postgres.PostgresTestBase;
import org.apache.flink.connector.jdbc.xa.JdbcExactlyOnceSinkE2eTest;
/**
diff --git a/flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerFactory.java b/flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/sqlserver/database/SqlServerFactory.java
similarity index 80%
rename from flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerFactory.java
rename to flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/sqlserver/database/SqlServerFactory.java
index 43d66827..28ffc82f 100644
--- a/flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerFactory.java
+++ b/flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/sqlserver/database/SqlServerFactory.java
@@ -16,12 +16,13 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.sqlserver.dialect;
+package org.apache.flink.connector.jdbc.sqlserver.database;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
-import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.database.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.database.catalog.JdbcCatalog;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.sqlserver.database.dialect.SqlServerDialect;
/** Factory for {@link SqlServerDialect}. */
@Internal
diff --git a/flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialect.java b/flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/sqlserver/database/dialect/SqlServerDialect.java
similarity index 96%
rename from flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialect.java
rename to flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/sqlserver/database/dialect/SqlServerDialect.java
index f19e6f89..41fd3560 100644
--- a/flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialect.java
+++ b/flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/sqlserver/database/dialect/SqlServerDialect.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.sqlserver.dialect;
+package org.apache.flink.connector.jdbc.sqlserver.database.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialect;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
+import org.apache.flink.connector.jdbc.core.database.dialect.AbstractDialect;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectConverter;
import org.apache.flink.table.types.logical.LogicalTypeRoot;
import org.apache.flink.table.types.logical.RowType;
diff --git a/flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialectConverter.java b/flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/sqlserver/database/dialect/SqlServerDialectConverter.java
similarity index 91%
rename from flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialectConverter.java
rename to flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/sqlserver/database/dialect/SqlServerDialectConverter.java
index 9c7451b0..cbe9a6cc 100644
--- a/flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialectConverter.java
+++ b/flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/sqlserver/database/dialect/SqlServerDialectConverter.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.sqlserver.dialect;
+package org.apache.flink.connector.jdbc.sqlserver.database.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialectConverter;
+import org.apache.flink.connector.jdbc.core.database.dialect.AbstractDialectConverter;
import org.apache.flink.table.types.logical.LogicalType;
import org.apache.flink.table.types.logical.RowType;
diff --git a/flink-connector-jdbc-db2/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory b/flink-connector-jdbc-sqlserver/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
similarity index 92%
copy from flink-connector-jdbc-db2/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
copy to flink-connector-jdbc-sqlserver/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
index 762b3ce1..6f22c89a 100644
--- a/flink-connector-jdbc-db2/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
+++ b/flink-connector-jdbc-sqlserver/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.flink.connector.jdbc.databases.db2.dialect.Db2Factory
+org.apache.flink.connector.jdbc.sqlserver.database.SqlServerFactory
diff --git a/flink-connector-jdbc-sqlserver/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory b/flink-connector-jdbc-sqlserver/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
deleted file mode 100644
index d646ad1a..00000000
--- a/flink-connector-jdbc-sqlserver/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-org.apache.flink.connector.jdbc.databases.sqlserver.dialect.SqlServerFactory
diff --git a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/SqlServerTestBase.java b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/SqlServerTestBase.java
similarity index 89%
rename from flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/SqlServerTestBase.java
rename to flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/SqlServerTestBase.java
index d59f9eb4..47f766fa 100644
--- a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/SqlServerTestBase.java
+++ b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/SqlServerTestBase.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.sqlserver;
+package org.apache.flink.connector.jdbc.sqlserver;
+import org.apache.flink.connector.jdbc.sqlserver.testutils.SqlServerDatabase;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
import org.apache.flink.connector.jdbc.testutils.DatabaseTest;
-import org.apache.flink.connector.jdbc.testutils.databases.sqlserver.SqlServerDatabase;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerPreparedStatementTest.java b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/database/dialect/SqlServerPreparedStatementTest.java
similarity index 95%
rename from flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerPreparedStatementTest.java
rename to flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/database/dialect/SqlServerPreparedStatementTest.java
index fbe57835..814d65c9 100644
--- a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerPreparedStatementTest.java
+++ b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/database/dialect/SqlServerPreparedStatementTest.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.sqlserver.dialect;
+package org.apache.flink.connector.jdbc.sqlserver.database.dialect;
-import org.apache.flink.connector.jdbc.core.table.JdbcFactoryLoader;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.database.JdbcFactoryLoader;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
import org.junit.jupiter.api.Test;
diff --git a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerDynamicTableSinkITCase.java b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/table/SqlServerDynamicTableSinkITCase.java
similarity index 90%
rename from flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerDynamicTableSinkITCase.java
rename to flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/table/SqlServerDynamicTableSinkITCase.java
index 99a6a6bf..2c2e3eb1 100644
--- a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerDynamicTableSinkITCase.java
+++ b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/table/SqlServerDynamicTableSinkITCase.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.sqlserver.table;
+package org.apache.flink.connector.jdbc.sqlserver.table;
-import org.apache.flink.connector.jdbc.databases.sqlserver.SqlServerTestBase;
-import org.apache.flink.connector.jdbc.databases.sqlserver.dialect.SqlServerDialect;
+import org.apache.flink.connector.jdbc.sqlserver.SqlServerTestBase;
+import org.apache.flink.connector.jdbc.sqlserver.database.dialect.SqlServerDialect;
import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSinkITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
diff --git a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerDynamicTableSourceITCase.java b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/table/SqlServerDynamicTableSourceITCase.java
similarity index 95%
rename from flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerDynamicTableSourceITCase.java
rename to flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/table/SqlServerDynamicTableSourceITCase.java
index afc178d0..34d6161a 100644
--- a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerDynamicTableSourceITCase.java
+++ b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/table/SqlServerDynamicTableSourceITCase.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.sqlserver.table;
+package org.apache.flink.connector.jdbc.sqlserver.table;
-import org.apache.flink.connector.jdbc.databases.sqlserver.SqlServerTestBase;
-import org.apache.flink.connector.jdbc.databases.sqlserver.dialect.SqlServerDialect;
+import org.apache.flink.connector.jdbc.sqlserver.SqlServerTestBase;
+import org.apache.flink.connector.jdbc.sqlserver.database.dialect.SqlServerDialect;
import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
diff --git a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerTableSourceITCase.java b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/table/SqlServerTableSourceITCase.java
similarity index 97%
rename from flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerTableSourceITCase.java
rename to flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/table/SqlServerTableSourceITCase.java
index e5dc9bf6..793d691c 100644
--- a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerTableSourceITCase.java
+++ b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/table/SqlServerTableSourceITCase.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.sqlserver.table;
+package org.apache.flink.connector.jdbc.sqlserver.table;
-import org.apache.flink.connector.jdbc.databases.sqlserver.SqlServerTestBase;
-import org.apache.flink.connector.jdbc.databases.sqlserver.dialect.SqlServerDialect;
+import org.apache.flink.connector.jdbc.sqlserver.SqlServerTestBase;
+import org.apache.flink.connector.jdbc.sqlserver.database.dialect.SqlServerDialect;
import org.apache.flink.connector.jdbc.testutils.TableManaged;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
diff --git a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerDatabase.java b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/testutils/SqlServerDatabase.java
similarity index 97%
rename from flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerDatabase.java
rename to flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/testutils/SqlServerDatabase.java
index 9d76186d..7629fba5 100644
--- a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerDatabase.java
+++ b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/testutils/SqlServerDatabase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.sqlserver;
+package org.apache.flink.connector.jdbc.sqlserver.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
diff --git a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerImages.java b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/testutils/SqlServerImages.java
similarity index 94%
rename from flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerImages.java
rename to flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/testutils/SqlServerImages.java
index dc2cf5cd..4678d330 100644
--- a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerImages.java
+++ b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/testutils/SqlServerImages.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.sqlserver;
+package org.apache.flink.connector.jdbc.sqlserver.testutils;
import org.testcontainers.utility.DockerImageName;
diff --git a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerMetadata.java b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/testutils/SqlServerMetadata.java
similarity index 97%
rename from flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerMetadata.java
rename to flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/testutils/SqlServerMetadata.java
index 86558d08..560d1971 100644
--- a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerMetadata.java
+++ b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/testutils/SqlServerMetadata.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.sqlserver;
+package org.apache.flink.connector.jdbc.sqlserver.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
diff --git a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/xa/SqlServerExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/xa/SqlServerExactlyOnceSinkE2eTest.java
similarity index 88%
rename from flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/xa/SqlServerExactlyOnceSinkE2eTest.java
rename to flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/xa/SqlServerExactlyOnceSinkE2eTest.java
index 12fc1055..8117ea53 100644
--- a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/xa/SqlServerExactlyOnceSinkE2eTest.java
+++ b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/xa/SqlServerExactlyOnceSinkE2eTest.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.sqlserver.xa;
+package org.apache.flink.connector.jdbc.sqlserver.xa;
-import org.apache.flink.connector.jdbc.databases.sqlserver.SqlServerTestBase;
+import org.apache.flink.connector.jdbc.sqlserver.SqlServerTestBase;
import org.apache.flink.connector.jdbc.xa.JdbcExactlyOnceSinkE2eTest;
/**
diff --git a/flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoFactory.java b/flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/trino/database/TrinoFactory.java
similarity index 81%
rename from flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoFactory.java
rename to flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/trino/database/TrinoFactory.java
index d6ef4da8..b54d8743 100644
--- a/flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoFactory.java
+++ b/flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/trino/database/TrinoFactory.java
@@ -16,12 +16,13 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.trino.dialect;
+package org.apache.flink.connector.jdbc.trino.database;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
-import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.database.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.database.catalog.JdbcCatalog;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.trino.database.dialect.TrinoDialect;
/** Factory for {@link TrinoDialect}. */
@Internal
diff --git a/flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialect.java b/flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/trino/database/dialect/TrinoDialect.java
similarity index 94%
rename from flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialect.java
rename to flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/trino/database/dialect/TrinoDialect.java
index 5c02dda0..87f17915 100644
--- a/flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialect.java
+++ b/flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/trino/database/dialect/TrinoDialect.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.trino.dialect;
+package org.apache.flink.connector.jdbc.trino.database.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialect;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
+import org.apache.flink.connector.jdbc.core.database.dialect.AbstractDialect;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectConverter;
import org.apache.flink.table.types.logical.LogicalTypeRoot;
import org.apache.flink.table.types.logical.RowType;
diff --git a/flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectConverter.java b/flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/trino/database/dialect/TrinoDialectConverter.java
similarity index 94%
rename from flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectConverter.java
rename to flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/trino/database/dialect/TrinoDialectConverter.java
index a37d6e90..f3162ff3 100644
--- a/flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectConverter.java
+++ b/flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/trino/database/dialect/TrinoDialectConverter.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.trino.dialect;
+package org.apache.flink.connector.jdbc.trino.database.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialectConverter;
+import org.apache.flink.connector.jdbc.core.database.dialect.AbstractDialectConverter;
import org.apache.flink.table.data.DecimalData;
import org.apache.flink.table.types.logical.DecimalType;
import org.apache.flink.table.types.logical.LogicalType;
diff --git a/flink-connector-jdbc-db2/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory b/flink-connector-jdbc-trino/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
similarity index 92%
rename from flink-connector-jdbc-db2/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
rename to flink-connector-jdbc-trino/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
index 762b3ce1..6a462c9e 100644
--- a/flink-connector-jdbc-db2/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
+++ b/flink-connector-jdbc-trino/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.database.JdbcFactory
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.flink.connector.jdbc.databases.db2.dialect.Db2Factory
+org.apache.flink.connector.jdbc.trino.database.TrinoFactory
diff --git a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/databases/trino/TrinoTestBase.java b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/TrinoTestBase.java
similarity index 90%
rename from flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/databases/trino/TrinoTestBase.java
rename to flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/TrinoTestBase.java
index 9e04eb34..4b52cbe6 100644
--- a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/databases/trino/TrinoTestBase.java
+++ b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/TrinoTestBase.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.trino;
+package org.apache.flink.connector.jdbc.trino;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
import org.apache.flink.connector.jdbc.testutils.DatabaseTest;
-import org.apache.flink.connector.jdbc.testutils.databases.trino.TrinoDatabase;
+import org.apache.flink.connector.jdbc.trino.testutils.TrinoDatabase;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectTest.java b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/database/dialect/TrinoDialectTest.java
similarity index 87%
rename from flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectTest.java
rename to flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/database/dialect/TrinoDialectTest.java
index 88a386db..95bbca27 100644
--- a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectTest.java
+++ b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/database/dialect/TrinoDialectTest.java
@@ -16,20 +16,16 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.trino.dialect;
+package org.apache.flink.connector.jdbc.trino.database.dialect;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectTest;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectTest;
+import org.apache.flink.connector.jdbc.trino.TrinoTestBase;
import java.util.Arrays;
import java.util.List;
/** The Oracle params for {@link JdbcDialectTest}. */
-class TrinoDialectTest extends JdbcDialectTest {
-
- @Override
- protected String testDialect() {
- return "trino";
- }
+class TrinoDialectTest extends JdbcDialectTest implements TrinoTestBase {
@Override
protected List<TestItem> testData() {
diff --git a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoPreparedStatementTest.java b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/database/dialect/TrinoPreparedStatementTest.java
similarity index 96%
rename from flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoPreparedStatementTest.java
rename to flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/database/dialect/TrinoPreparedStatementTest.java
index 8b3d9854..34549350 100644
--- a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoPreparedStatementTest.java
+++ b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/database/dialect/TrinoPreparedStatementTest.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.trino.dialect;
+package org.apache.flink.connector.jdbc.trino.database.dialect;
-import org.apache.flink.connector.jdbc.core.table.JdbcFactoryLoader;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.database.JdbcFactoryLoader;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
import org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatementImpl;
import org.junit.jupiter.api.Test;
diff --git a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/databases/trino/table/TrinoDynamicTableSinkITCase.java b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/table/TrinoDynamicTableSinkITCase.java
similarity index 92%
rename from flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/databases/trino/table/TrinoDynamicTableSinkITCase.java
rename to flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/table/TrinoDynamicTableSinkITCase.java
index 954b43fa..b1e115aa 100644
--- a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/databases/trino/table/TrinoDynamicTableSinkITCase.java
+++ b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/table/TrinoDynamicTableSinkITCase.java
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.trino.table;
+package org.apache.flink.connector.jdbc.trino.table;
-import org.apache.flink.connector.jdbc.databases.trino.TrinoTestBase;
-import org.apache.flink.connector.jdbc.databases.trino.dialect.TrinoDialect;
import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSinkITCase;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
import org.apache.flink.connector.jdbc.testutils.TableManaged;
+import org.apache.flink.connector.jdbc.trino.TrinoTestBase;
+import org.apache.flink.connector.jdbc.trino.database.dialect.TrinoDialect;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/databases/trino/table/TrinoDynamicTableSourceITCase.java b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/table/TrinoDynamicTableSourceITCase.java
similarity index 93%
rename from flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/databases/trino/table/TrinoDynamicTableSourceITCase.java
rename to flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/table/TrinoDynamicTableSourceITCase.java
index 39b6c3c5..560fd31f 100644
--- a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/databases/trino/table/TrinoDynamicTableSourceITCase.java
+++ b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/table/TrinoDynamicTableSourceITCase.java
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.trino.table;
+package org.apache.flink.connector.jdbc.trino.table;
-import org.apache.flink.connector.jdbc.databases.trino.TrinoTestBase;
-import org.apache.flink.connector.jdbc.databases.trino.dialect.TrinoDialect;
import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
+import org.apache.flink.connector.jdbc.trino.TrinoTestBase;
+import org.apache.flink.connector.jdbc.trino.database.dialect.TrinoDialect;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.types.Row;
diff --git a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoDatabase.java b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils/TrinoDatabase.java
similarity index 92%
rename from flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoDatabase.java
rename to flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils/TrinoDatabase.java
index 2ba42a6b..9e5dbc75 100644
--- a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoDatabase.java
+++ b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils/TrinoDatabase.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.trino;
+package org.apache.flink.connector.jdbc.trino.testutils;
+import org.apache.flink.connector.jdbc.postgres.testutils.PostgresDatabase;
+import org.apache.flink.connector.jdbc.postgres.testutils.PostgresImages;
+import org.apache.flink.connector.jdbc.postgres.testutils.PostgresMetadata;
import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
-import org.apache.flink.connector.jdbc.testutils.databases.postgres.PostgresDatabase;
-import org.apache.flink.connector.jdbc.testutils.databases.postgres.PostgresImages;
-import org.apache.flink.connector.jdbc.testutils.databases.postgres.PostgresMetadata;
import org.apache.flink.util.FlinkRuntimeException;
import org.testcontainers.containers.BindMode;
diff --git a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoImages.java b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils/TrinoImages.java
similarity index 93%
rename from flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoImages.java
rename to flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils/TrinoImages.java
index f7d2d8e2..f70b8aba 100644
--- a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoImages.java
+++ b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils/TrinoImages.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.trino;
+package org.apache.flink.connector.jdbc.trino.testutils;
/** Postgres docker images. */
public interface TrinoImages {
diff --git a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoMetadata.java b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils/TrinoMetadata.java
similarity index 97%
rename from flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoMetadata.java
rename to flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils/TrinoMetadata.java
index 46065086..096cefcc 100644
--- a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoMetadata.java
+++ b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils/TrinoMetadata.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.testutils.databases.trino;
+package org.apache.flink.connector.jdbc.trino.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/AbstractJdbcCatalog.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/AbstractJdbcCatalog.java
index 6a7e1714..4af50e7a 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/AbstractJdbcCatalog.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/AbstractJdbcCatalog.java
@@ -25,7 +25,7 @@ package org.apache.flink.connector.jdbc.catalog;
*/
@Deprecated
public abstract class AbstractJdbcCatalog
- extends org.apache.flink.connector.jdbc.core.table.catalog.AbstractJdbcCatalog {
+ extends org.apache.flink.connector.jdbc.core.database.catalog.AbstractJdbcCatalog {
public AbstractJdbcCatalog(
ClassLoader userClassLoader,
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalog.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalog.java
index 34688cc2..b392788e 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalog.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalog.java
@@ -21,7 +21,7 @@ package org.apache.flink.connector.jdbc.catalog;
import org.apache.flink.annotation.Internal;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.annotation.VisibleForTesting;
-import org.apache.flink.connector.jdbc.core.table.catalog.AbstractJdbcCatalog;
+import org.apache.flink.connector.jdbc.core.database.catalog.AbstractJdbcCatalog;
import org.apache.flink.table.catalog.CatalogBaseTable;
import org.apache.flink.table.catalog.CatalogDatabase;
import org.apache.flink.table.catalog.ObjectPath;
@@ -41,10 +41,9 @@ import static org.apache.flink.connector.jdbc.JdbcConnectionOptions.getBriefAuth
*/
@Deprecated
@PublicEvolving
-public class JdbcCatalog
- extends org.apache.flink.connector.jdbc.core.table.catalog.AbstractJdbcCatalog {
+public class JdbcCatalog extends AbstractJdbcCatalog {
- private final org.apache.flink.connector.jdbc.core.table.catalog.AbstractJdbcCatalog internal;
+ private final AbstractJdbcCatalog internal;
@Deprecated
/**
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtils.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtils.java
index c45cabd8..73b7d449 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtils.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtils.java
@@ -18,14 +18,14 @@
package org.apache.flink.connector.jdbc.catalog;
-import org.apache.flink.connector.jdbc.core.table.JdbcFactoryLoader;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.databases.cratedb.catalog.CrateDBCatalog;
-import org.apache.flink.connector.jdbc.databases.cratedb.dialect.CrateDBDialect;
-import org.apache.flink.connector.jdbc.databases.mysql.catalog.MySqlCatalog;
-import org.apache.flink.connector.jdbc.databases.mysql.dialect.MySqlDialect;
-import org.apache.flink.connector.jdbc.databases.postgres.catalog.PostgresCatalog;
-import org.apache.flink.connector.jdbc.databases.postgres.dialect.PostgresDialect;
+import org.apache.flink.connector.jdbc.core.database.JdbcFactoryLoader;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.cratedb.database.catalog.CrateDBCatalog;
+import org.apache.flink.connector.jdbc.cratedb.database.dialect.CrateDBDialect;
+import org.apache.flink.connector.jdbc.mysql.database.catalog.MySqlCatalog;
+import org.apache.flink.connector.jdbc.mysql.database.dialect.MySqlDialect;
+import org.apache.flink.connector.jdbc.postgres.database.catalog.PostgresCatalog;
+import org.apache.flink.connector.jdbc.postgres.database.dialect.PostgresDialect;
import java.util.Properties;
@@ -80,7 +80,7 @@ public class JdbcCatalogUtils {
JdbcDialect dialect =
JdbcFactoryLoader.loadDialect(baseUrl, userClassLoader, compatibleMode);
- org.apache.flink.connector.jdbc.core.table.catalog.AbstractJdbcCatalog catalog;
+ org.apache.flink.connector.jdbc.core.database.catalog.AbstractJdbcCatalog catalog;
if (dialect instanceof PostgresDialect) {
catalog =
new PostgresCatalog(
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactory.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactory.java
index 5f14840e..9aad0c7a 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactory.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactory.java
@@ -20,7 +20,7 @@ package org.apache.flink.connector.jdbc.catalog.factory;
import org.apache.flink.configuration.ConfigOption;
import org.apache.flink.connector.jdbc.catalog.JdbcCatalog;
-import org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions;
+import org.apache.flink.connector.jdbc.core.database.catalog.factory.JdbcCatalogFactoryOptions;
import org.apache.flink.table.catalog.Catalog;
import org.apache.flink.table.factories.CatalogFactory;
import org.apache.flink.table.factories.FactoryUtil;
@@ -31,11 +31,11 @@ import org.slf4j.LoggerFactory;
import java.util.HashSet;
import java.util.Set;
-import static org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions.BASE_URL;
-import static org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions.COMPATIBLE_MODE;
-import static org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions.DEFAULT_DATABASE;
-import static org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions.PASSWORD;
-import static org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions.USERNAME;
+import static org.apache.flink.connector.jdbc.core.database.catalog.factory.JdbcCatalogFactoryOptions.BASE_URL;
+import static org.apache.flink.connector.jdbc.core.database.catalog.factory.JdbcCatalogFactoryOptions.COMPATIBLE_MODE;
+import static org.apache.flink.connector.jdbc.core.database.catalog.factory.JdbcCatalogFactoryOptions.DEFAULT_DATABASE;
+import static org.apache.flink.connector.jdbc.core.database.catalog.factory.JdbcCatalogFactoryOptions.PASSWORD;
+import static org.apache.flink.connector.jdbc.core.database.catalog.factory.JdbcCatalogFactoryOptions.USERNAME;
import static org.apache.flink.connector.jdbc.utils.JdbcUtils.getConnectionProperties;
import static org.apache.flink.table.factories.FactoryUtil.PROPERTY_VERSION;
@@ -49,7 +49,7 @@ public class JdbcCatalogFactory implements CatalogFactory {
private static final Logger LOG =
LoggerFactory.getLogger(
- org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactory
+ org.apache.flink.connector.jdbc.core.database.catalog.factory.JdbcCatalogFactory
.class);
@Override
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java
index cccf06d3..433b40c4 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java
@@ -18,7 +18,7 @@
package org.apache.flink.connector.jdbc.converter;
-import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialectConverter;
+import org.apache.flink.connector.jdbc.core.database.dialect.AbstractDialectConverter;
import org.apache.flink.table.types.logical.RowType;
/**
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/JdbcRowConverter.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/JdbcRowConverter.java
index 923fe222..0effab66 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/JdbcRowConverter.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/JdbcRowConverter.java
@@ -19,7 +19,7 @@
package org.apache.flink.connector.jdbc.converter;
import org.apache.flink.annotation.PublicEvolving;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectConverter;
import org.apache.flink.table.data.RowData;
/**
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractDialect.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractDialect.java
index 28b2d8a2..73db56e8 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractDialect.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractDialect.java
@@ -19,7 +19,7 @@
package org.apache.flink.connector.jdbc.dialect;
import org.apache.flink.annotation.PublicEvolving;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
/**
* Base class for {@link JdbcDialect JdbcDialects} that implements basic data type validation and
@@ -34,5 +34,5 @@ import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
@Deprecated
@PublicEvolving
public abstract class AbstractDialect
- extends org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialect
+ extends org.apache.flink.connector.jdbc.core.database.dialect.AbstractDialect
implements org.apache.flink.connector.jdbc.dialect.JdbcDialect {}
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialect.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialect.java
index 54a61d4c..400593d0 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialect.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialect.java
@@ -19,7 +19,7 @@
package org.apache.flink.connector.jdbc.dialect;
import org.apache.flink.annotation.PublicEvolving;
-import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.database.JdbcFactory;
/**
* Represents a dialect of SQL implemented by a particular JDBC system. Dialects should be immutable
@@ -31,4 +31,4 @@ import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
@Deprecated
@PublicEvolving
public interface JdbcDialect
- extends org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect {}
+ extends org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect {}
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectFactory.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectFactory.java
index 3fc31c49..4a6128f4 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectFactory.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectFactory.java
@@ -18,7 +18,7 @@
package org.apache.flink.connector.jdbc.dialect;
-import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.database.JdbcFactory;
import org.apache.flink.util.StringUtils;
/**
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java
index 5b598602..73beac35 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java
@@ -18,7 +18,7 @@
package org.apache.flink.connector.jdbc.dialect;
-import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalogTypeMapper;
+import org.apache.flink.connector.jdbc.core.database.catalog.JdbcCatalogTypeMapper;
/**
* Separate the jdbc meta-information type to flink table type into the interface.
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeTest.java
index 80edaea5..e67d5d5a 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeTest.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeTest.java
@@ -18,11 +18,12 @@
package org.apache.flink.connector.jdbc.dialect;
+import org.apache.flink.connector.jdbc.derby.database.DerbyDialectTest;
+
/**
* Tests for all DataTypes and Dialects of JDBC connector.
*
* @deprecated use org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectTest
*/
@Deprecated
-public class JdbcDialectTypeTest
- extends org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectTest {}
+public class JdbcDialectTypeTest extends DerbyDialectTest {}
(flink-connector-jdbc) 14/14: [FLINK-35363] Modify tests to clean up unused docker images
Posted by fa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git
commit 39ba942cda4bd7752d3706dc70385a88182d8a3b
Author: Joao Boto <bo...@boto.pro>
AuthorDate: Wed Jul 10 19:11:04 2024 +0200
[FLINK-35363] Modify tests to clean up unused docker images
---
flink-connector-jdbc-core/pom.xml | 8 +++
.../jdbc/derby/testutils/DerbyDatabase.java | 57 +++++++++--------
.../connector/jdbc/h2/testutils/H2XaDatabase.java | 43 +++++++------
.../jdbc/testutils/DatabaseExtension.java | 66 ++++++++------------
.../connector/jdbc/testutils/DatabaseResource.java | 15 +++++
.../jdbc/testutils/resources/DockerResource.java | 61 +++++++++++++++++++
.../jdbc/testutils/resources/MemoryResource.java | 6 ++
.../jdbc/cratedb/testutils/CrateDBDatabase.java | 10 +--
.../connector/jdbc/db2/testutils/Db2Database.java | 10 +--
.../jdbc/mysql/testutils/MySqlDatabase.java | 10 +--
.../oceanbase/testutils/OceanBaseDatabase.java | 26 +++++---
.../jdbc/oracle/testutils/OracleDatabase.java | 10 +--
.../jdbc/postgres/testutils/PostgresDatabase.java | 11 ++--
.../jdbc/postgres/testutils/PostgresMetadata.java | 3 +-
.../sqlserver/testutils/SqlServerDatabase.java | 10 +--
.../jdbc/trino/testutils/TrinoDatabase.java | 71 ++++++++++++++--------
.../connector/jdbc/xa/JdbcXaSinkMigrationTest.java | 7 ++-
pom.xml | 1 -
18 files changed, 270 insertions(+), 155 deletions(-)
diff --git a/flink-connector-jdbc-core/pom.xml b/flink-connector-jdbc-core/pom.xml
index a7579845..851c1e07 100644
--- a/flink-connector-jdbc-core/pom.xml
+++ b/flink-connector-jdbc-core/pom.xml
@@ -158,6 +158,14 @@ under the License.
<scope>test</scope>
</dependency>
+ <!-- TestContainer dependencies -->
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>jdbc</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+
</dependencies>
<build>
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/testutils/DerbyDatabase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/testutils/DerbyDatabase.java
index b8a7439d..5c9e75ce 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/testutils/DerbyDatabase.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/testutils/DerbyDatabase.java
@@ -20,6 +20,8 @@ package org.apache.flink.connector.jdbc.derby.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
+import org.apache.flink.connector.jdbc.testutils.DatabaseResource;
+import org.apache.flink.connector.jdbc.testutils.resources.MemoryResource;
import org.apache.flink.util.FlinkRuntimeException;
import java.io.OutputStream;
@@ -36,39 +38,44 @@ public class DerbyDatabase extends DatabaseExtension {
public void write(int b) {}
};
- private static DerbyMetadata metadata;
+ private static final DerbyMetadata metadata = new DerbyMetadata("test");
public static DerbyMetadata getMetadata() {
- if (metadata == null) {
- metadata = new DerbyMetadata("test");
- }
return metadata;
}
@Override
- public DatabaseMetadata startDatabase() throws Exception {
- DatabaseMetadata metadata = getMetadata();
- try {
- System.setProperty(
- "derby.stream.error.field",
- DerbyDatabase.class.getCanonicalName() + ".DEV_NULL");
- Class.forName(metadata.getDriverClass());
- DriverManager.getConnection(String.format("%s;create=true", metadata.getJdbcUrl()))
- .close();
- } catch (Exception e) {
- throw new FlinkRuntimeException(e);
- }
- return metadata;
+ protected DatabaseMetadata getMetadataDB() {
+ return getMetadata();
}
@Override
- protected void stopDatabase() throws Exception {
- try {
- DriverManager.getConnection(String.format("%s;shutdown=true", metadata.getJdbcUrl()))
- .close();
- } catch (SQLException ignored) {
- } finally {
- metadata = null;
- }
+ protected DatabaseResource getResource() {
+ return new MemoryResource() {
+ @Override
+ public void start() {
+ try {
+ System.setProperty(
+ "derby.stream.error.field",
+ DerbyDatabase.class.getCanonicalName() + ".DEV_NULL");
+ Class.forName(metadata.getDriverClass());
+ DriverManager.getConnection(
+ String.format("%s;create=true", metadata.getJdbcUrl()))
+ .close();
+ } catch (Exception e) {
+ throw new FlinkRuntimeException(e);
+ }
+ }
+
+ @Override
+ public void stop() {
+ try {
+ DriverManager.getConnection(
+ String.format("%s;shutdown=true", metadata.getJdbcUrl()))
+ .close();
+ } catch (SQLException ignored) {
+ }
+ }
+ };
}
}
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils/H2XaDatabase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils/H2XaDatabase.java
index edca8ad0..6c37f69e 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils/H2XaDatabase.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/h2/testutils/H2XaDatabase.java
@@ -19,6 +19,8 @@ package org.apache.flink.connector.jdbc.h2.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
+import org.apache.flink.connector.jdbc.testutils.DatabaseResource;
+import org.apache.flink.connector.jdbc.testutils.resources.MemoryResource;
import org.apache.flink.util.FlinkRuntimeException;
import java.sql.DriverManager;
@@ -26,31 +28,36 @@ import java.sql.DriverManager;
/** H2 database for testing. */
public class H2XaDatabase extends DatabaseExtension {
- private static H2Metadata metadata;
+ private static final H2Metadata metadata = new H2Metadata("test");
public static H2Metadata getMetadata() {
- if (metadata == null) {
- metadata = new H2Metadata("test");
- }
return metadata;
}
@Override
- protected DatabaseMetadata startDatabase() throws Exception {
- DatabaseMetadata metadata = getMetadata();
- try {
- Class.forName(metadata.getDriverClass());
- DriverManager.getConnection(
- String.format(
- "%s;DB_CLOSE_DELAY=-1;INIT=CREATE SCHEMA IF NOT EXISTS %s\\;SET SCHEMA %s",
- metadata.getJdbcUrl(), "test", "test"))
- .close();
- } catch (Exception e) {
- throw new FlinkRuntimeException(e);
- }
- return metadata;
+ protected DatabaseMetadata getMetadataDB() {
+ return getMetadata();
}
@Override
- protected void stopDatabase() throws Exception {}
+ protected DatabaseResource getResource() {
+ return new MemoryResource() {
+ @Override
+ public void start() {
+ try {
+ Class.forName(metadata.getDriverClass());
+ DriverManager.getConnection(
+ String.format(
+ "%s;DB_CLOSE_DELAY=-1;INIT=CREATE SCHEMA IF NOT EXISTS %s\\;SET SCHEMA %s",
+ metadata.getJdbcUrl(), "test", "test"))
+ .close();
+ } catch (Exception e) {
+ throw new FlinkRuntimeException(e);
+ }
+ }
+
+ @Override
+ public void stop() {}
+ };
+ }
}
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseExtension.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseExtension.java
index 3cc73559..718b4f4f 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseExtension.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseExtension.java
@@ -35,42 +35,21 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.function.BiFunction;
+import java.util.function.Function;
import java.util.stream.Collectors;
import static org.junit.platform.commons.support.AnnotationSupport.findRepeatableAnnotations;
/** Database extension for testing. */
public abstract class DatabaseExtension
- implements BeforeAllCallback,
- AfterAllCallback,
- BeforeEachCallback,
- AfterEachCallback,
- ExtensionContext.Store.CloseableResource {
-
- /**
- * Database Lifecycle for testing. The goal it's that all database containers are create only
- * one time.
- */
- public enum Lifecycle {
- /** Database will be instantiated only one time. */
- PER_EXECUTION,
- /** Database will be instantiated by class. */
- PER_CLASS
- }
+ implements BeforeAllCallback, AfterAllCallback, BeforeEachCallback, AfterEachCallback {
- protected abstract DatabaseMetadata startDatabase() throws Exception;
+ protected abstract DatabaseMetadata getMetadataDB();
- protected abstract void stopDatabase() throws Exception;
+ protected abstract DatabaseResource getResource();
private final String uniqueKey = this.getClass().getSimpleName();
-
- protected Lifecycle getLifecycle() {
- return Lifecycle.PER_EXECUTION;
- }
-
- private ExtensionContext.Store getStore(ExtensionContext context) {
- return context.getRoot().getStore(Namespace.GLOBAL);
- }
+ private final String uniqueResource = String.format("%sResource", uniqueKey);
private DatabaseTest getDatabaseBaseTest(Class<?> clazz) throws Exception {
DatabaseTest dbClazz = null;
@@ -95,8 +74,7 @@ public abstract class DatabaseExtension
.filter(DatabaseTest.class::isAssignableFrom)
.ifPresent(
clazz -> {
- DatabaseMetadata metadata =
- getStore(context).get(uniqueKey, DatabaseMetadata.class);
+ DatabaseMetadata metadata = getMetadataDB();
if (metadata != null) {
try (Connection conn = metadata.getConnection()) {
for (TableManaged table :
@@ -132,15 +110,19 @@ public abstract class DatabaseExtension
return false;
}
+ private DatabaseResource getResource(ExtensionContext context) {
+ return context.getRoot()
+ .getStore(Namespace.GLOBAL)
+ .getOrComputeIfAbsent(uniqueResource, startResource(), DatabaseResource.class);
+ }
+
@Override
public final void beforeAll(ExtensionContext context) throws Exception {
if (ignoreTestDatabase(context)) {
return;
}
- if (getStore(context).get(uniqueKey) == null) {
- getStore(context).put(uniqueKey, startDatabase());
- }
+ getResource(context);
getManagedTables(context, TableManaged::createTable);
}
@@ -153,6 +135,7 @@ public abstract class DatabaseExtension
if (ignoreTestDatabase(context)) {
return;
}
+
getManagedTables(context, TableManaged::deleteTable);
}
@@ -161,18 +144,9 @@ public abstract class DatabaseExtension
if (ignoreTestDatabase(context)) {
return;
}
- getManagedTables(context, TableManaged::dropTable);
- if (Lifecycle.PER_CLASS == getLifecycle()) {
- stopDatabase();
- getStore(context).remove(uniqueKey, DatabaseMetadata.class);
- }
- }
- @Override
- public final void close() throws Throwable {
- if (Lifecycle.PER_EXECUTION == getLifecycle()) {
- stopDatabase();
- }
+ getManagedTables(context, TableManaged::dropTable);
+ getResource(context);
}
private Set<String> retrieveDatabaseExtensions(final ExtensionContext context) {
@@ -199,4 +173,12 @@ public abstract class DatabaseExtension
return retrieveExtensions.apply(context, new HashSet<>());
}
+
+ private Function<String, DatabaseResource> startResource() {
+ return s -> {
+ DatabaseResource resource = getResource();
+ resource.start();
+ return resource;
+ };
+ }
}
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseResource.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseResource.java
new file mode 100644
index 00000000..07e95617
--- /dev/null
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseResource.java
@@ -0,0 +1,15 @@
+package org.apache.flink.connector.jdbc.testutils;
+
+import org.junit.jupiter.api.extension.ExtensionContext.Store.CloseableResource;
+
+/** Database resource for testing. */
+public interface DatabaseResource extends CloseableResource {
+
+ void start();
+
+ void stop();
+
+ default void close() throws Throwable {
+ stop();
+ }
+}
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/resources/DockerResource.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/resources/DockerResource.java
new file mode 100644
index 00000000..8b721b12
--- /dev/null
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/resources/DockerResource.java
@@ -0,0 +1,61 @@
+package org.apache.flink.connector.jdbc.testutils.resources;
+
+import org.apache.flink.connector.jdbc.testutils.DatabaseResource;
+
+import com.github.dockerjava.api.DockerClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.JdbcDatabaseContainer;
+
+import java.util.Arrays;
+
+/** Docker based database resource. */
+public class DockerResource implements DatabaseResource {
+
+ protected static final Logger LOG = LoggerFactory.getLogger(DockerResource.class);
+
+ private final JdbcDatabaseContainer<?> container;
+
+ public DockerResource(JdbcDatabaseContainer<?> container) {
+ this.container = container;
+ }
+
+ @Override
+ public void start() {
+ this.container.start();
+ }
+
+ @Override
+ public void stop() {
+ this.container.stop();
+ }
+
+ @Override
+ public void close() throws Throwable {
+ stop();
+ cleanContainers(container);
+ }
+
+ public static void cleanContainers(GenericContainer<?> container) {
+ try {
+ DockerClient client = DockerClientFactory.instance().client();
+ // client.removeImageCmd(container.getDockerImageName()).exec();
+ client.listImagesCmd().exec().stream()
+ .filter(
+ image ->
+ Arrays.stream(image.getRepoTags())
+ .anyMatch(
+ tag ->
+ !tag.contains("testcontainers/ryuk")
+ && !tag.contains(
+ container
+ .getDockerImageName())))
+ .forEach(image -> client.removeImageCmd(image.getId()).exec());
+
+ } catch (Exception ignore) {
+ LOG.warn("Error deleting image.");
+ }
+ }
+}
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/resources/MemoryResource.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/resources/MemoryResource.java
new file mode 100644
index 00000000..2404bf44
--- /dev/null
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/resources/MemoryResource.java
@@ -0,0 +1,6 @@
+package org.apache.flink.connector.jdbc.testutils.resources;
+
+import org.apache.flink.connector.jdbc.testutils.DatabaseResource;
+
+/** Memory based database resource. */
+public interface MemoryResource extends DatabaseResource {}
diff --git a/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/testutils/CrateDBDatabase.java b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/testutils/CrateDBDatabase.java
index 50d3ae4c..08bf113f 100644
--- a/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/testutils/CrateDBDatabase.java
+++ b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/testutils/CrateDBDatabase.java
@@ -19,6 +19,8 @@ package org.apache.flink.connector.jdbc.cratedb.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
+import org.apache.flink.connector.jdbc.testutils.DatabaseResource;
+import org.apache.flink.connector.jdbc.testutils.resources.DockerResource;
import org.apache.flink.util.FlinkRuntimeException;
import org.testcontainers.containers.JdbcDatabaseContainer;
@@ -66,15 +68,13 @@ public class CrateDBDatabase extends DatabaseExtension implements CrateDBImages
}
@Override
- protected DatabaseMetadata startDatabase() throws Exception {
- CONTAINER.start();
+ protected DatabaseMetadata getMetadataDB() {
return getMetadata();
}
@Override
- protected void stopDatabase() throws Exception {
- CONTAINER.stop();
- metadata = null;
+ protected DatabaseResource getResource() {
+ return new DockerResource(CONTAINER);
}
/**
diff --git a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/testutils/Db2Database.java b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/testutils/Db2Database.java
index 24e75858..930dbdb1 100644
--- a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/testutils/Db2Database.java
+++ b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/testutils/Db2Database.java
@@ -20,6 +20,8 @@ package org.apache.flink.connector.jdbc.db2.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
+import org.apache.flink.connector.jdbc.testutils.DatabaseResource;
+import org.apache.flink.connector.jdbc.testutils.resources.DockerResource;
import org.apache.flink.util.FlinkRuntimeException;
import org.slf4j.Logger;
@@ -56,14 +58,12 @@ public class Db2Database extends DatabaseExtension implements Db2Images {
}
@Override
- protected DatabaseMetadata startDatabase() throws Exception {
- CONTAINER.start();
+ protected DatabaseMetadata getMetadataDB() {
return getMetadata();
}
@Override
- protected void stopDatabase() throws Exception {
- CONTAINER.stop();
- metadata = null;
+ protected DatabaseResource getResource() {
+ return new DockerResource(CONTAINER);
}
}
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySqlDatabase.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySqlDatabase.java
index 99195063..0b5e7908 100644
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySqlDatabase.java
+++ b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySqlDatabase.java
@@ -19,6 +19,8 @@ package org.apache.flink.connector.jdbc.mysql.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
+import org.apache.flink.connector.jdbc.testutils.DatabaseResource;
+import org.apache.flink.connector.jdbc.testutils.resources.DockerResource;
import org.apache.flink.util.FlinkRuntimeException;
import org.testcontainers.containers.MySQLContainer;
@@ -46,14 +48,12 @@ public class MySqlDatabase extends DatabaseExtension implements MySqlImages {
}
@Override
- protected DatabaseMetadata startDatabase() throws Exception {
- CONTAINER.start();
+ protected DatabaseMetadata getMetadataDB() {
return getMetadata();
}
@Override
- protected void stopDatabase() throws Exception {
- CONTAINER.stop();
- metadata = null;
+ protected DatabaseResource getResource() {
+ return new DockerResource(CONTAINER);
}
}
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseDatabase.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseDatabase.java
index 62279748..c07ad5c2 100644
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseDatabase.java
+++ b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseDatabase.java
@@ -20,6 +20,8 @@ package org.apache.flink.connector.jdbc.oceanbase.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
+import org.apache.flink.connector.jdbc.testutils.DatabaseResource;
+import org.apache.flink.connector.jdbc.testutils.resources.DockerResource;
import org.apache.flink.util.FlinkRuntimeException;
import org.slf4j.Logger;
@@ -28,6 +30,7 @@ import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.oceanbase.OceanBaseCEContainer;
import java.sql.Connection;
+import java.sql.SQLException;
import java.sql.Statement;
/** OceanBase database for testing. */
@@ -56,18 +59,23 @@ public class OceanBaseDatabase extends DatabaseExtension implements OceanBaseIma
}
@Override
- protected DatabaseMetadata startDatabase() throws Exception {
- CONTAINER.start();
- try (Connection connection = getMetadata().getConnection();
- Statement statement = connection.createStatement()) {
- statement.execute("SET GLOBAL time_zone = '+00:00'");
- }
+ protected DatabaseMetadata getMetadataDB() {
return getMetadata();
}
@Override
- protected void stopDatabase() throws Exception {
- CONTAINER.stop();
- metadata = null;
+ protected DatabaseResource getResource() {
+ return new DockerResource(CONTAINER) {
+ @Override
+ public void start() {
+ super.start();
+ try (Connection connection = getMetadata().getConnection();
+ Statement statement = connection.createStatement()) {
+ statement.execute("SET GLOBAL time_zone = '+00:00'");
+ } catch (SQLException e) {
+ throw new FlinkRuntimeException(e);
+ }
+ }
+ };
}
}
diff --git a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/testutils/OracleDatabase.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/testutils/OracleDatabase.java
index 37197292..c1a4e4f9 100644
--- a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/testutils/OracleDatabase.java
+++ b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/testutils/OracleDatabase.java
@@ -19,6 +19,8 @@ package org.apache.flink.connector.jdbc.oracle.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
+import org.apache.flink.connector.jdbc.testutils.DatabaseResource;
+import org.apache.flink.connector.jdbc.testutils.resources.DockerResource;
import org.apache.flink.util.FlinkRuntimeException;
import org.testcontainers.containers.OracleContainer;
@@ -45,14 +47,12 @@ public class OracleDatabase extends DatabaseExtension implements OracleImages {
}
@Override
- protected DatabaseMetadata startDatabase() throws Exception {
- CONTAINER.start();
+ protected DatabaseMetadata getMetadataDB() {
return getMetadata();
}
@Override
- protected void stopDatabase() throws Exception {
- CONTAINER.stop();
- metadata = null;
+ protected DatabaseResource getResource() {
+ return new DockerResource(CONTAINER);
}
}
diff --git a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils/PostgresDatabase.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils/PostgresDatabase.java
index 5b1700bd..0b871ec4 100644
--- a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils/PostgresDatabase.java
+++ b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils/PostgresDatabase.java
@@ -19,6 +19,8 @@ package org.apache.flink.connector.jdbc.postgres.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
+import org.apache.flink.connector.jdbc.testutils.DatabaseResource;
+import org.apache.flink.connector.jdbc.testutils.resources.DockerResource;
import org.apache.flink.util.FlinkRuntimeException;
import org.testcontainers.containers.PostgreSQLContainer;
@@ -44,16 +46,13 @@ public class PostgresDatabase extends DatabaseExtension implements PostgresImage
return metadata;
}
- @Override
- protected DatabaseMetadata startDatabase() throws Exception {
- CONTAINER.start();
+ protected DatabaseMetadata getMetadataDB() {
return getMetadata();
}
@Override
- protected void stopDatabase() throws Exception {
- CONTAINER.stop();
- metadata = null;
+ protected DatabaseResource getResource() {
+ return new DockerResource(CONTAINER);
}
/** {@link PostgreSQLContainer} with XA enabled (by setting max_prepared_transactions). */
diff --git a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils/PostgresMetadata.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils/PostgresMetadata.java
index 219f4961..2d083e05 100644
--- a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils/PostgresMetadata.java
+++ b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils/PostgresMetadata.java
@@ -20,6 +20,7 @@ package org.apache.flink.connector.jdbc.postgres.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
import org.postgresql.xa.PGXADataSource;
+import org.testcontainers.containers.JdbcDatabaseContainer;
import org.testcontainers.containers.PostgreSQLContainer;
import javax.sql.XADataSource;
@@ -38,7 +39,7 @@ public class PostgresMetadata implements DatabaseMetadata {
this(container, false);
}
- public PostgresMetadata(PostgreSQLContainer<?> container, boolean hasXaEnabled) {
+ public PostgresMetadata(JdbcDatabaseContainer<?> container, boolean hasXaEnabled) {
this.username = container.getUsername();
this.password = container.getPassword();
this.url = container.getJdbcUrl();
diff --git a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/testutils/SqlServerDatabase.java b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/testutils/SqlServerDatabase.java
index 7629fba5..ddb9fbd1 100644
--- a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/testutils/SqlServerDatabase.java
+++ b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/testutils/SqlServerDatabase.java
@@ -19,6 +19,8 @@ package org.apache.flink.connector.jdbc.sqlserver.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
+import org.apache.flink.connector.jdbc.testutils.DatabaseResource;
+import org.apache.flink.connector.jdbc.testutils.resources.DockerResource;
import org.apache.flink.util.ExceptionUtils;
import org.apache.flink.util.FlinkRuntimeException;
@@ -48,15 +50,13 @@ public class SqlServerDatabase extends DatabaseExtension implements SqlServerIma
}
@Override
- protected DatabaseMetadata startDatabase() throws Exception {
- CONTAINER.start();
+ protected DatabaseMetadata getMetadataDB() {
return getMetadata();
}
@Override
- protected void stopDatabase() throws Exception {
- CONTAINER.stop();
- metadata = null;
+ protected DatabaseResource getResource() {
+ return new DockerResource(CONTAINER);
}
/** {@link MSSQLServerContainer} with Xa. */
diff --git a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils/TrinoDatabase.java b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils/TrinoDatabase.java
index ba65a189..f56d3d48 100644
--- a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils/TrinoDatabase.java
+++ b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils/TrinoDatabase.java
@@ -22,6 +22,8 @@ import org.apache.flink.connector.jdbc.postgres.testutils.PostgresImages;
import org.apache.flink.connector.jdbc.postgres.testutils.PostgresMetadata;
import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
+import org.apache.flink.connector.jdbc.testutils.DatabaseResource;
+import org.apache.flink.connector.jdbc.testutils.resources.DockerResource;
import org.apache.flink.util.FlinkRuntimeException;
import org.testcontainers.containers.BindMode;
@@ -33,6 +35,7 @@ import org.testcontainers.containers.wait.strategy.Wait;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.util.Arrays;
/** A Trino database for testing. */
public class TrinoDatabase extends DatabaseExtension implements TrinoImages, PostgresImages {
@@ -75,34 +78,52 @@ public class TrinoDatabase extends DatabaseExtension implements TrinoImages, Pos
}
@Override
- protected DatabaseMetadata startDatabase() throws Exception {
- CONTAINER_DB.start();
-
- Path tempFile = Files.createTempFile(null, null);
- String postgresContent =
- "connector.name=postgresql\n"
- + String.format(
- "connection-url=jdbc:postgresql://%s:%s/test\n",
- CONTAINER_DB_ALIAS, CONTAINER_DB_PORT)
- + String.format("connection-user=%s\n", CONTAINER_DB.getUsername())
- + String.format("connection-password=%s\n", CONTAINER_DB.getPassword());
- Files.write(tempFile, postgresContent.getBytes(StandardCharsets.UTF_8));
-
- CONTAINER
- .withDatabaseName("postgres/public")
- .withFileSystemBind(
- tempFile.toFile().getAbsolutePath(),
- "/etc/trino/catalog/postgres.properties",
- BindMode.READ_WRITE)
- .waitingFor(Wait.forHttp("/ui/login.html").forStatusCode(200));
- CONTAINER.start();
+ protected DatabaseMetadata getMetadataDB() {
return getMetadata();
}
@Override
- protected void stopDatabase() throws Exception {
- CONTAINER.stop();
- CONTAINER_DB.stop();
- metadata = null;
+ protected DatabaseResource getResource() {
+ return new DatabaseResource() {
+ @Override
+ public void start() {
+ try {
+ CONTAINER_DB.start();
+
+ Path tempFile = Files.createTempFile(null, null);
+ String postgresContent =
+ "connector.name=postgresql\n"
+ + String.format(
+ "connection-url=jdbc:postgresql://%s:%s/test\n",
+ CONTAINER_DB_ALIAS, CONTAINER_DB_PORT)
+ + String.format(
+ "connection-user=%s\n", CONTAINER_DB.getUsername())
+ + String.format(
+ "connection-password=%s\n", CONTAINER_DB.getPassword());
+ Files.write(tempFile, postgresContent.getBytes(StandardCharsets.UTF_8));
+
+ CONTAINER
+ .withDatabaseName("postgres/public")
+ .withFileSystemBind(
+ tempFile.toFile().getAbsolutePath(),
+ "/etc/trino/catalog/postgres.properties",
+ BindMode.READ_WRITE)
+ .waitingFor(Wait.forHttp("/ui/login.html").forStatusCode(200));
+ CONTAINER.start();
+ } catch (Exception e) {
+ throw new FlinkRuntimeException(e);
+ }
+ }
+
+ @Override
+ public void stop() {
+ Arrays.asList(CONTAINER, CONTAINER_DB)
+ .forEach(
+ container -> {
+ container.stop();
+ DockerResource.cleanContainers(container);
+ });
+ }
+ };
}
}
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkMigrationTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkMigrationTest.java
index 3a4d4df4..5b4ac294 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkMigrationTest.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkMigrationTest.java
@@ -22,7 +22,7 @@ import org.apache.flink.configuration.Configuration;
import org.apache.flink.connector.jdbc.JdbcTestBase;
import org.apache.flink.connector.jdbc.JdbcTestFixture;
import org.apache.flink.connector.jdbc.JdbcTestFixture.TestEntry;
-import org.apache.flink.connector.jdbc.derby.testutils.DerbyDatabase;
+import org.apache.flink.connector.jdbc.derby.DerbyTestBase;
import org.apache.flink.runtime.checkpoint.OperatorSubtaskState;
import org.apache.flink.streaming.api.operators.StreamSink;
import org.apache.flink.streaming.util.OneInputStreamOperatorTestHarness;
@@ -52,7 +52,8 @@ import static org.apache.flink.streaming.util.OperatorSnapshotUtil.readStateHand
import static org.apache.flink.streaming.util.OperatorSnapshotUtil.writeStateHandle;
/** Tests state migration for {@link JdbcXaSinkFunction}. */
-class JdbcXaSinkMigrationTest extends JdbcTestBase {
+@Deprecated
+class JdbcXaSinkMigrationTest extends JdbcTestBase implements DerbyTestBase {
// write a snapshot:
// java <CLASS_NAME> <VERSION>
@@ -60,7 +61,7 @@ class JdbcXaSinkMigrationTest extends JdbcTestBase {
// mvn exec:java -Dexec.mainClass="<CLASS_NAME>" -Dexec.args='<VERSION>'
// -Dexec.classpathScope=test -Dexec.cleanupDaemonThreads=false
public static void main(String[] args) throws Exception {
- new DerbyDatabase().startDatabase();
+ // new DerbyDatabase();
JdbcXaSinkMigrationTest test = new JdbcXaSinkMigrationTest();
test.writeSnapshot(parseVersionArg(args));
}
diff --git a/pom.xml b/pom.xml
index fda0c842..fa8d4837 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,6 @@ under the License.
<slf4j.version>1.7.36</slf4j.version>
<log4j.version>2.17.2</log4j.version>
-
<flink.parent.artifactId>flink-connector-jdbc-parent</flink.parent.artifactId>
<!-- These 2 properties should be removed together with upgrade of flink-connector-parent to 1.1.x -->
<flink.surefire.baseArgLine>-XX:+UseG1GC -Xms256m -XX:+IgnoreUnrecognizedVMOptions ${surefire.module.config}</flink.surefire.baseArgLine>
(flink-connector-jdbc) 10/14: [FLINK-35494] Reorganize sources
Posted by fa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git
commit 231542bbdbe96ecd3bfcc3f6c2f4c8aa2bc56306
Author: Joao Boto <bo...@boto.pro>
AuthorDate: Mon Jul 8 16:14:38 2024 +0200
[FLINK-35494] Reorganize sources
---
.../flink/connector/jdbc/JdbcInputFormat.java | 7 +++--
.../flink/connector/jdbc/core/datastream/Jdbc.java | 7 +++++
.../{ => core/datastream}/source/JdbcSource.java | 20 ++++++-------
.../datastream}/source/JdbcSourceBuilder.java | 29 ++++++++----------
.../datastream}/source/JdbcSourceOptions.java | 2 +-
.../enumerator/JdbcSourceEnumStateSerializer.java | 6 ++--
.../source/enumerator/JdbcSourceEnumerator.java | 4 +--
.../enumerator/JdbcSourceEnumeratorState.java | 4 +--
.../enumerator/JdbcSqlSplitEnumeratorBase.java | 4 +--
.../enumerator/SqlTemplateSplitEnumerator.java | 6 ++--
.../source/reader/JdbcRecordEmitter.java | 6 ++--
.../source/reader/JdbcSourceReader.java | 6 ++--
.../source/reader/JdbcSourceSplitReader.java | 16 +++++-----
.../datastream}/source/reader/RecordAndOffset.java | 4 +--
.../source/reader/extractor/ResultExtractor.java | 2 +-
.../reader/extractor/RowResultExtractor.java | 2 +-
.../source/split/CheckpointedOffset.java | 2 +-
.../datastream}/source/split/JdbcSourceSplit.java | 2 +-
.../source/split/JdbcSourceSplitSerializer.java | 2 +-
.../source/split/JdbcSourceSplitState.java | 2 +-
.../jdbc/table/RowDataResultExtractor.java | 2 +-
.../reader/splitreader/TestingSplitsChange.java | 2 +-
.../flink/connector/jdbc/JdbcDataTestBase.java | 2 +-
.../datastream}/source/JdbcSourceBuilderTest.java | 12 ++++----
.../datastream}/source/JdbcSourceITCase.java | 7 +++--
.../source/JdbcSourceStreamRelatedITCase.java | 9 ++++--
.../JdbcSourceEnumStateSerializerTest.java | 13 +++++----
.../enumerator/JdbcSourceEnumeratorTest.java | 11 ++++---
.../source/reader/JdbcSourceReaderTest.java | 10 ++++---
.../source/reader/JdbcSourceSplitReaderTest.java | 11 ++++---
.../split/JdbcSourceSplitSerializerTest.java | 7 +++--
.../flink/connector/jdbc/source/JdbcSource.java | 25 +++++++++-------
.../connector/jdbc/source/JdbcSourceBuilder.java | 33 ++++++++++-----------
.../source/reader/extractor/ResultExtractor.java | 34 +++++-----------------
34 files changed, 159 insertions(+), 152 deletions(-)
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/JdbcInputFormat.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/JdbcInputFormat.java
index 20e1a2c7..dacf3c6c 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/JdbcInputFormat.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/JdbcInputFormat.java
@@ -27,6 +27,8 @@ import org.apache.flink.api.common.io.statistics.BaseStatistics;
import org.apache.flink.api.java.typeutils.ResultTypeQueryable;
import org.apache.flink.api.java.typeutils.RowTypeInfo;
import org.apache.flink.configuration.Configuration;
+import org.apache.flink.connector.jdbc.core.datastream.source.JdbcSource;
+import org.apache.flink.connector.jdbc.core.datastream.source.JdbcSourceBuilder;
import org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider;
import org.apache.flink.connector.jdbc.datasource.connections.SimpleJdbcConnectionProvider;
import org.apache.flink.connector.jdbc.split.JdbcParameterValuesProvider;
@@ -99,9 +101,8 @@ import java.util.Arrays;
* @see JdbcParameterValuesProvider
* @see PreparedStatement
* @see DriverManager
- * @deprecated Please use {@link org.apache.flink.connector.jdbc.source.JdbcSource} instead. The
- * builder utils and parameters passing could be view {@link
- * org.apache.flink.connector.jdbc.source.JdbcSourceBuilder}.
+ * @deprecated Please use {@link JdbcSource} instead. The builder utils and parameters passing could
+ * be view {@link JdbcSourceBuilder}.
*/
@Deprecated
@Experimental
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/Jdbc.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/Jdbc.java
index 2e09c5f4..433a2626 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/Jdbc.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/Jdbc.java
@@ -20,11 +20,18 @@ package org.apache.flink.connector.jdbc.core.datastream;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.connector.jdbc.core.datastream.sink.JdbcSink;
import org.apache.flink.connector.jdbc.core.datastream.sink.JdbcSinkBuilder;
+import org.apache.flink.connector.jdbc.core.datastream.source.JdbcSource;
+import org.apache.flink.connector.jdbc.core.datastream.source.JdbcSourceBuilder;
/** Facade to create JDBC stream sources and sinks. */
@PublicEvolving
public class Jdbc {
+ /** Create a JDBC source builder. */
+ public static <OUT> JdbcSourceBuilder<OUT> sourceBuilder() {
+ return JdbcSource.builder();
+ }
+
/** Create a JDBC sink builder. */
public static <IN> JdbcSinkBuilder<IN> sinkBuilder() {
return JdbcSink.builder();
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSource.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/JdbcSource.java
similarity index 89%
copy from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSource.java
copy to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/JdbcSource.java
index 08e4a777..eef58c07 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSource.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/JdbcSource.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source;
+package org.apache.flink.connector.jdbc.core.datastream.source;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.annotation.VisibleForTesting;
@@ -30,16 +30,16 @@ import org.apache.flink.api.connector.source.SplitEnumeratorContext;
import org.apache.flink.api.java.typeutils.ResultTypeQueryable;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.connector.base.DeliveryGuarantee;
+import org.apache.flink.connector.jdbc.core.datastream.source.enumerator.JdbcSourceEnumStateSerializer;
+import org.apache.flink.connector.jdbc.core.datastream.source.enumerator.JdbcSourceEnumerator;
+import org.apache.flink.connector.jdbc.core.datastream.source.enumerator.JdbcSourceEnumeratorState;
+import org.apache.flink.connector.jdbc.core.datastream.source.enumerator.JdbcSqlSplitEnumeratorBase;
+import org.apache.flink.connector.jdbc.core.datastream.source.reader.JdbcSourceReader;
+import org.apache.flink.connector.jdbc.core.datastream.source.reader.JdbcSourceSplitReader;
+import org.apache.flink.connector.jdbc.core.datastream.source.reader.extractor.ResultExtractor;
+import org.apache.flink.connector.jdbc.core.datastream.source.split.JdbcSourceSplit;
+import org.apache.flink.connector.jdbc.core.datastream.source.split.JdbcSourceSplitSerializer;
import org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider;
-import org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumStateSerializer;
-import org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumerator;
-import org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumeratorState;
-import org.apache.flink.connector.jdbc.source.enumerator.JdbcSqlSplitEnumeratorBase;
-import org.apache.flink.connector.jdbc.source.reader.JdbcSourceReader;
-import org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader;
-import org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor;
-import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit;
-import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplitSerializer;
import org.apache.flink.connector.jdbc.utils.ContinuousUnBoundingSettings;
import org.apache.flink.core.io.SimpleVersionedSerializer;
import org.apache.flink.util.Preconditions;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceBuilder.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/JdbcSourceBuilder.java
similarity index 91%
copy from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceBuilder.java
copy to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/JdbcSourceBuilder.java
index 8d52f7ac..451082a0 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceBuilder.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/JdbcSourceBuilder.java
@@ -16,17 +16,17 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source;
+package org.apache.flink.connector.jdbc.core.datastream.source;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.connector.base.DeliveryGuarantee;
import org.apache.flink.connector.jdbc.JdbcConnectionOptions;
+import org.apache.flink.connector.jdbc.core.datastream.source.enumerator.SqlTemplateSplitEnumerator;
+import org.apache.flink.connector.jdbc.core.datastream.source.reader.extractor.ResultExtractor;
import org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider;
import org.apache.flink.connector.jdbc.datasource.connections.SimpleJdbcConnectionProvider;
-import org.apache.flink.connector.jdbc.source.enumerator.SqlTemplateSplitEnumerator;
-import org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor;
import org.apache.flink.connector.jdbc.split.JdbcParameterValuesProvider;
import org.apache.flink.connector.jdbc.split.JdbcSlideTimingParameterProvider;
import org.apache.flink.connector.jdbc.utils.ContinuousUnBoundingSettings;
@@ -46,12 +46,6 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Objects;
-import static org.apache.flink.connector.jdbc.source.JdbcSourceOptions.AUTO_COMMIT;
-import static org.apache.flink.connector.jdbc.source.JdbcSourceOptions.READER_FETCH_BATCH_SIZE;
-import static org.apache.flink.connector.jdbc.source.JdbcSourceOptions.RESULTSET_CONCURRENCY;
-import static org.apache.flink.connector.jdbc.source.JdbcSourceOptions.RESULTSET_FETCH_SIZE;
-import static org.apache.flink.connector.jdbc.source.JdbcSourceOptions.RESULTSET_TYPE;
-
/**
* A tool is used to build {@link JdbcSource} quickly.
*
@@ -130,9 +124,9 @@ public class JdbcSourceBuilder<OUT> {
JdbcSourceBuilder() {
this.configuration = new Configuration();
this.connOptionsBuilder = new JdbcConnectionOptions.JdbcConnectionOptionsBuilder();
- this.splitReaderFetchBatchSize = READER_FETCH_BATCH_SIZE.defaultValue();
- this.resultSetType = RESULTSET_TYPE.defaultValue();
- this.resultSetConcurrency = RESULTSET_CONCURRENCY.defaultValue();
+ this.splitReaderFetchBatchSize = JdbcSourceOptions.READER_FETCH_BATCH_SIZE.defaultValue();
+ this.resultSetType = JdbcSourceOptions.RESULTSET_TYPE.defaultValue();
+ this.resultSetConcurrency = JdbcSourceOptions.RESULTSET_CONCURRENCY.defaultValue();
this.deliveryGuarantee = DeliveryGuarantee.NONE;
// Boolean to distinguish between default value and explicitly set autoCommit mode.
this.autoCommit = true;
@@ -275,7 +269,7 @@ public class JdbcSourceBuilder<OUT> {
public JdbcSource<OUT> build() {
this.connectionProvider = new SimpleJdbcConnectionProvider(connOptionsBuilder.build());
if (resultSetFetchSize > 0) {
- this.configuration.set(RESULTSET_FETCH_SIZE, resultSetFetchSize);
+ this.configuration.set(JdbcSourceOptions.RESULTSET_FETCH_SIZE, resultSetFetchSize);
}
if (deliveryGuarantee == DeliveryGuarantee.EXACTLY_ONCE) {
@@ -286,10 +280,11 @@ public class JdbcSourceBuilder<OUT> {
DeliveryGuarantee.EXACTLY_ONCE);
}
- this.configuration.set(RESULTSET_CONCURRENCY, resultSetConcurrency);
- this.configuration.set(RESULTSET_TYPE, resultSetType);
- this.configuration.set(READER_FETCH_BATCH_SIZE, splitReaderFetchBatchSize);
- this.configuration.set(AUTO_COMMIT, autoCommit);
+ this.configuration.set(JdbcSourceOptions.RESULTSET_CONCURRENCY, resultSetConcurrency);
+ this.configuration.set(JdbcSourceOptions.RESULTSET_TYPE, resultSetType);
+ this.configuration.set(
+ JdbcSourceOptions.READER_FETCH_BATCH_SIZE, splitReaderFetchBatchSize);
+ this.configuration.set(JdbcSourceOptions.AUTO_COMMIT, autoCommit);
Preconditions.checkState(
!StringUtils.isNullOrWhitespaceOnly(sql), "'sql' mustn't be null or empty.");
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceOptions.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/JdbcSourceOptions.java
similarity index 97%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceOptions.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/JdbcSourceOptions.java
index c83ad7b5..294be051 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceOptions.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/JdbcSourceOptions.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source;
+package org.apache.flink.connector.jdbc.core.datastream.source;
import org.apache.flink.configuration.ConfigOption;
import org.apache.flink.configuration.ConfigOptions;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumStateSerializer.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/enumerator/JdbcSourceEnumStateSerializer.java
similarity index 94%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumStateSerializer.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/enumerator/JdbcSourceEnumStateSerializer.java
index 2d2283ac..2be1deb1 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumStateSerializer.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/enumerator/JdbcSourceEnumStateSerializer.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source.enumerator;
+package org.apache.flink.connector.jdbc.core.datastream.source.enumerator;
-import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit;
-import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplitSerializer;
+import org.apache.flink.connector.jdbc.core.datastream.source.split.JdbcSourceSplit;
+import org.apache.flink.connector.jdbc.core.datastream.source.split.JdbcSourceSplitSerializer;
import org.apache.flink.core.io.SimpleVersionedSerializer;
import org.apache.flink.util.InstantiationUtil;
import org.apache.flink.util.Preconditions;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumerator.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/enumerator/JdbcSourceEnumerator.java
similarity index 98%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumerator.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/enumerator/JdbcSourceEnumerator.java
index a26905fc..9ebf389a 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumerator.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/enumerator/JdbcSourceEnumerator.java
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source.enumerator;
+package org.apache.flink.connector.jdbc.core.datastream.source.enumerator;
import org.apache.flink.api.connector.source.Boundedness;
import org.apache.flink.api.connector.source.SourceEvent;
import org.apache.flink.api.connector.source.SplitEnumerator;
import org.apache.flink.api.connector.source.SplitEnumeratorContext;
-import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit;
+import org.apache.flink.connector.jdbc.core.datastream.source.split.JdbcSourceSplit;
import org.apache.flink.connector.jdbc.utils.ContinuousUnBoundingSettings;
import org.apache.flink.util.Preconditions;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumeratorState.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/enumerator/JdbcSourceEnumeratorState.java
similarity index 95%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumeratorState.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/enumerator/JdbcSourceEnumeratorState.java
index 2cd3903c..1c7d5ad4 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumeratorState.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/enumerator/JdbcSourceEnumeratorState.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source.enumerator;
+package org.apache.flink.connector.jdbc.core.datastream.source.enumerator;
import org.apache.flink.annotation.PublicEvolving;
-import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit;
+import org.apache.flink.connector.jdbc.core.datastream.source.split.JdbcSourceSplit;
import org.apache.flink.util.Preconditions;
import javax.annotation.Nonnull;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSqlSplitEnumeratorBase.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/enumerator/JdbcSqlSplitEnumeratorBase.java
similarity index 95%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSqlSplitEnumeratorBase.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/enumerator/JdbcSqlSplitEnumeratorBase.java
index 25d09a71..dd3eb34b 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSqlSplitEnumeratorBase.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/enumerator/JdbcSqlSplitEnumeratorBase.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source.enumerator;
+package org.apache.flink.connector.jdbc.core.datastream.source.enumerator;
import org.apache.flink.annotation.PublicEvolving;
-import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit;
+import org.apache.flink.connector.jdbc.core.datastream.source.split.JdbcSourceSplit;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/SqlTemplateSplitEnumerator.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/enumerator/SqlTemplateSplitEnumerator.java
similarity index 95%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/SqlTemplateSplitEnumerator.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/enumerator/SqlTemplateSplitEnumerator.java
index 2099d0e0..b4565d95 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/SqlTemplateSplitEnumerator.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/enumerator/SqlTemplateSplitEnumerator.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source.enumerator;
+package org.apache.flink.connector.jdbc.core.datastream.source.enumerator;
import org.apache.flink.annotation.VisibleForTesting;
-import org.apache.flink.connector.jdbc.source.split.CheckpointedOffset;
-import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit;
+import org.apache.flink.connector.jdbc.core.datastream.source.split.CheckpointedOffset;
+import org.apache.flink.connector.jdbc.core.datastream.source.split.JdbcSourceSplit;
import org.apache.flink.connector.jdbc.split.JdbcParameterValuesProvider;
import org.apache.flink.util.Preconditions;
import org.apache.flink.util.StringUtils;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/JdbcRecordEmitter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/reader/JdbcRecordEmitter.java
similarity index 86%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/JdbcRecordEmitter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/reader/JdbcRecordEmitter.java
index 803f7f3c..d707c68d 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/JdbcRecordEmitter.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/reader/JdbcRecordEmitter.java
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source.reader;
+package org.apache.flink.connector.jdbc.core.datastream.source.reader;
import org.apache.flink.api.connector.source.SourceOutput;
import org.apache.flink.connector.base.source.reader.RecordEmitter;
-import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit;
-import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplitState;
+import org.apache.flink.connector.jdbc.core.datastream.source.split.JdbcSourceSplit;
+import org.apache.flink.connector.jdbc.core.datastream.source.split.JdbcSourceSplitState;
/**
* The JDBC resorce emitter.
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceReader.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/reader/JdbcSourceReader.java
similarity index 91%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceReader.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/reader/JdbcSourceReader.java
index 7d94d271..3a5edeb7 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceReader.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/reader/JdbcSourceReader.java
@@ -16,14 +16,14 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source.reader;
+package org.apache.flink.connector.jdbc.core.datastream.source.reader;
import org.apache.flink.api.connector.source.SourceReaderContext;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.connector.base.source.reader.SingleThreadMultiplexSourceReaderBase;
import org.apache.flink.connector.base.source.reader.splitreader.SplitReader;
-import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit;
-import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplitState;
+import org.apache.flink.connector.jdbc.core.datastream.source.split.JdbcSourceSplit;
+import org.apache.flink.connector.jdbc.core.datastream.source.split.JdbcSourceSplitState;
import java.util.Map;
import java.util.function.Supplier;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceSplitReader.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/reader/JdbcSourceSplitReader.java
similarity index 94%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceSplitReader.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/reader/JdbcSourceSplitReader.java
index 5011f42b..7e1af42d 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceSplitReader.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/reader/JdbcSourceSplitReader.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source.reader;
+package org.apache.flink.connector.jdbc.core.datastream.source.reader;
import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.api.common.typeinfo.TypeInformation;
@@ -29,9 +29,9 @@ import org.apache.flink.connector.base.source.reader.RecordsWithSplitIds;
import org.apache.flink.connector.base.source.reader.splitreader.SplitReader;
import org.apache.flink.connector.base.source.reader.splitreader.SplitsAddition;
import org.apache.flink.connector.base.source.reader.splitreader.SplitsChange;
+import org.apache.flink.connector.jdbc.core.datastream.source.reader.extractor.ResultExtractor;
+import org.apache.flink.connector.jdbc.core.datastream.source.split.JdbcSourceSplit;
import org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider;
-import org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor;
-import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit;
import org.apache.flink.util.Preconditions;
import org.slf4j.Logger;
@@ -51,11 +51,11 @@ import java.util.List;
import java.util.Objects;
import java.util.Queue;
-import static org.apache.flink.connector.jdbc.source.JdbcSourceOptions.AUTO_COMMIT;
-import static org.apache.flink.connector.jdbc.source.JdbcSourceOptions.READER_FETCH_BATCH_SIZE;
-import static org.apache.flink.connector.jdbc.source.JdbcSourceOptions.RESULTSET_CONCURRENCY;
-import static org.apache.flink.connector.jdbc.source.JdbcSourceOptions.RESULTSET_FETCH_SIZE;
-import static org.apache.flink.connector.jdbc.source.JdbcSourceOptions.RESULTSET_TYPE;
+import static org.apache.flink.connector.jdbc.core.datastream.source.JdbcSourceOptions.AUTO_COMMIT;
+import static org.apache.flink.connector.jdbc.core.datastream.source.JdbcSourceOptions.READER_FETCH_BATCH_SIZE;
+import static org.apache.flink.connector.jdbc.core.datastream.source.JdbcSourceOptions.RESULTSET_CONCURRENCY;
+import static org.apache.flink.connector.jdbc.core.datastream.source.JdbcSourceOptions.RESULTSET_FETCH_SIZE;
+import static org.apache.flink.connector.jdbc.core.datastream.source.JdbcSourceOptions.RESULTSET_TYPE;
/**
* The JDBC source reader to read data from jdbc splits.
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/RecordAndOffset.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/reader/RecordAndOffset.java
similarity index 91%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/RecordAndOffset.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/reader/RecordAndOffset.java
index eaf0981b..9b0d2861 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/RecordAndOffset.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/reader/RecordAndOffset.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source.reader;
+package org.apache.flink.connector.jdbc.core.datastream.source.reader;
-import org.apache.flink.connector.jdbc.source.split.CheckpointedOffset;
+import org.apache.flink.connector.jdbc.core.datastream.source.split.CheckpointedOffset;
/**
* Util class to represent the record with the corresponding information.
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/ResultExtractor.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/reader/extractor/ResultExtractor.java
similarity index 95%
copy from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/ResultExtractor.java
copy to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/reader/extractor/ResultExtractor.java
index 19bd6672..5a2a0e7b 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/ResultExtractor.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/reader/extractor/ResultExtractor.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source.reader.extractor;
+package org.apache.flink.connector.jdbc.core.datastream.source.reader.extractor;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.types.Row;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/RowResultExtractor.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/reader/extractor/RowResultExtractor.java
similarity index 94%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/RowResultExtractor.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/reader/extractor/RowResultExtractor.java
index 6b0d414e..cc050acc 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/RowResultExtractor.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/reader/extractor/RowResultExtractor.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source.reader.extractor;
+package org.apache.flink.connector.jdbc.core.datastream.source.reader.extractor;
import org.apache.flink.types.Row;
import org.apache.flink.util.Preconditions;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/split/CheckpointedOffset.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/split/CheckpointedOffset.java
similarity index 97%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/split/CheckpointedOffset.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/split/CheckpointedOffset.java
index e6fa7572..b49a2b22 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/split/CheckpointedOffset.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/split/CheckpointedOffset.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source.split;
+package org.apache.flink.connector.jdbc.core.datastream.source.split;
import org.apache.flink.annotation.PublicEvolving;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplit.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/split/JdbcSourceSplit.java
similarity index 98%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplit.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/split/JdbcSourceSplit.java
index 7a690ca9..f57169ba 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplit.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/split/JdbcSourceSplit.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source.split;
+package org.apache.flink.connector.jdbc.core.datastream.source.split;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.api.connector.source.SourceSplit;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplitSerializer.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/split/JdbcSourceSplitSerializer.java
similarity index 98%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplitSerializer.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/split/JdbcSourceSplitSerializer.java
index 3f6afb6e..86775fbf 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplitSerializer.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/split/JdbcSourceSplitSerializer.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source.split;
+package org.apache.flink.connector.jdbc.core.datastream.source.split;
import org.apache.flink.core.io.SimpleVersionedSerializer;
import org.apache.flink.util.InstantiationUtil;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplitState.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/split/JdbcSourceSplitState.java
similarity index 98%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplitState.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/split/JdbcSourceSplitState.java
index 2e3b2c3d..98d523b2 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplitState.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/split/JdbcSourceSplitState.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source.split;
+package org.apache.flink.connector.jdbc.core.datastream.source.split;
import org.apache.flink.util.FlinkRuntimeException;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/RowDataResultExtractor.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/RowDataResultExtractor.java
index 2bb65b80..534f4921 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/RowDataResultExtractor.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/RowDataResultExtractor.java
@@ -19,7 +19,7 @@
package org.apache.flink.connector.jdbc.table;
import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectConverter;
-import org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor;
+import org.apache.flink.connector.jdbc.core.datastream.source.reader.extractor.ResultExtractor;
import org.apache.flink.table.data.RowData;
import org.apache.flink.util.Preconditions;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/base/source/reader/splitreader/TestingSplitsChange.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/base/source/reader/splitreader/TestingSplitsChange.java
index 97d2f7dd..962cdd81 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/base/source/reader/splitreader/TestingSplitsChange.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/base/source/reader/splitreader/TestingSplitsChange.java
@@ -18,7 +18,7 @@
package org.apache.flink.connector.base.source.reader.splitreader;
-import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit;
+import org.apache.flink.connector.jdbc.core.datastream.source.split.JdbcSourceSplit;
import java.util.List;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcDataTestBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcDataTestBase.java
index d61100ef..808c7124 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcDataTestBase.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcDataTestBase.java
@@ -17,8 +17,8 @@
package org.apache.flink.connector.jdbc;
+import org.apache.flink.connector.jdbc.core.datastream.source.reader.extractor.ResultExtractor;
import org.apache.flink.connector.jdbc.derby.testutils.DerbyMetadata;
-import org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor;
import org.apache.flink.table.data.GenericRowData;
import org.apache.flink.table.data.RowData;
import org.apache.flink.table.data.StringData;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceBuilderTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/source/JdbcSourceBuilderTest.java
similarity index 93%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceBuilderTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/source/JdbcSourceBuilderTest.java
index a760749a..36130033 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceBuilderTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/source/JdbcSourceBuilderTest.java
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source;
+package org.apache.flink.connector.jdbc.core.datastream.source;
import org.apache.flink.api.common.typeinfo.TypeHint;
import org.apache.flink.api.common.typeinfo.TypeInformation;
-import org.apache.flink.connector.jdbc.source.enumerator.SqlTemplateSplitEnumerator;
-import org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor;
+import org.apache.flink.connector.jdbc.core.datastream.source.enumerator.SqlTemplateSplitEnumerator;
+import org.apache.flink.connector.jdbc.core.datastream.source.reader.extractor.ResultExtractor;
import org.apache.flink.connector.jdbc.split.JdbcGenericParameterValuesProvider;
import org.apache.flink.connector.jdbc.split.JdbcNumericBetweenParametersProvider;
import org.apache.flink.connector.jdbc.split.JdbcParameterValuesProvider;
@@ -34,12 +34,12 @@ import org.junit.jupiter.api.Test;
import java.io.Serializable;
import java.time.Duration;
-import static org.apache.flink.connector.jdbc.source.JdbcSourceOptions.READER_FETCH_BATCH_SIZE;
-import static org.apache.flink.connector.jdbc.source.JdbcSourceOptions.RESULTSET_FETCH_SIZE;
+import static org.apache.flink.connector.jdbc.core.datastream.source.JdbcSourceOptions.READER_FETCH_BATCH_SIZE;
+import static org.apache.flink.connector.jdbc.core.datastream.source.JdbcSourceOptions.RESULTSET_FETCH_SIZE;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-/** Test for {@link JdbcSourceBuilder}. */
+/** Test for {@link org.apache.flink.connector.jdbc.core.datastream.source.JdbcSourceBuilder}. */
class JdbcSourceBuilderTest {
private final String emptySql = "";
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/source/JdbcSourceITCase.java
similarity index 97%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/source/JdbcSourceITCase.java
index 845cfde5..2021094e 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceITCase.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/source/JdbcSourceITCase.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source;
+package org.apache.flink.connector.jdbc.core.datastream.source;
import org.apache.flink.api.common.eventtime.WatermarkStrategy;
import org.apache.flink.api.common.restartstrategy.RestartStrategies;
@@ -39,7 +39,10 @@ import static org.apache.flink.connector.jdbc.JdbcTestFixture.TEST_DATA;
import static org.apache.flink.connector.jdbc.JdbcTestFixture.TestEntry;
import static org.assertj.core.api.Assertions.assertThat;
-/** The Integration test for {@link JdbcSource}. */
+/**
+ * The Integration test for {@link
+ * org.apache.flink.connector.jdbc.core.datastream.source.JdbcSource}.
+ */
class JdbcSourceITCase extends JdbcDataTestBase implements JdbcITCaseBase {
public static Queue<TestEntry> collectedRecords;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceStreamRelatedITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/source/JdbcSourceStreamRelatedITCase.java
similarity index 98%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceStreamRelatedITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/source/JdbcSourceStreamRelatedITCase.java
index 2be8b404..445f6ba9 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceStreamRelatedITCase.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/source/JdbcSourceStreamRelatedITCase.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source;
+package org.apache.flink.connector.jdbc.core.datastream.source;
import org.apache.flink.api.common.JobID;
import org.apache.flink.api.common.eventtime.WatermarkStrategy;
@@ -27,8 +27,8 @@ import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.client.program.ClusterClient;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.connector.base.DeliveryGuarantee;
+import org.apache.flink.connector.jdbc.core.datastream.source.reader.extractor.ResultExtractor;
import org.apache.flink.connector.jdbc.derby.DerbyTestBase;
-import org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor;
import org.apache.flink.connector.jdbc.split.JdbcSlideTimingParameterProvider;
import org.apache.flink.connector.jdbc.testutils.JdbcITCaseBase;
import org.apache.flink.connector.jdbc.utils.ContinuousUnBoundingSettings;
@@ -65,7 +65,10 @@ import java.util.function.Supplier;
import static org.apache.flink.runtime.jobgraph.tasks.CheckpointCoordinatorConfiguration.MINIMAL_CHECKPOINT_TIME;
import static org.assertj.core.api.Assertions.assertThat;
-/** Test for streaming semantic related cases of {@link JdbcSource}. */
+/**
+ * Test for streaming semantic related cases of {@link
+ * org.apache.flink.connector.jdbc.core.datastream.source.JdbcSource}.
+ */
class JdbcSourceStreamRelatedITCase implements DerbyTestBase, JdbcITCaseBase {
private static final long ONE_SECOND = Duration.ofSeconds(1L).toMillis();
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumStateSerializerTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/source/enumerator/JdbcSourceEnumStateSerializerTest.java
similarity index 88%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumStateSerializerTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/source/enumerator/JdbcSourceEnumStateSerializerTest.java
index ce7548d2..6bc9cee7 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumStateSerializerTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/source/enumerator/JdbcSourceEnumStateSerializerTest.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source.enumerator;
+package org.apache.flink.connector.jdbc.core.datastream.source.enumerator;
-import org.apache.flink.connector.jdbc.source.split.CheckpointedOffset;
-import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit;
-import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplitSerializer;
+import org.apache.flink.connector.jdbc.core.datastream.source.split.CheckpointedOffset;
+import org.apache.flink.connector.jdbc.core.datastream.source.split.JdbcSourceSplit;
+import org.apache.flink.connector.jdbc.core.datastream.source.split.JdbcSourceSplitSerializer;
import org.junit.jupiter.api.Test;
@@ -32,7 +32,10 @@ import java.util.Random;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-/** Test for {@link JdbcSourceEnumStateSerializer}. */
+/**
+ * Test for {@link
+ * org.apache.flink.connector.jdbc.core.datastream.source.enumerator.JdbcSourceEnumStateSerializer}.
+ */
class JdbcSourceEnumStateSerializerTest {
private final JdbcSourceEnumeratorState state =
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumeratorTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/source/enumerator/JdbcSourceEnumeratorTest.java
similarity index 91%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumeratorTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/source/enumerator/JdbcSourceEnumeratorTest.java
index 443fb05b..268fb73f 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumeratorTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/source/enumerator/JdbcSourceEnumeratorTest.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source.enumerator;
+package org.apache.flink.connector.jdbc.core.datastream.source.enumerator;
import org.apache.flink.api.connector.source.SplitEnumeratorContext;
-import org.apache.flink.connector.jdbc.source.split.CheckpointedOffset;
-import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit;
+import org.apache.flink.connector.jdbc.core.datastream.source.split.CheckpointedOffset;
+import org.apache.flink.connector.jdbc.core.datastream.source.split.JdbcSourceSplit;
import org.apache.flink.connector.testutils.source.reader.TestingSplitEnumeratorContext;
import org.junit.jupiter.api.BeforeEach;
@@ -38,7 +38,10 @@ import java.util.stream.Collectors;
import static org.assertj.core.api.Assertions.assertThat;
-/** Test for {@link JdbcSourceEnumerator}. */
+/**
+ * Test for {@link
+ * org.apache.flink.connector.jdbc.core.datastream.source.enumerator.JdbcSourceEnumerator}.
+ */
class JdbcSourceEnumeratorTest {
private static long splitId = 1L;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceReaderTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/source/reader/JdbcSourceReaderTest.java
similarity index 90%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceReaderTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/source/reader/JdbcSourceReaderTest.java
index f549869f..ab6cc327 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceReaderTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/source/reader/JdbcSourceReaderTest.java
@@ -16,16 +16,16 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source.reader;
+package org.apache.flink.connector.jdbc.core.datastream.source.reader;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.connector.base.DeliveryGuarantee;
import org.apache.flink.connector.jdbc.JdbcConnectionOptions;
import org.apache.flink.connector.jdbc.JdbcDataTestBase;
+import org.apache.flink.connector.jdbc.core.datastream.source.reader.extractor.ResultExtractor;
+import org.apache.flink.connector.jdbc.core.datastream.source.split.JdbcSourceSplit;
import org.apache.flink.connector.jdbc.datasource.connections.SimpleJdbcConnectionProvider;
-import org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor;
-import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit;
import org.apache.flink.connector.testutils.source.reader.TestingReaderContext;
import org.junit.jupiter.api.Test;
@@ -34,7 +34,9 @@ import java.util.Collections;
import static org.assertj.core.api.Assertions.assertThat;
-/** Test for {@link JdbcSourceReader}. */
+/**
+ * Test for {@link org.apache.flink.connector.jdbc.core.datastream.source.reader.JdbcSourceReader}.
+ */
class JdbcSourceReaderTest extends JdbcDataTestBase {
@Test
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceSplitReaderTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/source/reader/JdbcSourceSplitReaderTest.java
similarity index 94%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceSplitReaderTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/source/reader/JdbcSourceSplitReaderTest.java
index 7ebe0e12..b28238f9 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceSplitReaderTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/source/reader/JdbcSourceSplitReaderTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source.reader;
+package org.apache.flink.connector.jdbc.core.datastream.source.reader;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.configuration.Configuration;
@@ -26,10 +26,10 @@ import org.apache.flink.connector.base.source.reader.splitreader.SplitsAddition;
import org.apache.flink.connector.base.source.reader.splitreader.TestingSplitsChange;
import org.apache.flink.connector.jdbc.JdbcConnectionOptions;
import org.apache.flink.connector.jdbc.JdbcDataTestBase;
+import org.apache.flink.connector.jdbc.core.datastream.source.reader.extractor.ResultExtractor;
+import org.apache.flink.connector.jdbc.core.datastream.source.split.JdbcSourceSplit;
import org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider;
import org.apache.flink.connector.jdbc.datasource.connections.SimpleJdbcConnectionProvider;
-import org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor;
-import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit;
import org.apache.flink.connector.testutils.source.reader.TestingReaderContext;
import org.junit.jupiter.api.Test;
@@ -44,7 +44,10 @@ import static org.apache.flink.connector.jdbc.JdbcTestFixture.TestEntry;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-/** Test for {@link JdbcSourceSplitReader}. */
+/**
+ * Test for {@link
+ * org.apache.flink.connector.jdbc.core.datastream.source.reader.JdbcSourceSplitReader}.
+ */
class JdbcSourceSplitReaderTest extends JdbcDataTestBase {
private final JdbcSourceSplit split =
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplitSerializerTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/source/split/JdbcSourceSplitSerializerTest.java
similarity index 94%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplitSerializerTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/source/split/JdbcSourceSplitSerializerTest.java
index 9d3f6516..e414da6d 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplitSerializerTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/datastream/source/split/JdbcSourceSplitSerializerTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source.split;
+package org.apache.flink.connector.jdbc.core.datastream.source.split;
import org.junit.jupiter.api.Test;
@@ -27,7 +27,10 @@ import java.util.Random;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-/** Test for {@link JdbcSourceSplitSerializer}. */
+/**
+ * Test for {@link
+ * org.apache.flink.connector.jdbc.core.datastream.source.split.JdbcSourceSplitSerializer}.
+ */
class JdbcSourceSplitSerializerTest {
private final JdbcSourceSplit split = new JdbcSourceSplit("1", "select 1", null, null);
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSource.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSource.java
similarity index 88%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSource.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSource.java
index 08e4a777..19405624 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSource.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSource.java
@@ -30,16 +30,16 @@ import org.apache.flink.api.connector.source.SplitEnumeratorContext;
import org.apache.flink.api.java.typeutils.ResultTypeQueryable;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.connector.base.DeliveryGuarantee;
+import org.apache.flink.connector.jdbc.core.datastream.source.enumerator.JdbcSourceEnumStateSerializer;
+import org.apache.flink.connector.jdbc.core.datastream.source.enumerator.JdbcSourceEnumerator;
+import org.apache.flink.connector.jdbc.core.datastream.source.enumerator.JdbcSourceEnumeratorState;
+import org.apache.flink.connector.jdbc.core.datastream.source.enumerator.JdbcSqlSplitEnumeratorBase;
+import org.apache.flink.connector.jdbc.core.datastream.source.reader.JdbcSourceReader;
+import org.apache.flink.connector.jdbc.core.datastream.source.reader.JdbcSourceSplitReader;
+import org.apache.flink.connector.jdbc.core.datastream.source.reader.extractor.ResultExtractor;
+import org.apache.flink.connector.jdbc.core.datastream.source.split.JdbcSourceSplit;
+import org.apache.flink.connector.jdbc.core.datastream.source.split.JdbcSourceSplitSerializer;
import org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider;
-import org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumStateSerializer;
-import org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumerator;
-import org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumeratorState;
-import org.apache.flink.connector.jdbc.source.enumerator.JdbcSqlSplitEnumeratorBase;
-import org.apache.flink.connector.jdbc.source.reader.JdbcSourceReader;
-import org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader;
-import org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor;
-import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit;
-import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplitSerializer;
import org.apache.flink.connector.jdbc.utils.ContinuousUnBoundingSettings;
import org.apache.flink.core.io.SimpleVersionedSerializer;
import org.apache.flink.util.Preconditions;
@@ -50,8 +50,13 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.Objects;
-/** JDBC source. */
+/**
+ * JDBC source.
+ *
+ * @deprecated please use {@link org.apache.flink.connector.jdbc.core.datastream.source.JdbcSource}
+ */
@PublicEvolving
+@Deprecated
public class JdbcSource<OUT>
implements Source<OUT, JdbcSourceSplit, JdbcSourceEnumeratorState>,
ResultTypeQueryable<OUT> {
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceBuilder.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceBuilder.java
similarity index 90%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceBuilder.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceBuilder.java
index 8d52f7ac..7e940e92 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceBuilder.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceBuilder.java
@@ -23,10 +23,11 @@ import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.connector.base.DeliveryGuarantee;
import org.apache.flink.connector.jdbc.JdbcConnectionOptions;
+import org.apache.flink.connector.jdbc.core.datastream.source.JdbcSourceOptions;
+import org.apache.flink.connector.jdbc.core.datastream.source.enumerator.SqlTemplateSplitEnumerator;
+import org.apache.flink.connector.jdbc.core.datastream.source.reader.extractor.ResultExtractor;
import org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider;
import org.apache.flink.connector.jdbc.datasource.connections.SimpleJdbcConnectionProvider;
-import org.apache.flink.connector.jdbc.source.enumerator.SqlTemplateSplitEnumerator;
-import org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor;
import org.apache.flink.connector.jdbc.split.JdbcParameterValuesProvider;
import org.apache.flink.connector.jdbc.split.JdbcSlideTimingParameterProvider;
import org.apache.flink.connector.jdbc.utils.ContinuousUnBoundingSettings;
@@ -46,12 +47,6 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Objects;
-import static org.apache.flink.connector.jdbc.source.JdbcSourceOptions.AUTO_COMMIT;
-import static org.apache.flink.connector.jdbc.source.JdbcSourceOptions.READER_FETCH_BATCH_SIZE;
-import static org.apache.flink.connector.jdbc.source.JdbcSourceOptions.RESULTSET_CONCURRENCY;
-import static org.apache.flink.connector.jdbc.source.JdbcSourceOptions.RESULTSET_FETCH_SIZE;
-import static org.apache.flink.connector.jdbc.source.JdbcSourceOptions.RESULTSET_TYPE;
-
/**
* A tool is used to build {@link JdbcSource} quickly.
*
@@ -94,8 +89,11 @@ import static org.apache.flink.connector.jdbc.source.JdbcSourceOptions.RESULTSET
* @see PreparedStatement
* @see DriverManager
* @see JdbcSource
+ * @deprecated please use {@link
+ * org.apache.flink.connector.jdbc.core.datastream.source.JdbcSourceBuilder}
*/
@PublicEvolving
+@Deprecated
public class JdbcSourceBuilder<OUT> {
public static final Logger LOG = LoggerFactory.getLogger(JdbcSourceBuilder.class);
@@ -130,9 +128,9 @@ public class JdbcSourceBuilder<OUT> {
JdbcSourceBuilder() {
this.configuration = new Configuration();
this.connOptionsBuilder = new JdbcConnectionOptions.JdbcConnectionOptionsBuilder();
- this.splitReaderFetchBatchSize = READER_FETCH_BATCH_SIZE.defaultValue();
- this.resultSetType = RESULTSET_TYPE.defaultValue();
- this.resultSetConcurrency = RESULTSET_CONCURRENCY.defaultValue();
+ this.splitReaderFetchBatchSize = JdbcSourceOptions.READER_FETCH_BATCH_SIZE.defaultValue();
+ this.resultSetType = JdbcSourceOptions.RESULTSET_TYPE.defaultValue();
+ this.resultSetConcurrency = JdbcSourceOptions.RESULTSET_CONCURRENCY.defaultValue();
this.deliveryGuarantee = DeliveryGuarantee.NONE;
// Boolean to distinguish between default value and explicitly set autoCommit mode.
this.autoCommit = true;
@@ -191,7 +189,7 @@ public class JdbcSourceBuilder<OUT> {
/**
* The continuousUnBoundingSettings to discovery the next available batch splits. Note: If the
* value was set, the {@link #jdbcParameterValuesProvider} must specified with the {@link
- * org.apache.flink.connector.jdbc.split.JdbcSlideTimingParameterProvider}.
+ * JdbcSlideTimingParameterProvider}.
*/
public JdbcSourceBuilder<OUT> setContinuousUnBoundingSettings(
ContinuousUnBoundingSettings continuousUnBoundingSettings) {
@@ -275,7 +273,7 @@ public class JdbcSourceBuilder<OUT> {
public JdbcSource<OUT> build() {
this.connectionProvider = new SimpleJdbcConnectionProvider(connOptionsBuilder.build());
if (resultSetFetchSize > 0) {
- this.configuration.set(RESULTSET_FETCH_SIZE, resultSetFetchSize);
+ this.configuration.set(JdbcSourceOptions.RESULTSET_FETCH_SIZE, resultSetFetchSize);
}
if (deliveryGuarantee == DeliveryGuarantee.EXACTLY_ONCE) {
@@ -286,10 +284,11 @@ public class JdbcSourceBuilder<OUT> {
DeliveryGuarantee.EXACTLY_ONCE);
}
- this.configuration.set(RESULTSET_CONCURRENCY, resultSetConcurrency);
- this.configuration.set(RESULTSET_TYPE, resultSetType);
- this.configuration.set(READER_FETCH_BATCH_SIZE, splitReaderFetchBatchSize);
- this.configuration.set(AUTO_COMMIT, autoCommit);
+ this.configuration.set(JdbcSourceOptions.RESULTSET_CONCURRENCY, resultSetConcurrency);
+ this.configuration.set(JdbcSourceOptions.RESULTSET_TYPE, resultSetType);
+ this.configuration.set(
+ JdbcSourceOptions.READER_FETCH_BATCH_SIZE, splitReaderFetchBatchSize);
+ this.configuration.set(JdbcSourceOptions.AUTO_COMMIT, autoCommit);
Preconditions.checkState(
!StringUtils.isNullOrWhitespaceOnly(sql), "'sql' mustn't be null or empty.");
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/ResultExtractor.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/ResultExtractor.java
similarity index 57%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/ResultExtractor.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/ResultExtractor.java
index 19bd6672..79935080 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/ResultExtractor.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/ResultExtractor.java
@@ -19,39 +19,19 @@
package org.apache.flink.connector.jdbc.source.reader.extractor;
import org.apache.flink.annotation.PublicEvolving;
-import org.apache.flink.types.Row;
-import java.io.Serializable;
import java.sql.ResultSet;
-import java.sql.SQLException;
/**
* The Extractor to extract the data from {@link ResultSet}.
*
* @param <T> The target data type.
+ * @deprecated please use {@link
+ * org.apache.flink.connector.jdbc.core.datastream.source.reader.extractor.ResultExtractor}
*/
@PublicEvolving
-public interface ResultExtractor<T> extends Serializable {
-
- /**
- * Extract the data from the current point line of the result.
- *
- * @param resultSet Result set queried from a sql.
- * @return The data object filled by the current line of the resultSet.
- * @throws SQLException SQL exception.
- */
- T extract(ResultSet resultSet) throws SQLException;
-
- /**
- * The identifier of the extractor.
- *
- * @return identifier in {@link String} type.
- */
- default String identifier() {
- return this.getClass().getSimpleName();
- }
-
- static ResultExtractor<Row> ofRowResultExtractor() {
- return new RowResultExtractor();
- }
-}
+@Deprecated
+public interface ResultExtractor<T>
+ extends org.apache.flink.connector.jdbc.core.datastream.source.reader.extractor
+ .ResultExtractor<
+ T> {}
(flink-connector-jdbc) 03/14: [FLINK-35365] Reorganize dialect code
Posted by fa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git
commit a00115191ff34bfdfc4c8d3d8dfda25451c039b1
Author: Joao Boto <bo...@boto.pro>
AuthorDate: Fri Apr 26 11:33:04 2024 +0200
[FLINK-35365] Reorganize dialect code
---
.../connector/jdbc/catalog/JdbcCatalogUtils.java | 8 +-
...bstractPostgresCompatibleDialectConverter.java} | 7 +-
.../table/JdbcFactory.java} | 25 +++++--
.../table/JdbcFactoryLoader.java} | 85 ++++++++++++++++------
.../{ => core/table}/dialect/AbstractDialect.java | 2 +-
.../table/dialect/AbstractDialectConverter.java} | 6 +-
.../jdbc/{ => core/table}/dialect/JdbcDialect.java | 8 +-
.../table/dialect/JdbcDialectConverter.java} | 4 +-
.../databases/cratedb/dialect/CrateDBDialect.java | 4 +-
...Converter.java => CrateDBDialectConverter.java} | 6 +-
...teDBDialectFactory.java => CrateDBFactory.java} | 8 +-
.../jdbc/databases/db2/dialect/Db2Dialect.java | 8 +-
...2RowConverter.java => Db2DialectConverter.java} | 6 +-
.../{Db2DialectFactory.java => Db2Factory.java} | 8 +-
.../jdbc/databases/derby/dialect/DerbyDialect.java | 8 +-
...owConverter.java => DerbyDialectConverter.java} | 6 +-
...{DerbyDialectFactory.java => DerbyFactory.java} | 8 +-
.../databases/mysql/catalog/MySqlTypeMapper.java | 3 +-
...owConverter.java => MySQLDialectConverter.java} | 6 +-
.../jdbc/databases/mysql/dialect/MySqlDialect.java | 8 +-
...{MySqlDialectFactory.java => MySqlFactory.java} | 8 +-
.../oceanbase/dialect/OceanBaseDialect.java | 8 +-
...nverter.java => OceanBaseDialectConverter.java} | 6 +-
...seDialectFactory.java => OceanBaseFactory.java} | 10 +--
.../databases/oracle/dialect/OracleDialect.java | 8 +-
...wConverter.java => OracleDialectConverter.java} | 6 +-
...racleDialectFactory.java => OracleFactory.java} | 8 +-
.../postgres/dialect/PostgresDialect.java | 4 +-
...onverter.java => PostgresDialectConverter.java} | 6 +-
...resDialectFactory.java => PostgresFactory.java} | 8 +-
.../sqlserver/dialect/SqlServerDialect.java | 8 +-
...nverter.java => SqlServerDialectConverter.java} | 6 +-
...erDialectFactory.java => SqlServerFactory.java} | 8 +-
.../jdbc/databases/trino/dialect/TrinoDialect.java | 8 +-
...owConverter.java => TrinoDialectConverter.java} | 6 +-
...{TrinoDialectFactory.java => TrinoFactory.java} | 8 +-
.../dialect/AbstractPostgresCompatibleDialect.java | 1 +
.../TableInsertOrUpdateStatementExecutor.java | 14 ++--
.../executor/TableSimpleStatementExecutor.java | 7 +-
.../options/InternalJdbcConnectionOptions.java | 8 +-
.../jdbc/internal/options/JdbcDmlOptions.java | 2 +-
.../jdbc/table/JdbcDynamicTableFactory.java | 12 +--
.../jdbc/table/JdbcDynamicTableSource.java | 2 +-
.../jdbc/table/JdbcOutputFormatBuilder.java | 6 +-
.../jdbc/table/JdbcRowDataInputFormat.java | 10 +--
.../jdbc/table/JdbcRowDataLookupFunction.java | 12 +--
.../jdbc/table/RowDataResultExtractor.java | 10 +--
...he.flink.connector.jdbc.core.table.JdbcFactory} | 18 ++---
...Test.java => AbstractDialectConverterTest.java} | 10 ++-
.../db2/dialect/Db2PreparedStatementTest.java | 7 +-
.../dialect/OraclePreparedStatementTest.java | 6 +-
.../dialect/SqlServerPreparedStatementTest.java | 6 +-
.../trino/dialect/TrinoPreparedStatementTest.java | 7 +-
.../FieldNamedPreparedStatementImplTest.java | 7 +-
.../jdbc/table/JdbcAppendOnlyWriterTest.java | 4 +-
...FilterPushdownPreparedStatementVisitorTest.java | 6 +-
.../jdbc/table/JdbcRowDataInputFormatTest.java | 2 +-
flink-connector-jdbc/pom.xml | 20 +++++
.../jdbc/converter/AbstractJdbcRowConverter.java | 26 +++----
.../connector/jdbc/converter/JdbcRowConverter.java | 30 ++++----
.../connector/jdbc/dialect/AbstractDialect.java | 38 ++++++++++
.../flink/connector/jdbc/dialect/JdbcDialect.java | 31 ++++----
.../connector/jdbc/dialect/JdbcDialectFactory.java | 53 ++++++++------
63 files changed, 403 insertions(+), 292 deletions(-)
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtils.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtils.java
index a1dbf5af..af94b9cb 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtils.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtils.java
@@ -18,14 +18,14 @@
package org.apache.flink.connector.jdbc.catalog;
+import org.apache.flink.connector.jdbc.core.table.JdbcFactoryLoader;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
import org.apache.flink.connector.jdbc.databases.cratedb.catalog.CrateDBCatalog;
import org.apache.flink.connector.jdbc.databases.cratedb.dialect.CrateDBDialect;
import org.apache.flink.connector.jdbc.databases.mysql.catalog.MySqlCatalog;
import org.apache.flink.connector.jdbc.databases.mysql.dialect.MySqlDialect;
import org.apache.flink.connector.jdbc.databases.postgres.catalog.PostgresCatalog;
import org.apache.flink.connector.jdbc.databases.postgres.dialect.PostgresDialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectLoader;
import java.util.Properties;
@@ -71,7 +71,9 @@ public class JdbcCatalogUtils {
String baseUrl,
String compatibleMode,
Properties connectionProperties) {
- JdbcDialect dialect = JdbcDialectLoader.load(baseUrl, compatibleMode, userClassLoader);
+
+ JdbcDialect dialect =
+ JdbcFactoryLoader.loadDialect(baseUrl, userClassLoader, compatibleMode);
if (dialect instanceof PostgresDialect) {
return new PostgresCatalog(
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractPostgresCompatibleRowConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractPostgresCompatibleDialectConverter.java
similarity index 92%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractPostgresCompatibleRowConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractPostgresCompatibleDialectConverter.java
index 86c6f16c..85417814 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractPostgresCompatibleRowConverter.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractPostgresCompatibleDialectConverter.java
@@ -18,6 +18,7 @@
package org.apache.flink.connector.jdbc.converter;
+import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialectConverter;
import org.apache.flink.table.data.GenericArrayData;
import org.apache.flink.table.types.logical.ArrayType;
import org.apache.flink.table.types.logical.LogicalType;
@@ -31,12 +32,12 @@ import java.lang.reflect.Array;
* Runtime converter that responsible to convert between JDBC object and Flink internal object for
* PostgreSQL compatible databases.
*/
-public abstract class AbstractPostgresCompatibleRowConverter<T extends java.sql.Array>
- extends AbstractJdbcRowConverter {
+public abstract class AbstractPostgresCompatibleDialectConverter<T extends java.sql.Array>
+ extends AbstractDialectConverter {
private static final long serialVersionUID = 1L;
- protected AbstractPostgresCompatibleRowConverter(RowType rowType) {
+ protected AbstractPostgresCompatibleDialectConverter(RowType rowType) {
super(rowType);
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcFactory.java
similarity index 73%
copy from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectFactory.java
copy to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcFactory.java
index 84f4bd78..448ecaa5 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcFactory.java
@@ -16,9 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.dialect;
+package org.apache.flink.connector.jdbc.core.table;
import org.apache.flink.annotation.PublicEvolving;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
import org.apache.flink.util.StringUtils;
/**
@@ -26,13 +27,13 @@ import org.apache.flink.util.StringUtils;
* Provider Interfaces (SPI) for discovering.
*
* <p>Classes that implement this interface can be added to the
- * "META_INF/services/org.apache.flink.connector.jdbc.dialect.JdbcDialectFactory" file of a JAR file
- * in the current classpath to be found.
+ * "META_INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory" file of a JAR file in
+ * the current classpath to be found.
*
* @see JdbcDialect
*/
@PublicEvolving
-public interface JdbcDialectFactory {
+public interface JdbcFactory {
/**
* Retrieves whether the dialect thinks that it can open a connection to the given URL.
@@ -45,8 +46,8 @@ public interface JdbcDialectFactory {
*/
boolean acceptsURL(String url);
- /** @return Creates a new instance of the {@link JdbcDialect}. */
- JdbcDialect create();
+ /** @return a new instance of the {@link JdbcDialect}. */
+ JdbcDialect createDialect();
/**
* Creates a new instance of the {@link JdbcDialect} based on compatible mode.
@@ -54,11 +55,19 @@ public interface JdbcDialectFactory {
* @param compatibleMode the compatible mode of database
* @return a new instance of {@link JdbcDialect}
*/
- default JdbcDialect create(String compatibleMode) {
+ default JdbcDialect createDialect(String compatibleMode) {
if (StringUtils.isNullOrWhitespaceOnly(compatibleMode)) {
- return create();
+ return createDialect();
}
throw new UnsupportedOperationException(
"Not supported option 'compatible-mode' with value: " + compatibleMode);
}
+
+ // JdbcCatalog createCatalog(
+ // ClassLoader classLoader,
+ // String catalogName,
+ // String defaultDatabase,
+ // String username,
+ // String pwd,
+ // String baseUrl);
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectLoader.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcFactoryLoader.java
similarity index 52%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectLoader.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcFactoryLoader.java
index 4e9b9ba0..3549b76d 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectLoader.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcFactoryLoader.java
@@ -16,9 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.dialect;
+package org.apache.flink.connector.jdbc.core.table;
import org.apache.flink.annotation.Internal;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,47 +32,84 @@ import java.util.stream.Collectors;
/** Utility for working with {@link JdbcDialect}. */
@Internal
-public final class JdbcDialectLoader {
+public final class JdbcFactoryLoader {
- private static final Logger LOG = LoggerFactory.getLogger(JdbcDialectLoader.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JdbcFactoryLoader.class);
- private JdbcDialectLoader() {}
+ private JdbcFactoryLoader() {}
- public static JdbcDialect load(String url, ClassLoader classLoader) {
- return load(url, null, classLoader);
+ public static JdbcDialect loadDialect(String url, ClassLoader classLoader) {
+ return loadDialect(url, classLoader, null);
}
/**
* Loads the unique JDBC Dialect that can handle the given database url.
*
* @param url A database URL.
- * @param compatibleMode the compatible mode of database
- * @param classLoader the classloader used to load the factory
+ * @param classLoader the classloader used to load the factory.
+ * @param compatibleMode the compatible mode of database.
* @throws IllegalStateException if the loader cannot find exactly one dialect that can
* unambiguously process the given database URL.
* @return The loaded dialect.
*/
- public static JdbcDialect load(String url, String compatibleMode, ClassLoader classLoader) {
- List<JdbcDialectFactory> foundFactories = discoverFactories(classLoader);
+ public static JdbcDialect loadDialect(
+ String url, ClassLoader classLoader, String compatibleMode) {
+ return load(url, classLoader).createDialect(compatibleMode);
+ }
+
+ // public static JdbcCatalog loadCatalog(
+ // ClassLoader classLoader,
+ // String catalogName,
+ // String defaultDatabase,
+ // String username,
+ // String pwd,
+ // String baseUrl) {
+ // return load(baseUrl, classLoader)
+ // .createCatalog(
+ // classLoader, catalogName, defaultDatabase, username, pwd, baseUrl,
+ // null);
+ // }
+ //
+ // public static JdbcCatalog loadCatalog(
+ // ClassLoader classLoader,
+ // String catalogName,
+ // String defaultDatabase,
+ // String username,
+ // String pwd,
+ // String baseUrl,
+ // String compatibleMode) {
+ // return load(baseUrl, classLoader)
+ // .createCatalog(
+ // classLoader,
+ // catalogName,
+ // defaultDatabase,
+ // username,
+ // pwd,
+ // baseUrl,
+ // compatibleMode);
+ // }
+
+ private static JdbcFactory load(String url, ClassLoader classLoader) {
+ List<JdbcFactory> foundFactories = discoverFactories(classLoader);
if (foundFactories.isEmpty()) {
throw new IllegalStateException(
String.format(
- "Could not find any jdbc dialect factories that implement '%s' in the classpath.",
- JdbcDialectFactory.class.getName()));
+ "Could not find any jdbc factories that implement '%s' in the classpath.",
+ JdbcFactory.class.getName()));
}
- final List<JdbcDialectFactory> matchingFactories =
+ final List<JdbcFactory> matchingFactories =
foundFactories.stream().filter(f -> f.acceptsURL(url)).collect(Collectors.toList());
if (matchingFactories.isEmpty()) {
throw new IllegalStateException(
String.format(
- "Could not find any jdbc dialect factory that can handle url '%s' that implements '%s' in the classpath.\n\n"
+ "Could not find any jdbc factory that can handle url '%s' that implements '%s' in the classpath.\n\n"
+ "Available factories are:\n\n"
+ "%s",
url,
- JdbcDialectFactory.class.getName(),
+ JdbcFactory.class.getName(),
foundFactories.stream()
.map(f -> f.getClass().getName())
.distinct()
@@ -81,31 +119,30 @@ public final class JdbcDialectLoader {
if (matchingFactories.size() > 1) {
throw new IllegalStateException(
String.format(
- "Multiple jdbc dialect factories can handle url '%s' that implement '%s' found in the classpath.\n\n"
+ "Multiple jdbc factories can handle url '%s' that implement '%s' found in the classpath.\n\n"
+ "Ambiguous factory classes are:\n\n"
+ "%s",
url,
- JdbcDialectFactory.class.getName(),
+ JdbcFactory.class.getName(),
matchingFactories.stream()
.map(f -> f.getClass().getName())
.sorted()
.collect(Collectors.joining("\n"))));
}
- return matchingFactories.get(0).create(compatibleMode);
+ return matchingFactories.get(0);
}
- private static List<JdbcDialectFactory> discoverFactories(ClassLoader classLoader) {
+ private static List<JdbcFactory> discoverFactories(ClassLoader classLoader) {
try {
- final List<JdbcDialectFactory> result = new LinkedList<>();
- ServiceLoader.load(JdbcDialectFactory.class, classLoader)
+ final List<JdbcFactory> result = new LinkedList<>();
+ ServiceLoader.load(JdbcFactory.class, classLoader)
.iterator()
.forEachRemaining(result::add);
return result;
} catch (ServiceConfigurationError e) {
- LOG.error("Could not load service provider for jdbc dialects factory.", e);
- throw new RuntimeException(
- "Could not load service provider for jdbc dialects factory.", e);
+ LOG.error("Could not load service provider for jdbc factory.", e);
+ throw new RuntimeException("Could not load service provider for jdbc factory.", e);
}
}
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractDialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/dialect/AbstractDialect.java
similarity index 99%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractDialect.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/dialect/AbstractDialect.java
index d838ebe6..29b58427 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractDialect.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/dialect/AbstractDialect.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.dialect;
+package org.apache.flink.connector.jdbc.core.table.dialect;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.table.api.ValidationException;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/dialect/AbstractDialectConverter.java
similarity index 98%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/dialect/AbstractDialectConverter.java
index 1a19d127..95d9bcdd 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/dialect/AbstractDialectConverter.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.converter;
+package org.apache.flink.connector.jdbc.core.table.dialect;
import org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatement;
import org.apache.flink.connector.jdbc.utils.JdbcTypeUtil;
@@ -47,7 +47,7 @@ import java.time.LocalTime;
import static org.apache.flink.util.Preconditions.checkNotNull;
/** Base class for all converters that convert between JDBC object and Flink internal object. */
-public abstract class AbstractJdbcRowConverter implements JdbcRowConverter {
+public abstract class AbstractDialectConverter implements JdbcDialectConverter {
protected final RowType rowType;
protected final JdbcDeserializationConverter[] toInternalConverters;
@@ -56,7 +56,7 @@ public abstract class AbstractJdbcRowConverter implements JdbcRowConverter {
public abstract String converterName();
- public AbstractJdbcRowConverter(RowType rowType) {
+ public AbstractDialectConverter(RowType rowType) {
this.rowType = checkNotNull(rowType);
this.fieldTypes =
rowType.getFields().stream()
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/dialect/JdbcDialect.java
similarity index 96%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialect.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/dialect/JdbcDialect.java
index 6cc6bbd5..b748d308 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialect.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/dialect/JdbcDialect.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.dialect;
+package org.apache.flink.connector.jdbc.core.table.dialect;
import org.apache.flink.annotation.PublicEvolving;
-import org.apache.flink.connector.jdbc.converter.JdbcRowConverter;
+import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
import org.apache.flink.table.api.ValidationException;
import org.apache.flink.table.types.logical.RowType;
@@ -30,7 +30,7 @@ import java.util.Optional;
* Represents a dialect of SQL implemented by a particular JDBC system. Dialects should be immutable
* and stateless.
*
- * @see JdbcDialectFactory
+ * @see JdbcFactory
*/
@PublicEvolving
public interface JdbcDialect extends Serializable {
@@ -48,7 +48,7 @@ public interface JdbcDialect extends Serializable {
* @param rowType the given row type
* @return a row converter for the database
*/
- JdbcRowConverter getRowConverter(RowType rowType);
+ JdbcDialectConverter getRowConverter(RowType rowType);
/**
* Get limit clause to limit the number of emitted row from the jdbc source.
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/converter/JdbcRowConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/dialect/JdbcDialectConverter.java
similarity index 93%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/converter/JdbcRowConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/dialect/JdbcDialectConverter.java
index c1f1b1f5..77bb961e 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/converter/JdbcRowConverter.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/dialect/JdbcDialectConverter.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.converter;
+package org.apache.flink.connector.jdbc.core.table.dialect;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatement;
@@ -31,7 +31,7 @@ import java.sql.SQLException;
* structure {@link RowData}.
*/
@PublicEvolving
-public interface JdbcRowConverter extends Serializable {
+public interface JdbcDialectConverter extends Serializable {
/**
* Convert data retrieved from {@link ResultSet} to internal {@link RowData}.
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialect.java
index 7592cf2e..c290917b 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialect.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialect.java
@@ -34,8 +34,8 @@ public class CrateDBDialect extends AbstractPostgresCompatibleDialect {
}
@Override
- public CrateDBRowConverter getRowConverter(RowType rowType) {
- return new CrateDBRowConverter(rowType);
+ public CrateDBDialectConverter getRowConverter(RowType rowType) {
+ return new CrateDBDialectConverter(rowType);
}
@Override
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBRowConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectConverter.java
similarity index 87%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBRowConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectConverter.java
index 1412b0d5..80f9db25 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBRowConverter.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectConverter.java
@@ -18,7 +18,7 @@
package org.apache.flink.connector.jdbc.databases.cratedb.dialect;
-import org.apache.flink.connector.jdbc.converter.AbstractPostgresCompatibleRowConverter;
+import org.apache.flink.connector.jdbc.converter.AbstractPostgresCompatibleDialectConverter;
import org.apache.flink.table.types.logical.RowType;
import io.crate.shade.org.postgresql.jdbc.PgArray;
@@ -27,11 +27,11 @@ import io.crate.shade.org.postgresql.jdbc.PgArray;
* Runtime converter that responsible to convert between JDBC object and Flink internal object for
* CrateDB.
*/
-public class CrateDBRowConverter extends AbstractPostgresCompatibleRowConverter<PgArray> {
+public class CrateDBDialectConverter extends AbstractPostgresCompatibleDialectConverter<PgArray> {
private static final long serialVersionUID = 1L;
- public CrateDBRowConverter(RowType rowType) {
+ public CrateDBDialectConverter(RowType rowType) {
super(rowType);
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBFactory.java
similarity index 83%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectFactory.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBFactory.java
index ac5a8e7d..fcf31b24 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBFactory.java
@@ -19,19 +19,19 @@
package org.apache.flink.connector.jdbc.databases.cratedb.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectFactory;
+import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
/** Factory for {@link CrateDBDialect}. */
@Internal
-public class CrateDBDialectFactory implements JdbcDialectFactory {
+public class CrateDBFactory implements JdbcFactory {
@Override
public boolean acceptsURL(String url) {
return url.startsWith("jdbc:crate:");
}
@Override
- public JdbcDialect create() {
+ public JdbcDialect createDialect() {
return new CrateDBDialect();
}
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Dialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Dialect.java
index e617a9fc..49f71c5b 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Dialect.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Dialect.java
@@ -18,8 +18,8 @@
package org.apache.flink.connector.jdbc.databases.db2.dialect;
-import org.apache.flink.connector.jdbc.converter.JdbcRowConverter;
-import org.apache.flink.connector.jdbc.dialect.AbstractDialect;
+import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialect;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
import org.apache.flink.table.types.logical.LogicalTypeRoot;
import org.apache.flink.table.types.logical.RowType;
@@ -42,8 +42,8 @@ public class Db2Dialect extends AbstractDialect {
private static final int MIN_DECIMAL_PRECISION = 1;
@Override
- public JdbcRowConverter getRowConverter(RowType rowType) {
- return new Db2RowConverter(rowType);
+ public JdbcDialectConverter getRowConverter(RowType rowType) {
+ return new Db2DialectConverter(rowType);
}
@Override
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2RowConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectConverter.java
similarity index 87%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2RowConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectConverter.java
index 8557c822..4ad3fc49 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2RowConverter.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectConverter.java
@@ -18,7 +18,7 @@
package org.apache.flink.connector.jdbc.databases.db2.dialect;
-import org.apache.flink.connector.jdbc.converter.AbstractJdbcRowConverter;
+import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialectConverter;
import org.apache.flink.table.types.logical.LogicalType;
import org.apache.flink.table.types.logical.RowType;
@@ -26,7 +26,7 @@ import org.apache.flink.table.types.logical.RowType;
* Runtime converter that responsible to convert between JDBC object and Flink internal object for
* Db2.
*/
-public class Db2RowConverter extends AbstractJdbcRowConverter {
+public class Db2DialectConverter extends AbstractDialectConverter {
private static final long serialVersionUID = 1L;
@@ -35,7 +35,7 @@ public class Db2RowConverter extends AbstractJdbcRowConverter {
return "Db2";
}
- public Db2RowConverter(RowType rowType) {
+ public Db2DialectConverter(RowType rowType) {
super(rowType);
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Factory.java
similarity index 83%
copy from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectFactory.java
copy to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Factory.java
index c3a21829..268a20c2 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Factory.java
@@ -19,19 +19,19 @@
package org.apache.flink.connector.jdbc.databases.db2.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectFactory;
+import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
/** Factory for {@link Db2Dialect}. */
@Internal
-public class Db2DialectFactory implements JdbcDialectFactory {
+public class Db2Factory implements JdbcFactory {
@Override
public boolean acceptsURL(String url) {
return url.startsWith("jdbc:db2:");
}
@Override
- public JdbcDialect create() {
+ public JdbcDialect createDialect() {
return new Db2Dialect();
}
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyDialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyDialect.java
index dad028f0..93c6c325 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyDialect.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyDialect.java
@@ -19,8 +19,8 @@
package org.apache.flink.connector.jdbc.databases.derby.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.converter.JdbcRowConverter;
-import org.apache.flink.connector.jdbc.dialect.AbstractDialect;
+import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialect;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
import org.apache.flink.table.types.logical.LogicalTypeRoot;
import org.apache.flink.table.types.logical.RowType;
@@ -45,8 +45,8 @@ public class DerbyDialect extends AbstractDialect {
private static final int MIN_DECIMAL_PRECISION = 1;
@Override
- public JdbcRowConverter getRowConverter(RowType rowType) {
- return new DerbyRowConverter(rowType);
+ public JdbcDialectConverter getRowConverter(RowType rowType) {
+ return new DerbyDialectConverter(rowType);
}
@Override
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyRowConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyDialectConverter.java
similarity index 86%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyRowConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyDialectConverter.java
index 7f05a303..846f2c16 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyRowConverter.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyDialectConverter.java
@@ -19,7 +19,7 @@
package org.apache.flink.connector.jdbc.databases.derby.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.converter.AbstractJdbcRowConverter;
+import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialectConverter;
import org.apache.flink.table.types.logical.RowType;
/**
@@ -27,7 +27,7 @@ import org.apache.flink.table.types.logical.RowType;
* Derby.
*/
@Internal
-public class DerbyRowConverter extends AbstractJdbcRowConverter {
+public class DerbyDialectConverter extends AbstractDialectConverter {
private static final long serialVersionUID = 1L;
@@ -36,7 +36,7 @@ public class DerbyRowConverter extends AbstractJdbcRowConverter {
return "Derby";
}
- public DerbyRowConverter(RowType rowType) {
+ public DerbyDialectConverter(RowType rowType) {
super(rowType);
}
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyDialectFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyFactory.java
similarity index 83%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyDialectFactory.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyFactory.java
index 280038dd..639d8695 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyDialectFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyFactory.java
@@ -19,19 +19,19 @@
package org.apache.flink.connector.jdbc.databases.derby.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectFactory;
+import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
/** Factory for {@link DerbyDialect}. */
@Internal
-public class DerbyDialectFactory implements JdbcDialectFactory {
+public class DerbyFactory implements JdbcFactory {
@Override
public boolean acceptsURL(String url) {
return url.startsWith("jdbc:derby:");
}
@Override
- public JdbcDialect create() {
+ public JdbcDialect createDialect() {
return new DerbyDialect();
}
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlTypeMapper.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlTypeMapper.java
index 995e0912..235136dd 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlTypeMapper.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlTypeMapper.java
@@ -120,7 +120,8 @@ public class MySqlTypeMapper implements JdbcDialectTypeMapper {
// VARBINARY(n) is not supported in MySqlDialect when 'n' is not equals to
// Integer.MAX_VALUE. Please see
// org.apache.flink.connector.jdbc.databases.mysql.dialect.MySqlDialect#supportedTypes and
- // org.apache.flink.connector.jdbc.dialect.AbstractDialect#validate for more
+ // org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialect#validate for
+ // more
// details.
return DataTypes.BYTES();
case MYSQL_TINYINT:
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySQLRowConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySQLDialectConverter.java
similarity index 86%
copy from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySQLRowConverter.java
copy to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySQLDialectConverter.java
index ef5d0fd7..c9c883f8 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySQLRowConverter.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySQLDialectConverter.java
@@ -19,7 +19,7 @@
package org.apache.flink.connector.jdbc.databases.mysql.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.converter.AbstractJdbcRowConverter;
+import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialectConverter;
import org.apache.flink.table.types.logical.RowType;
/**
@@ -27,7 +27,7 @@ import org.apache.flink.table.types.logical.RowType;
* MySQL.
*/
@Internal
-public class MySQLRowConverter extends AbstractJdbcRowConverter {
+public class MySQLDialectConverter extends AbstractDialectConverter {
private static final long serialVersionUID = 1L;
@@ -36,7 +36,7 @@ public class MySQLRowConverter extends AbstractJdbcRowConverter {
return "MySQL";
}
- public MySQLRowConverter(RowType rowType) {
+ public MySQLDialectConverter(RowType rowType) {
super(rowType);
}
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialect.java
index 6d79d300..ba25e0eb 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialect.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialect.java
@@ -19,8 +19,8 @@
package org.apache.flink.connector.jdbc.databases.mysql.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.converter.JdbcRowConverter;
-import org.apache.flink.connector.jdbc.dialect.AbstractDialect;
+import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialect;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
import org.apache.flink.table.types.logical.LogicalTypeRoot;
import org.apache.flink.table.types.logical.RowType;
@@ -51,8 +51,8 @@ public class MySqlDialect extends AbstractDialect {
private static final String REWRITE_BATCHED_STATEMENTS = "rewriteBatchedStatements";
@Override
- public JdbcRowConverter getRowConverter(RowType rowType) {
- return new MySQLRowConverter(rowType);
+ public JdbcDialectConverter getRowConverter(RowType rowType) {
+ return new MySQLDialectConverter(rowType);
}
@Override
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlFactory.java
similarity index 83%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectFactory.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlFactory.java
index 71ae04cc..a3544a01 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlFactory.java
@@ -19,19 +19,19 @@
package org.apache.flink.connector.jdbc.databases.mysql.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectFactory;
+import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
/** Factory for {@link MySqlDialect}. */
@Internal
-public class MySqlDialectFactory implements JdbcDialectFactory {
+public class MySqlFactory implements JdbcFactory {
@Override
public boolean acceptsURL(String url) {
return url.startsWith("jdbc:mysql:");
}
@Override
- public JdbcDialect create() {
+ public JdbcDialect createDialect() {
return new MySqlDialect();
}
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialect.java
index 885d3392..d190ea6a 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialect.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialect.java
@@ -19,10 +19,10 @@
package org.apache.flink.connector.jdbc.databases.oceanbase.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.converter.JdbcRowConverter;
+import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialect;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
import org.apache.flink.connector.jdbc.databases.mysql.dialect.MySqlDialect;
import org.apache.flink.connector.jdbc.databases.oracle.dialect.OracleDialect;
-import org.apache.flink.connector.jdbc.dialect.AbstractDialect;
import org.apache.flink.table.types.logical.LogicalTypeRoot;
import org.apache.flink.table.types.logical.RowType;
@@ -84,8 +84,8 @@ public class OceanBaseDialect extends AbstractDialect {
}
@Override
- public JdbcRowConverter getRowConverter(RowType rowType) {
- return new OceanBaseRowConverter(rowType);
+ public JdbcDialectConverter getRowConverter(RowType rowType) {
+ return new OceanBaseDialectConverter(rowType);
}
@Override
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseRowConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectConverter.java
similarity index 96%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseRowConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectConverter.java
index 95981217..1bc66254 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseRowConverter.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectConverter.java
@@ -19,7 +19,7 @@
package org.apache.flink.connector.jdbc.databases.oceanbase.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.converter.AbstractJdbcRowConverter;
+import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialectConverter;
import org.apache.flink.table.data.DecimalData;
import org.apache.flink.table.data.StringData;
import org.apache.flink.table.data.TimestampData;
@@ -40,7 +40,7 @@ import java.time.LocalDateTime;
* OceanBase.
*/
@Internal
-public class OceanBaseRowConverter extends AbstractJdbcRowConverter {
+public class OceanBaseDialectConverter extends AbstractDialectConverter {
private static final long serialVersionUID = 1L;
@@ -49,7 +49,7 @@ public class OceanBaseRowConverter extends AbstractJdbcRowConverter {
return "OceanBase";
}
- public OceanBaseRowConverter(RowType rowType) {
+ public OceanBaseDialectConverter(RowType rowType) {
super(rowType);
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseFactory.java
similarity index 81%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectFactory.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseFactory.java
index 46152379..1455e310 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseFactory.java
@@ -19,14 +19,14 @@
package org.apache.flink.connector.jdbc.databases.oceanbase.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectFactory;
+import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
import javax.annotation.Nonnull;
/** Factory for {@link OceanBaseDialect}. */
@Internal
-public class OceanBaseDialectFactory implements JdbcDialectFactory {
+public class OceanBaseFactory implements JdbcFactory {
@Override
public boolean acceptsURL(String url) {
@@ -34,13 +34,13 @@ public class OceanBaseDialectFactory implements JdbcDialectFactory {
}
@Override
- public JdbcDialect create() {
+ public JdbcDialect createDialect() {
throw new UnsupportedOperationException(
"Can't create JdbcDialect without compatible mode for OceanBase");
}
@Override
- public JdbcDialect create(@Nonnull String compatibleMode) {
+ public JdbcDialect createDialect(@Nonnull String compatibleMode) {
return new OceanBaseDialect(compatibleMode);
}
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialect.java
index 1ed061fe..d15a4a5b 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialect.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialect.java
@@ -19,8 +19,8 @@
package org.apache.flink.connector.jdbc.databases.oracle.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.converter.JdbcRowConverter;
-import org.apache.flink.connector.jdbc.dialect.AbstractDialect;
+import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialect;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
import org.apache.flink.table.types.logical.LogicalTypeRoot;
import org.apache.flink.table.types.logical.RowType;
@@ -47,8 +47,8 @@ public class OracleDialect extends AbstractDialect {
private static final int MIN_DECIMAL_PRECISION = 1;
@Override
- public JdbcRowConverter getRowConverter(RowType rowType) {
- return new OracleRowConverter(rowType);
+ public JdbcDialectConverter getRowConverter(RowType rowType) {
+ return new OracleDialectConverter(rowType);
}
@Override
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleRowConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectConverter.java
similarity index 97%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleRowConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectConverter.java
index b476e661..4acc8f97 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleRowConverter.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectConverter.java
@@ -19,7 +19,7 @@
package org.apache.flink.connector.jdbc.databases.oracle.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.converter.AbstractJdbcRowConverter;
+import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialectConverter;
import org.apache.flink.table.data.DecimalData;
import org.apache.flink.table.data.StringData;
import org.apache.flink.table.data.TimestampData;
@@ -50,11 +50,11 @@ import java.time.ZonedDateTime;
* Oracle.
*/
@Internal
-public class OracleRowConverter extends AbstractJdbcRowConverter {
+public class OracleDialectConverter extends AbstractDialectConverter {
private static final long serialVersionUID = 1L;
- public OracleRowConverter(RowType rowType) {
+ public OracleDialectConverter(RowType rowType) {
super(rowType);
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleFactory.java
similarity index 83%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectFactory.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleFactory.java
index b7bc60ea..78f124b1 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleFactory.java
@@ -19,19 +19,19 @@
package org.apache.flink.connector.jdbc.databases.oracle.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectFactory;
+import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
/** Factory for {@link OracleDialect}. */
@Internal
-public class OracleDialectFactory implements JdbcDialectFactory {
+public class OracleFactory implements JdbcFactory {
@Override
public boolean acceptsURL(String url) {
return url.startsWith("jdbc:oracle:");
}
@Override
- public JdbcDialect create() {
+ public JdbcDialect createDialect() {
return new OracleDialect();
}
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialect.java
index d0924aee..6973e597 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialect.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialect.java
@@ -31,8 +31,8 @@ public class PostgresDialect extends AbstractPostgresCompatibleDialect {
private static final long serialVersionUID = 1L;
@Override
- public PostgresRowConverter getRowConverter(RowType rowType) {
- return new PostgresRowConverter(rowType);
+ public PostgresDialectConverter getRowConverter(RowType rowType) {
+ return new PostgresDialectConverter(rowType);
}
@Override
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresRowConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectConverter.java
similarity index 87%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresRowConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectConverter.java
index 2e6e14c2..7ac579a0 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresRowConverter.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectConverter.java
@@ -18,7 +18,7 @@
package org.apache.flink.connector.jdbc.databases.postgres.dialect;
-import org.apache.flink.connector.jdbc.converter.AbstractPostgresCompatibleRowConverter;
+import org.apache.flink.connector.jdbc.converter.AbstractPostgresCompatibleDialectConverter;
import org.apache.flink.table.types.logical.RowType;
import org.postgresql.jdbc.PgArray;
@@ -27,11 +27,11 @@ import org.postgresql.jdbc.PgArray;
* Runtime converter that responsible to convert between JDBC object and Flink internal object for
* PostgreSQL.
*/
-public class PostgresRowConverter extends AbstractPostgresCompatibleRowConverter<PgArray> {
+public class PostgresDialectConverter extends AbstractPostgresCompatibleDialectConverter<PgArray> {
private static final long serialVersionUID = 1L;
- public PostgresRowConverter(RowType rowType) {
+ public PostgresDialectConverter(RowType rowType) {
super(rowType);
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresFactory.java
similarity index 83%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectFactory.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresFactory.java
index 6286f144..5fe6df8f 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresFactory.java
@@ -19,19 +19,19 @@
package org.apache.flink.connector.jdbc.databases.postgres.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectFactory;
+import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
/** Factory for {@link PostgresDialect}. */
@Internal
-public class PostgresDialectFactory implements JdbcDialectFactory {
+public class PostgresFactory implements JdbcFactory {
@Override
public boolean acceptsURL(String url) {
return url.startsWith("jdbc:postgresql:");
}
@Override
- public JdbcDialect create() {
+ public JdbcDialect createDialect() {
return new PostgresDialect();
}
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialect.java
index 91469a6b..f19e6f89 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialect.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialect.java
@@ -19,8 +19,8 @@
package org.apache.flink.connector.jdbc.databases.sqlserver.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.converter.JdbcRowConverter;
-import org.apache.flink.connector.jdbc.dialect.AbstractDialect;
+import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialect;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
import org.apache.flink.table.types.logical.LogicalTypeRoot;
import org.apache.flink.table.types.logical.RowType;
@@ -126,8 +126,8 @@ public class SqlServerDialect extends AbstractDialect {
}
@Override
- public JdbcRowConverter getRowConverter(RowType rowType) {
- return new SqlServerRowConverter(rowType);
+ public JdbcDialectConverter getRowConverter(RowType rowType) {
+ return new SqlServerDialectConverter(rowType);
}
@Override
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerRowConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialectConverter.java
similarity index 88%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerRowConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialectConverter.java
index 5f3ac2b4..9c7451b0 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerRowConverter.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialectConverter.java
@@ -19,7 +19,7 @@
package org.apache.flink.connector.jdbc.databases.sqlserver.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.converter.AbstractJdbcRowConverter;
+import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialectConverter;
import org.apache.flink.table.types.logical.LogicalType;
import org.apache.flink.table.types.logical.RowType;
@@ -28,7 +28,7 @@ import org.apache.flink.table.types.logical.RowType;
* MsSql.
*/
@Internal
-public class SqlServerRowConverter extends AbstractJdbcRowConverter {
+public class SqlServerDialectConverter extends AbstractDialectConverter {
private static final long serialVersionUID = 1L;
@@ -37,7 +37,7 @@ public class SqlServerRowConverter extends AbstractJdbcRowConverter {
return "SqlServer";
}
- public SqlServerRowConverter(RowType rowType) {
+ public SqlServerDialectConverter(RowType rowType) {
super(rowType);
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialectFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerFactory.java
similarity index 83%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialectFactory.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerFactory.java
index 9b6ee18c..695cca72 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialectFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerFactory.java
@@ -19,19 +19,19 @@
package org.apache.flink.connector.jdbc.databases.sqlserver.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectFactory;
+import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
/** Factory for {@link SqlServerDialect}. */
@Internal
-public class SqlServerDialectFactory implements JdbcDialectFactory {
+public class SqlServerFactory implements JdbcFactory {
@Override
public boolean acceptsURL(String url) {
return url.startsWith("jdbc:sqlserver:");
}
@Override
- public JdbcDialect create() {
+ public JdbcDialect createDialect() {
return new SqlServerDialect();
}
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialect.java
index 041d24c3..5c02dda0 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialect.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialect.java
@@ -19,8 +19,8 @@
package org.apache.flink.connector.jdbc.databases.trino.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.converter.JdbcRowConverter;
-import org.apache.flink.connector.jdbc.dialect.AbstractDialect;
+import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialect;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
import org.apache.flink.table.types.logical.LogicalTypeRoot;
import org.apache.flink.table.types.logical.RowType;
@@ -45,8 +45,8 @@ public class TrinoDialect extends AbstractDialect {
private static final int MIN_DECIMAL_PRECISION = 1;
@Override
- public JdbcRowConverter getRowConverter(RowType rowType) {
- return new TrinoRowConverter(rowType);
+ public JdbcDialectConverter getRowConverter(RowType rowType) {
+ return new TrinoDialectConverter(rowType);
}
@Override
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoRowConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectConverter.java
similarity index 91%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoRowConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectConverter.java
index 92a839e9..a37d6e90 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoRowConverter.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectConverter.java
@@ -19,7 +19,7 @@
package org.apache.flink.connector.jdbc.databases.trino.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.converter.AbstractJdbcRowConverter;
+import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialectConverter;
import org.apache.flink.table.data.DecimalData;
import org.apache.flink.table.types.logical.DecimalType;
import org.apache.flink.table.types.logical.LogicalType;
@@ -32,11 +32,11 @@ import java.math.BigDecimal;
* Trino.
*/
@Internal
-public class TrinoRowConverter extends AbstractJdbcRowConverter {
+public class TrinoDialectConverter extends AbstractDialectConverter {
private static final long serialVersionUID = 1L;
- public TrinoRowConverter(RowType rowType) {
+ public TrinoDialectConverter(RowType rowType) {
super(rowType);
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoFactory.java
similarity index 83%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectFactory.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoFactory.java
index a0e2edda..9283b8b4 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoFactory.java
@@ -19,19 +19,19 @@
package org.apache.flink.connector.jdbc.databases.trino.dialect;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectFactory;
+import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
/** Factory for {@link TrinoDialect}. */
@Internal
-public class TrinoDialectFactory implements JdbcDialectFactory {
+public class TrinoFactory implements JdbcFactory {
@Override
public boolean acceptsURL(String url) {
return url.startsWith("jdbc:trino:");
}
@Override
- public JdbcDialect create() {
+ public JdbcDialect createDialect() {
return new TrinoDialect();
}
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractPostgresCompatibleDialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractPostgresCompatibleDialect.java
index 0ca425f3..2845c75b 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractPostgresCompatibleDialect.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractPostgresCompatibleDialect.java
@@ -18,6 +18,7 @@
package org.apache.flink.connector.jdbc.dialect;
+import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialect;
import org.apache.flink.table.types.logical.LogicalTypeRoot;
import java.util.Arrays;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableInsertOrUpdateStatementExecutor.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableInsertOrUpdateStatementExecutor.java
index 0842177f..17a25c6f 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableInsertOrUpdateStatementExecutor.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableInsertOrUpdateStatementExecutor.java
@@ -18,7 +18,7 @@
package org.apache.flink.connector.jdbc.internal.executor;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.converter.JdbcRowConverter;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
import org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatement;
import org.apache.flink.connector.jdbc.statement.StatementFactory;
import org.apache.flink.table.data.RowData;
@@ -43,9 +43,9 @@ public final class TableInsertOrUpdateStatementExecutor
private final StatementFactory insertStmtFactory;
private final StatementFactory updateStmtFactory;
- private final JdbcRowConverter existSetter;
- private final JdbcRowConverter insertSetter;
- private final JdbcRowConverter updateSetter;
+ private final JdbcDialectConverter existSetter;
+ private final JdbcDialectConverter insertSetter;
+ private final JdbcDialectConverter updateSetter;
private final Function<RowData, RowData> keyExtractor;
@@ -57,9 +57,9 @@ public final class TableInsertOrUpdateStatementExecutor
StatementFactory existStmtFactory,
StatementFactory insertStmtFactory,
StatementFactory updateStmtFactory,
- JdbcRowConverter existSetter,
- JdbcRowConverter insertSetter,
- JdbcRowConverter updateSetter,
+ JdbcDialectConverter existSetter,
+ JdbcDialectConverter insertSetter,
+ JdbcDialectConverter updateSetter,
Function<RowData, RowData> keyExtractor) {
this.existStmtFactory = checkNotNull(existStmtFactory);
this.insertStmtFactory = checkNotNull(insertStmtFactory);
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableSimpleStatementExecutor.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableSimpleStatementExecutor.java
index d7d74ba2..59866b51 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableSimpleStatementExecutor.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableSimpleStatementExecutor.java
@@ -18,7 +18,7 @@
package org.apache.flink.connector.jdbc.internal.executor;
-import org.apache.flink.connector.jdbc.converter.JdbcRowConverter;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
import org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatement;
import org.apache.flink.connector.jdbc.statement.StatementFactory;
import org.apache.flink.table.data.RowData;
@@ -35,7 +35,7 @@ import static org.apache.flink.util.Preconditions.checkNotNull;
public final class TableSimpleStatementExecutor implements JdbcBatchStatementExecutor<RowData> {
private final StatementFactory stmtFactory;
- private final JdbcRowConverter converter;
+ private final JdbcDialectConverter converter;
private transient FieldNamedPreparedStatement st;
@@ -43,7 +43,8 @@ public final class TableSimpleStatementExecutor implements JdbcBatchStatementExe
* Keep in mind object reuse: if it's on then key extractor may be required to return new
* object.
*/
- public TableSimpleStatementExecutor(StatementFactory stmtFactory, JdbcRowConverter converter) {
+ public TableSimpleStatementExecutor(
+ StatementFactory stmtFactory, JdbcDialectConverter converter) {
this.stmtFactory = checkNotNull(stmtFactory);
this.converter = checkNotNull(converter);
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/InternalJdbcConnectionOptions.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/InternalJdbcConnectionOptions.java
index 2083b437..753e5cab 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/InternalJdbcConnectionOptions.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/InternalJdbcConnectionOptions.java
@@ -20,8 +20,8 @@ package org.apache.flink.connector.jdbc.internal.options;
import org.apache.flink.annotation.Internal;
import org.apache.flink.connector.jdbc.JdbcConnectionOptions;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectLoader;
+import org.apache.flink.connector.jdbc.core.table.JdbcFactoryLoader;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
import org.apache.flink.util.Preconditions;
import javax.annotation.Nonnull;
@@ -179,7 +179,7 @@ public class InternalJdbcConnectionOptions extends JdbcConnectionOptions {
/**
* optional, Handle the SQL dialect of jdbc driver. If not set, it will be infer by {@link
- * JdbcDialectLoader#load} from DB url.
+ * JdbcFactoryLoader#load} from DB url.
*/
public Builder setDialect(JdbcDialect dialect) {
this.dialect = dialect;
@@ -205,7 +205,7 @@ public class InternalJdbcConnectionOptions extends JdbcConnectionOptions {
if (classLoader == null) {
classLoader = Thread.currentThread().getContextClassLoader();
}
- this.dialect = JdbcDialectLoader.load(dbURL, compatibleMode, classLoader);
+ this.dialect = JdbcFactoryLoader.loadDialect(dbURL, classLoader, compatibleMode);
}
if (this.driverName == null) {
Optional<String> optional = dialect.defaultDriverName();
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcDmlOptions.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcDmlOptions.java
index a889a679..776fe431 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcDmlOptions.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcDmlOptions.java
@@ -17,7 +17,7 @@
package org.apache.flink.connector.jdbc.internal.options;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
import org.apache.flink.util.Preconditions;
import javax.annotation.Nullable;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactory.java
index 58363a52..17ba340d 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactory.java
@@ -23,8 +23,8 @@ import org.apache.flink.configuration.ConfigOption;
import org.apache.flink.configuration.ConfigOptions;
import org.apache.flink.configuration.ReadableConfig;
import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectLoader;
+import org.apache.flink.connector.jdbc.core.table.JdbcFactoryLoader;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
import org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions;
import org.apache.flink.connector.jdbc.internal.options.JdbcDmlOptions;
import org.apache.flink.connector.jdbc.internal.options.JdbcReadOptions;
@@ -131,7 +131,7 @@ public class JdbcDynamicTableFactory implements DynamicTableSourceFactory, Dynam
private static void validateDataTypeWithJdbcDialect(
DataType dataType, String url, String compatibleMode, ClassLoader classLoader) {
- final JdbcDialect dialect = JdbcDialectLoader.load(url, compatibleMode, classLoader);
+ final JdbcDialect dialect = JdbcFactoryLoader.loadDialect(url, classLoader, compatibleMode);
dialect.validate((RowType) dataType.getLogicalType());
}
@@ -144,8 +144,8 @@ public class JdbcDynamicTableFactory implements DynamicTableSourceFactory, Dynam
.setDBUrl(url)
.setTableName(readableConfig.get(TABLE_NAME))
.setDialect(
- JdbcDialectLoader.load(
- url, readableConfig.get(COMPATIBLE_MODE), classLoader))
+ JdbcFactoryLoader.loadDialect(
+ url, classLoader, readableConfig.get(COMPATIBLE_MODE)))
.setParallelism(readableConfig.getOptional(SINK_PARALLELISM).orElse(null))
.setConnectionCheckTimeoutSeconds(
(int) readableConfig.get(MAX_RETRY_TIMEOUT).getSeconds());
@@ -283,7 +283,7 @@ public class JdbcDynamicTableFactory implements DynamicTableSourceFactory, Dynam
private void validateConfigOptions(ReadableConfig config, ClassLoader classLoader) {
String jdbcUrl = config.get(URL);
- JdbcDialectLoader.load(jdbcUrl, config.get(COMPATIBLE_MODE), classLoader);
+ JdbcFactoryLoader.loadDialect(jdbcUrl, classLoader, config.get(COMPATIBLE_MODE));
checkAllOrNone(config, new ConfigOption[] {USERNAME, PASSWORD});
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSource.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSource.java
index c8ef2e33..bc2c1732 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSource.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSource.java
@@ -19,7 +19,7 @@
package org.apache.flink.connector.jdbc.table;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
import org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions;
import org.apache.flink.connector.jdbc.internal.options.JdbcReadOptions;
import org.apache.flink.connector.jdbc.split.CompositeJdbcParameterValuesProvider;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatBuilder.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatBuilder.java
index 745d2c02..554aaaf2 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatBuilder.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatBuilder.java
@@ -19,9 +19,9 @@
package org.apache.flink.connector.jdbc.table;
import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
-import org.apache.flink.connector.jdbc.converter.JdbcRowConverter;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
import org.apache.flink.connector.jdbc.datasource.connections.SimpleJdbcConnectionProvider;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
import org.apache.flink.connector.jdbc.internal.JdbcOutputFormat;
import org.apache.flink.connector.jdbc.internal.executor.JdbcBatchStatementExecutor;
import org.apache.flink.connector.jdbc.internal.executor.TableBufferReducedStatementExecutor;
@@ -174,7 +174,7 @@ public class JdbcOutputFormatBuilder implements Serializable {
private static JdbcBatchStatementExecutor<RowData> createSimpleRowExecutor(
JdbcDialect dialect, String[] fieldNames, LogicalType[] fieldTypes, final String sql) {
- final JdbcRowConverter rowConverter = dialect.getRowConverter(RowType.of(fieldTypes));
+ final JdbcDialectConverter rowConverter = dialect.getRowConverter(RowType.of(fieldTypes));
return new TableSimpleStatementExecutor(
connection ->
FieldNamedPreparedStatement.prepareStatement(connection, sql, fieldNames),
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormat.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormat.java
index 7e5dc2a3..a4990a73 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormat.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormat.java
@@ -27,7 +27,7 @@ import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.api.java.typeutils.ResultTypeQueryable;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.connector.jdbc.JdbcConnectionOptions;
-import org.apache.flink.connector.jdbc.converter.JdbcRowConverter;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
import org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider;
import org.apache.flink.connector.jdbc.datasource.connections.SimpleJdbcConnectionProvider;
import org.apache.flink.connector.jdbc.split.JdbcParameterValuesProvider;
@@ -67,7 +67,7 @@ public class JdbcRowDataInputFormat extends RichInputFormat<RowData, InputSplit>
private String queryTemplate;
private int resultSetType;
private int resultSetConcurrency;
- private JdbcRowConverter rowConverter;
+ private JdbcDialectConverter rowConverter;
private TypeInformation<RowData> rowDataTypeInfo;
private transient PreparedStatement statement;
@@ -82,7 +82,7 @@ public class JdbcRowDataInputFormat extends RichInputFormat<RowData, InputSplit>
String queryTemplate,
int resultSetType,
int resultSetConcurrency,
- JdbcRowConverter rowConverter,
+ JdbcDialectConverter rowConverter,
TypeInformation<RowData> rowDataTypeInfo) {
this.connectionProvider = connectionProvider;
this.fetchSize = fetchSize;
@@ -303,7 +303,7 @@ public class JdbcRowDataInputFormat extends RichInputFormat<RowData, InputSplit>
private Boolean autoCommit;
private Object[][] parameterValues;
private String queryTemplate;
- private JdbcRowConverter rowConverter;
+ private JdbcDialectConverter rowConverter;
private TypeInformation<RowData> rowDataTypeInfo;
private int resultSetType = ResultSet.TYPE_FORWARD_ONLY;
private int resultSetConcurrency = ResultSet.CONCUR_READ_ONLY;
@@ -347,7 +347,7 @@ public class JdbcRowDataInputFormat extends RichInputFormat<RowData, InputSplit>
return this;
}
- public Builder setRowConverter(JdbcRowConverter rowConverter) {
+ public Builder setRowConverter(JdbcDialectConverter rowConverter) {
this.rowConverter = rowConverter;
return this;
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunction.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunction.java
index 23ddf3c7..d3e95b31 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunction.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunction.java
@@ -20,10 +20,10 @@ package org.apache.flink.connector.jdbc.table;
import org.apache.flink.annotation.Internal;
import org.apache.flink.annotation.VisibleForTesting;
-import org.apache.flink.connector.jdbc.converter.JdbcRowConverter;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
import org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider;
import org.apache.flink.connector.jdbc.datasource.connections.SimpleJdbcConnectionProvider;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
import org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions;
import org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatement;
import org.apache.flink.table.data.RowData;
@@ -62,8 +62,8 @@ public class JdbcRowDataLookupFunction extends LookupFunction {
private final JdbcConnectionProvider connectionProvider;
private final String[] keyNames;
private final int maxRetryTimes;
- private final JdbcRowConverter jdbcRowConverter;
- private final JdbcRowConverter lookupKeyRowConverter;
+ private final JdbcDialectConverter jdbcDialectConverter;
+ private final JdbcDialectConverter lookupKeyRowConverter;
private final List<String> resolvedPredicates;
private final Serializable[] pushdownParams;
@@ -105,7 +105,7 @@ public class JdbcRowDataLookupFunction extends LookupFunction {
options.getDialect()
.getSelectFromStatement(options.getTableName(), fieldNames, keyNames);
JdbcDialect jdbcDialect = options.getDialect();
- this.jdbcRowConverter = jdbcDialect.getRowConverter(rowType);
+ this.jdbcDialectConverter = jdbcDialect.getRowConverter(rowType);
this.lookupKeyRowConverter =
jdbcDialect.getRowConverter(
RowType.of(
@@ -151,7 +151,7 @@ public class JdbcRowDataLookupFunction extends LookupFunction {
try (ResultSet resultSet = statement.executeQuery()) {
ArrayList<RowData> rows = new ArrayList<>();
while (resultSet.next()) {
- RowData row = jdbcRowConverter.toInternal(resultSet);
+ RowData row = jdbcDialectConverter.toInternal(resultSet);
rows.add(row);
}
rows.trimToSize();
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/RowDataResultExtractor.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/RowDataResultExtractor.java
index 6a191f5a..3fc1e422 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/RowDataResultExtractor.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/RowDataResultExtractor.java
@@ -18,7 +18,7 @@
package org.apache.flink.connector.jdbc.table;
-import org.apache.flink.connector.jdbc.converter.JdbcRowConverter;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
import org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor;
import org.apache.flink.table.data.RowData;
import org.apache.flink.util.Preconditions;
@@ -29,14 +29,14 @@ import java.sql.SQLException;
/** The result extractor for {@link RowData}. */
public class RowDataResultExtractor implements ResultExtractor<RowData> {
- private final JdbcRowConverter jdbcRowConverter;
+ private final JdbcDialectConverter jdbcDialectConverter;
- public RowDataResultExtractor(JdbcRowConverter jdbcRowConverter) {
- this.jdbcRowConverter = Preconditions.checkNotNull(jdbcRowConverter);
+ public RowDataResultExtractor(JdbcDialectConverter jdbcDialectConverter) {
+ this.jdbcDialectConverter = Preconditions.checkNotNull(jdbcDialectConverter);
}
@Override
public RowData extract(ResultSet resultSet) throws SQLException {
- return jdbcRowConverter.toInternal(resultSet);
+ return jdbcDialectConverter.toInternal(resultSet);
}
}
diff --git a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.dialect.JdbcDialectFactory b/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
similarity index 69%
rename from flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.dialect.JdbcDialectFactory
rename to flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
index 9a3cf26c..13eecd1a 100644
--- a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.dialect.JdbcDialectFactory
+++ b/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
@@ -13,12 +13,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.flink.connector.jdbc.databases.derby.dialect.DerbyDialectFactory
-org.apache.flink.connector.jdbc.databases.mysql.dialect.MySqlDialectFactory
-org.apache.flink.connector.jdbc.databases.oceanbase.dialect.OceanBaseDialectFactory
-org.apache.flink.connector.jdbc.databases.postgres.dialect.PostgresDialectFactory
-org.apache.flink.connector.jdbc.databases.oracle.dialect.OracleDialectFactory
-org.apache.flink.connector.jdbc.databases.sqlserver.dialect.SqlServerDialectFactory
-org.apache.flink.connector.jdbc.databases.cratedb.dialect.CrateDBDialectFactory
-org.apache.flink.connector.jdbc.databases.db2.dialect.Db2DialectFactory
-org.apache.flink.connector.jdbc.databases.trino.dialect.TrinoDialectFactory
+org.apache.flink.connector.jdbc.databases.derby.dialect.DerbyFactory
+org.apache.flink.connector.jdbc.databases.mysql.dialect.MySqlFactory
+org.apache.flink.connector.jdbc.databases.oceanbase.dialect.OceanBaseFactory
+org.apache.flink.connector.jdbc.databases.postgres.dialect.PostgresFactory
+org.apache.flink.connector.jdbc.databases.oracle.dialect.OracleFactory
+org.apache.flink.connector.jdbc.databases.sqlserver.dialect.SqlServerFactory
+org.apache.flink.connector.jdbc.databases.cratedb.dialect.CrateDBFactory
+org.apache.flink.connector.jdbc.databases.db2.dialect.Db2Factory
+org.apache.flink.connector.jdbc.databases.trino.dialect.TrinoFactory
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverterTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/converter/AbstractDialectConverterTest.java
similarity index 85%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverterTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/converter/AbstractDialectConverterTest.java
index 9f9fee1e..bfb77392 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverterTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/converter/AbstractDialectConverterTest.java
@@ -18,6 +18,8 @@
package org.apache.flink.connector.jdbc.converter;
+import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialectConverter;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
import org.apache.flink.table.data.RowData;
import org.apache.flink.table.types.logical.IntType;
import org.apache.flink.table.types.logical.RowType;
@@ -31,14 +33,14 @@ import java.time.LocalDateTime;
import static org.assertj.core.api.Assertions.assertThat;
-/** Test for {@link AbstractJdbcRowConverter}. */
-class AbstractJdbcRowConverterTest {
+/** Test for {@link AbstractDialectConverter}. */
+class AbstractDialectConverterTest {
@Test
void testExternalLocalDateTimeToTimestamp() throws Exception {
RowType rowType = RowType.of(new IntType(), new TimestampType(3));
- JdbcRowConverter rowConverter =
- new AbstractJdbcRowConverter(rowType) {
+ JdbcDialectConverter rowConverter =
+ new AbstractDialectConverter(rowType) {
private static final long serialVersionUID = 1L;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2PreparedStatementTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2PreparedStatementTest.java
index 162c3bc1..8a8ea588 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2PreparedStatementTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2PreparedStatementTest.java
@@ -18,8 +18,8 @@
package org.apache.flink.connector.jdbc.databases.db2.dialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectLoader;
+import org.apache.flink.connector.jdbc.core.table.JdbcFactoryLoader;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
import org.junit.jupiter.api.Test;
@@ -29,7 +29,8 @@ import static org.assertj.core.api.Assertions.assertThat;
class Db2PreparedStatementTest {
private final JdbcDialect dialect =
- JdbcDialectLoader.load("jdbc:db2://localhost:3306/test", getClass().getClassLoader());
+ JdbcFactoryLoader.loadDialect(
+ "jdbc:db2://localhost:3306/test", getClass().getClassLoader());
private final String[] fieldNames =
new String[] {"id", "name", "email", "ts", "field1", "field_2", "__field_3__"};
private final String[] keyFields = new String[] {"id", "__field_3__"};
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OraclePreparedStatementTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OraclePreparedStatementTest.java
index f69f6a33..372493b2 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OraclePreparedStatementTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OraclePreparedStatementTest.java
@@ -18,8 +18,8 @@
package org.apache.flink.connector.jdbc.databases.oracle.dialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectLoader;
+import org.apache.flink.connector.jdbc.core.table.JdbcFactoryLoader;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
import org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatementImpl;
import org.junit.jupiter.api.Test;
@@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
class OraclePreparedStatementTest {
private final JdbcDialect dialect =
- JdbcDialectLoader.load(
+ JdbcFactoryLoader.loadDialect(
"jdbc:oracle://localhost:3306/test", getClass().getClassLoader());
private final String[] fieldNames =
new String[] {"id", "name", "email", "ts", "field1", "field_2", "__field_3__"};
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerPreparedStatementTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerPreparedStatementTest.java
index 33fc3ed3..fbe57835 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerPreparedStatementTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerPreparedStatementTest.java
@@ -18,8 +18,8 @@
package org.apache.flink.connector.jdbc.databases.sqlserver.dialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectLoader;
+import org.apache.flink.connector.jdbc.core.table.JdbcFactoryLoader;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
import org.junit.jupiter.api.Test;
@@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat;
class SqlServerPreparedStatementTest {
private final JdbcDialect dialect =
- JdbcDialectLoader.load(
+ JdbcFactoryLoader.loadDialect(
"jdbc:sqlserver://localhost:3306/test", getClass().getClassLoader());
private final String[] fieldNames =
new String[] {"id", "name", "email", "ts", "field1", "field_2", "__field_3__"};
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoPreparedStatementTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoPreparedStatementTest.java
index 847f1a7f..8b3d9854 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoPreparedStatementTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoPreparedStatementTest.java
@@ -18,8 +18,8 @@
package org.apache.flink.connector.jdbc.databases.trino.dialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectLoader;
+import org.apache.flink.connector.jdbc.core.table.JdbcFactoryLoader;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
import org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatementImpl;
import org.junit.jupiter.api.Test;
@@ -37,7 +37,8 @@ import static org.assertj.core.api.Assertions.assertThat;
class TrinoPreparedStatementTest {
private final JdbcDialect dialect =
- JdbcDialectLoader.load("jdbc:trino://localhost:3306/test", getClass().getClassLoader());
+ JdbcFactoryLoader.loadDialect(
+ "jdbc:trino://localhost:3306/test", getClass().getClassLoader());
private final String[] fieldNames =
new String[] {"id", "name", "email", "ts", "field1", "field_2", "__field_3__"};
private final String[] keyFields = new String[] {"id", "__field_3__"};
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatementImplTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatementImplTest.java
index b1d5684e..ff969b7d 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatementImplTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatementImplTest.java
@@ -18,8 +18,8 @@
package org.apache.flink.connector.jdbc.statement;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectLoader;
+import org.apache.flink.connector.jdbc.core.table.JdbcFactoryLoader;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
import org.junit.jupiter.api.Test;
@@ -35,7 +35,8 @@ import static org.assertj.core.api.Assertions.assertThat;
class FieldNamedPreparedStatementImplTest {
private final JdbcDialect dialect =
- JdbcDialectLoader.load("jdbc:mysql://localhost:3306/test", getClass().getClassLoader());
+ JdbcFactoryLoader.loadDialect(
+ "jdbc:mysql://localhost:3306/test", getClass().getClassLoader());
private final String[] fieldNames =
new String[] {"id", "name", "email", "ts", "field1", "field_2", "__field_3__"};
private final String[] keyFields = new String[] {"id", "__field_3__"};
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcAppendOnlyWriterTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcAppendOnlyWriterTest.java
index 7209dbfa..cad629f0 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcAppendOnlyWriterTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcAppendOnlyWriterTest.java
@@ -20,7 +20,7 @@ package org.apache.flink.connector.jdbc.table;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.connector.jdbc.JdbcTestBase;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectLoader;
+import org.apache.flink.connector.jdbc.core.table.JdbcFactoryLoader;
import org.apache.flink.connector.jdbc.internal.JdbcOutputFormat;
import org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer;
import org.apache.flink.connector.jdbc.internal.RowJdbcOutputFormat;
@@ -62,7 +62,7 @@ class JdbcAppendOnlyWriterTest extends JdbcTestBase {
InternalJdbcConnectionOptions.builder()
.setDBUrl(getMetadata().getJdbcUrl())
.setDialect(
- JdbcDialectLoader.load(
+ JdbcFactoryLoader.loadDialect(
getMetadata()
.getJdbcUrl(),
getClass()
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcFilterPushdownPreparedStatementVisitorTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcFilterPushdownPreparedStatementVisitorTest.java
index ec08391d..147a254e 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcFilterPushdownPreparedStatementVisitorTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcFilterPushdownPreparedStatementVisitorTest.java
@@ -19,8 +19,8 @@
package org.apache.flink.connector.jdbc.table;
import org.apache.flink.connector.jdbc.JdbcTestBase;
-import org.apache.flink.connector.jdbc.databases.derby.dialect.DerbyDialectFactory;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.databases.derby.dialect.DerbyFactory;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.table.api.TableEnvironment;
import org.apache.flink.table.api.TableException;
@@ -221,7 +221,7 @@ class JdbcFilterPushdownPreparedStatementVisitorTest {
Serializable[] expectedParams) {
List<ResolvedExpression> resolved = resolveSQLFilterToExpression(inputExpr, schema);
assertThat(resolved.size()).isEqualTo(1);
- JdbcDialect dialect = new DerbyDialectFactory().create();
+ JdbcDialect dialect = new DerbyFactory().createDialect();
JdbcFilterPushdownPreparedStatementVisitor visitor =
new JdbcFilterPushdownPreparedStatementVisitor(dialect::quoteIdentifier);
ParameterizedPredicate pred = resolved.get(0).accept(visitor).get();
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormatTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormatTest.java
index b2e4deea..3f8d19ea 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormatTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormatTest.java
@@ -20,7 +20,7 @@ package org.apache.flink.connector.jdbc.table;
import org.apache.flink.connector.jdbc.JdbcDataTestBase;
import org.apache.flink.connector.jdbc.JdbcTestFixture;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
import org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions;
import org.apache.flink.connector.jdbc.split.JdbcGenericParameterValuesProvider;
import org.apache.flink.connector.jdbc.split.JdbcNumericBetweenParametersProvider;
diff --git a/flink-connector-jdbc/pom.xml b/flink-connector-jdbc/pom.xml
index 68d05f08..5e507f93 100644
--- a/flink-connector-jdbc/pom.xml
+++ b/flink-connector-jdbc/pom.xml
@@ -42,6 +42,22 @@ under the License.
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-annotations</artifactId>
+ <version>${flink.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-core</artifactId>
+ <version>${flink.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-common</artifactId>
+ <version>${flink.version}</version>
+ </dependency>
+
</dependencies>
<build>
@@ -60,7 +76,11 @@ under the License.
<shadeTestJar>true</shadeTestJar>
<artifactSet>
<excludes>
+ <exclude>org.apache.flink:flink-annotations</exclude>
+ <exclude>org.apache.flink:flink-core</exclude>
<exclude>org.apache.flink:flink-connector-base</exclude>
+ <exclude>org.apache.flink:flink-table-common</exclude>
+ <exclude>org.apache.flink:flink-connector-jdbc-core:tests</exclude>
</excludes>
</artifactSet>
<filters combine.children="append">
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySQLRowConverter.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java
similarity index 61%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySQLRowConverter.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java
index ef5d0fd7..f45f0c09 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySQLRowConverter.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java
@@ -16,27 +16,19 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.mysql.dialect;
+package org.apache.flink.connector.jdbc.converter;
-import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.converter.AbstractJdbcRowConverter;
+import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialectConverter;
import org.apache.flink.table.types.logical.RowType;
/**
- * Runtime converter that responsible to convert between JDBC object and Flink internal object for
- * MySQL.
- */
-@Internal
-public class MySQLRowConverter extends AbstractJdbcRowConverter {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public String converterName() {
- return "MySQL";
- }
-
- public MySQLRowConverter(RowType rowType) {
+ * Base class for all converters that convert between JDBC object and Flink internal object.
+ *
+ * @deprecated use AbstractDialectConverter
+ * */
+@Deprecated
+public abstract class AbstractJdbcRowConverter extends AbstractDialectConverter {
+ public AbstractJdbcRowConverter(RowType rowType) {
super(rowType);
}
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectFactory.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/JdbcRowConverter.java
similarity index 59%
copy from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectFactory.java
copy to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/JdbcRowConverter.java
index c3a21829..923fe222 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectFactory.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/JdbcRowConverter.java
@@ -16,22 +16,18 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.db2.dialect;
+package org.apache.flink.connector.jdbc.converter;
-import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectFactory;
+import org.apache.flink.annotation.PublicEvolving;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
+import org.apache.flink.table.data.RowData;
-/** Factory for {@link Db2Dialect}. */
-@Internal
-public class Db2DialectFactory implements JdbcDialectFactory {
- @Override
- public boolean acceptsURL(String url) {
- return url.startsWith("jdbc:db2:");
- }
-
- @Override
- public JdbcDialect create() {
- return new Db2Dialect();
- }
-}
+/**
+ * Converter that is responsible to convert between JDBC object and Flink SQL internal data
+ * structure {@link RowData}.
+ *
+ * @deprecated use JdbcDialectConverter
+ */
+@Deprecated
+@PublicEvolving
+public interface JdbcRowConverter extends JdbcDialectConverter {}
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractDialect.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractDialect.java
new file mode 100644
index 00000000..28b2d8a2
--- /dev/null
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractDialect.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.connector.jdbc.dialect;
+
+import org.apache.flink.annotation.PublicEvolving;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+
+/**
+ * Base class for {@link JdbcDialect JdbcDialects} that implements basic data type validation and
+ * the construction of basic {@code INSERT}, {@code UPDATE}, {@code DELETE}, and {@code SELECT}
+ * statements.
+ *
+ * <p>Implementors should be careful to check the default SQL statements are performant for their
+ * specific dialect and override them if necessary.
+ *
+ * @deprecated use org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialect
+ */
+@Deprecated
+@PublicEvolving
+public abstract class AbstractDialect
+ extends org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialect
+ implements org.apache.flink.connector.jdbc.dialect.JdbcDialect {}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectFactory.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialect.java
similarity index 59%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectFactory.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialect.java
index c3a21829..54a61d4c 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectFactory.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialect.java
@@ -16,22 +16,19 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.databases.db2.dialect;
+package org.apache.flink.connector.jdbc.dialect;
-import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectFactory;
+import org.apache.flink.annotation.PublicEvolving;
+import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
-/** Factory for {@link Db2Dialect}. */
-@Internal
-public class Db2DialectFactory implements JdbcDialectFactory {
- @Override
- public boolean acceptsURL(String url) {
- return url.startsWith("jdbc:db2:");
- }
-
- @Override
- public JdbcDialect create() {
- return new Db2Dialect();
- }
-}
+/**
+ * Represents a dialect of SQL implemented by a particular JDBC system. Dialects should be immutable
+ * and stateless.
+ *
+ * @see JdbcFactory
+ * @deprecated use org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect
+ */
+@Deprecated
+@PublicEvolving
+public interface JdbcDialect
+ extends org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect {}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectFactory.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectFactory.java
similarity index 50%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectFactory.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectFactory.java
index 84f4bd78..3fc31c49 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectFactory.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectFactory.java
@@ -18,41 +18,34 @@
package org.apache.flink.connector.jdbc.dialect;
-import org.apache.flink.annotation.PublicEvolving;
+import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
import org.apache.flink.util.StringUtils;
/**
- * A factory to create a specific {@link JdbcDialect}. This factory is used with Java's Service
- * Provider Interfaces (SPI) for discovering.
+ * A factory to create a specific {@link org.apache.flink.connector.jdbc.dialect.JdbcDialect}. This
+ * factory is used with Java's Service Provider Interfaces (SPI) for discovering.
*
* <p>Classes that implement this interface can be added to the
- * "META_INF/services/org.apache.flink.connector.jdbc.dialect.JdbcDialectFactory" file of a JAR file
- * in the current classpath to be found.
+ * "META_INF/services/org.apache.flink.connector.jdbc.JdbcDialectFactory" file of a JAR file in the
+ * current classpath to be found.
*
- * @see JdbcDialect
+ * @see org.apache.flink.connector.jdbc.dialect.JdbcDialect
+ * @deprecated use JdbcFactory
*/
-@PublicEvolving
-public interface JdbcDialectFactory {
+@Deprecated
+public interface JdbcDialectFactory extends JdbcFactory {
/**
- * Retrieves whether the dialect thinks that it can open a connection to the given URL.
- * Typically, dialects will return <code>true</code> if they understand the sub-protocol
- * specified in the URL and <code>false</code> if they do not.
- *
- * @param url the URL of the database
- * @return <code>true</code> if this dialect understands the given URL; <code>false</code>
- * otherwise.
+ * @deprecated
+ * @return Creates a new instance of the {@link
+ * org.apache.flink.connector.jdbc.dialect.JdbcDialect}.
*/
- boolean acceptsURL(String url);
-
- /** @return Creates a new instance of the {@link JdbcDialect}. */
JdbcDialect create();
/**
- * Creates a new instance of the {@link JdbcDialect} based on compatible mode.
- *
+ * @deprecated
* @param compatibleMode the compatible mode of database
- * @return a new instance of {@link JdbcDialect}
+ * @return a new instance of {@link org.apache.flink.connector.jdbc.dialect.JdbcDialect}
*/
default JdbcDialect create(String compatibleMode) {
if (StringUtils.isNullOrWhitespaceOnly(compatibleMode)) {
@@ -61,4 +54,22 @@ public interface JdbcDialectFactory {
throw new UnsupportedOperationException(
"Not supported option 'compatible-mode' with value: " + compatibleMode);
}
+
+ /**
+ * @return a new instance of the {@link org.apache.flink.connector.jdbc.dialect.JdbcDialect}.
+ */
+ default JdbcDialect createDialect() {
+ return create();
+ }
+
+ /**
+ * Creates a new instance of the {@link org.apache.flink.connector.jdbc.dialect.JdbcDialect}
+ * based on compatible mode.
+ *
+ * @param compatibleMode the compatible mode of database
+ * @return a new instance of {@link org.apache.flink.connector.jdbc.dialect.JdbcDialect}
+ */
+ default JdbcDialect createDialect(String compatibleMode) {
+ return create(compatibleMode);
+ }
}
(flink-connector-jdbc) 01/14: [FLINK-35370] Add temp module to test backward compatibility
Posted by fa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git
commit 26655e5e8864511d20208ebf6d8a2d0314a4c4b2
Author: Joao Boto <bo...@boto.pro>
AuthorDate: Fri May 24 17:22:07 2024 +0200
[FLINK-35370] Add temp module to test backward compatibility
---
.github/workflows/backwards_compatibility.yml | 103 ++++
.../pom.xml | 86 +++
.../backward/compatibility/DataStreamSinkTest.java | 125 +++++
.../compatibility/DataStreamSourceTest.java | 199 +++++++
.../compatibility/DynamicTableSinkTest.java | 327 +++++++++++
.../compatibility/DynamicTableSourceTest.java | 605 +++++++++++++++++++++
.../src/test/resources/log4j2-test.properties | 28 +
7 files changed, 1473 insertions(+)
diff --git a/.github/workflows/backwards_compatibility.yml b/.github/workflows/backwards_compatibility.yml
new file mode 100644
index 00000000..139b3d9e
--- /dev/null
+++ b/.github/workflows/backwards_compatibility.yml
@@ -0,0 +1,103 @@
+################################################################################
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+################################################################################
+
+# We need to specify repo related information here since Apache INFRA doesn't differentiate
+# between several workflows with the same names while preparing a report for GHA usage
+# https://infra-reports.apache.org/#ghactions
+name: Flink Connector JDBC CI Backwards Compatibility
+on: [push, pull_request]
+concurrency:
+ group: ${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: true
+jobs:
+ backwards_compatibility_test:
+ runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ flink: [1.18-SNAPSHOT, 1.19-SNAPSHOT]
+ jdk: [8, 11, 17]
+
+ env:
+ MVN_CONNECTION_OPTIONS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120
+ FLINK_CACHE_DIR: "/tmp/cache/flink"
+ MVN_BUILD_OUTPUT_FILE: "/tmp/mvn_build_output.out"
+ MVN_VALIDATION_DIR: "/tmp/flink-validation-deployment"
+
+ steps:
+ - name: Check out repository code
+ uses: actions/checkout@v4
+
+ - name: Set JDK
+ uses: actions/setup-java@v4
+ with:
+ java-version: ${{ matrix.jdk }}
+ distribution: 'temurin'
+ cache: 'maven'
+
+ - name: Set Maven 3.8.6
+ uses: stCarolas/setup-maven@v5
+ with:
+ maven-version: 3.8.6
+
+ - name: "Determine Flink binary url"
+ run: |
+ binary_url=""
+ if [[ "${{ matrix.flink }}" = *-SNAPSHOT ]]; then
+ binary_url=https://s3.amazonaws.com/flink-nightly/flink-${{ matrix.flink }}-bin-scala_2.12.tgz
+ cache_binary=false
+ else
+ binary_url=https://archive.apache.org/dist/flink/flink-${{ matrix.flink }}/flink-${{ matrix.flink }}-bin-scala_2.12.tgz
+ cache_binary=true
+ fi
+ echo "binary_url=$binary_url" >> ${GITHUB_ENV}
+
+ - name: "Print Flink binary url / caching"
+ run: echo "${{ env.binary_url }} / caching=${{ env.cache_binary }}"
+
+ - name: Create cache dirs
+ run: mkdir -p ${{ env.FLINK_CACHE_DIR }}
+
+ - name: Download Flink binary
+ working-directory: ${{ env.FLINK_CACHE_DIR }}
+ run: wget -q -c ${{ env.binary_url }} -O - | tar -xz
+
+ - name: Install JDBC Libs
+ run: |
+ set -o pipefail
+
+ mvn clean install -U -B --no-transfer-progress -Dflink.version=${{ matrix.flink }} \
+ -DskipTests \
+ -DaltDeploymentRepository=validation_repository::default::file:${{ env.MVN_VALIDATION_DIR }} \
+ -Dscala-2.12 \
+ -DdistDir=${{ env.FLINK_CACHE_DIR }}/flink-${{ matrix.flink }} \
+ ${{ env.MVN_CONNECTION_OPTIONS }} \
+ -Dlog4j.configurationFile=file://$(pwd)/tools/ci/log4j.properties \
+ | tee ${{ env.MVN_BUILD_OUTPUT_FILE }}
+
+ - name: Test backwards compatibility
+ working-directory: ./flink-connector-jdbc-backward-compatibility
+ run: |
+ set -o pipefail
+
+ mvn clean test -U -B --no-transfer-progress -Dflink.version=${{ matrix.flink }} \
+ -DaltDeploymentRepository=validation_repository::default::file:${{ env.MVN_VALIDATION_DIR }} \
+ -Dscala-2.12 \
+ -DdistDir=${{ env.FLINK_CACHE_DIR }}/flink-${{ matrix.flink }} \
+ ${{ env.MVN_CONNECTION_OPTIONS }} \
+ -Dlog4j.configurationFile=file://$(pwd)/tools/ci/log4j.properties \
+ | tee ${{ env.MVN_BUILD_OUTPUT_FILE }}
\ No newline at end of file
diff --git a/flink-connector-jdbc-backward-compatibility/pom.xml b/flink-connector-jdbc-backward-compatibility/pom.xml
new file mode 100644
index 00000000..ac8c9874
--- /dev/null
+++ b/flink-connector-jdbc-backward-compatibility/pom.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-parent</artifactId>
+ <version>3.2-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-backward-compatibility</artifactId>
+ <version>3.2-SNAPSHOT</version>
+ <name>Flink : Connectors : JDBC : Backward Compatibility</name>
+ <packaging>jar</packaging>
+
+ <properties>
+ <surefire.module.config>
+ --add-opens=java.base/java.util=ALL-UNNAMED
+ --add-opens=java.base/java.lang=ALL-UNNAMED
+ </surefire.module.config>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-api-java</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_2.12</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_2.12</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-common</artifactId>
+ <version>${flink.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-test-utils</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>${testcontainers.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>42.7.3</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DataStreamSinkTest.java b/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DataStreamSinkTest.java
new file mode 100644
index 00000000..30f97812
--- /dev/null
+++ b/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DataStreamSinkTest.java
@@ -0,0 +1,125 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.connector.jdbc.backward.compatibility;
+
+import org.apache.flink.api.common.restartstrategy.RestartStrategies;
+import org.apache.flink.connector.jdbc.JdbcConnectionOptions;
+import org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions;
+import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
+import org.apache.flink.connector.jdbc.JdbcSink;
+import org.apache.flink.connector.jdbc.databases.postgres.PostgresTestBase;
+import org.apache.flink.connector.jdbc.testutils.TableManaged;
+import org.apache.flink.connector.jdbc.testutils.tables.templates.BooksTable;
+import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration;
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
+import org.apache.flink.test.junit5.MiniClusterExtension;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.apache.flink.connector.jdbc.JdbcTestFixture.TEST_DATA;
+import static org.assertj.core.api.Assertions.assertThat;
+
+/** Test for backward compatibility. */
+public class DataStreamSinkTest implements PostgresTestBase {
+
+ private static final BooksTable TEST_TABLE = new BooksTable("SinkTable");
+
+ private static final List<BooksTable.BookEntry> BOOKS =
+ Arrays.stream(TEST_DATA)
+ .map(
+ book ->
+ new BooksTable.BookEntry(
+ book.id, book.title, book.author, book.price, book.qty))
+ .collect(Collectors.toList());
+
+ @Override
+ public List<TableManaged> getManagedTables() {
+ return Collections.singletonList(TEST_TABLE);
+ }
+
+ @RegisterExtension
+ static final MiniClusterExtension MINI_CLUSTER =
+ new MiniClusterExtension(
+ new MiniClusterResourceConfiguration.Builder()
+ .setNumberTaskManagers(2)
+ .setNumberSlotsPerTaskManager(2)
+ .build());
+
+ @Test
+ public void testAtLeastOnce() throws Exception {
+ StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
+ env.setRestartStrategy(new RestartStrategies.NoRestartStrategyConfiguration());
+ env.setParallelism(1);
+
+ assertResult(new ArrayList<>());
+
+ env.fromCollection(BOOKS)
+ .sinkTo(
+ JdbcSink.<BooksTable.BookEntry>builder()
+ .withQueryStatement(
+ TEST_TABLE.getInsertIntoQuery(),
+ TEST_TABLE.getStatementBuilder())
+ .buildAtLeastOnce(
+ new JdbcConnectionOptions.JdbcConnectionOptionsBuilder()
+ .withUrl(getMetadata().getJdbcUrl())
+ .withUsername(getMetadata().getUsername())
+ .withPassword(getMetadata().getPassword())
+ .withDriverName(getMetadata().getDriverClass())
+ .build()));
+ env.execute();
+
+ assertResult(BOOKS);
+ }
+
+ @Test
+ public void testExactlyOnce() throws Exception {
+ StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
+ env.setRestartStrategy(new RestartStrategies.NoRestartStrategyConfiguration());
+ env.setParallelism(1);
+
+ assertResult(new ArrayList<>());
+
+ env.fromCollection(BOOKS)
+ .sinkTo(
+ JdbcSink.<BooksTable.BookEntry>builder()
+ .withQueryStatement(
+ TEST_TABLE.getInsertIntoQuery(),
+ TEST_TABLE.getStatementBuilder())
+ .withExecutionOptions(
+ JdbcExecutionOptions.builder().withMaxRetries(0).build())
+ .buildExactlyOnce(
+ JdbcExactlyOnceOptions.defaults(),
+ getMetadata().getXaSourceSupplier()));
+ env.execute();
+
+ assertResult(BOOKS);
+ }
+
+ private void assertResult(List<BooksTable.BookEntry> expected) throws SQLException {
+ assertThat(TEST_TABLE.selectAllTable(getMetadata().getConnection())).isEqualTo(expected);
+ }
+}
diff --git a/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DataStreamSourceTest.java b/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DataStreamSourceTest.java
new file mode 100644
index 00000000..3ac60f25
--- /dev/null
+++ b/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DataStreamSourceTest.java
@@ -0,0 +1,199 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.connector.jdbc.backward.compatibility;
+
+import org.apache.flink.api.common.eventtime.WatermarkStrategy;
+import org.apache.flink.api.common.restartstrategy.RestartStrategies;
+import org.apache.flink.api.common.typeinfo.TypeInformation;
+import org.apache.flink.connector.jdbc.JdbcTestFixture;
+import org.apache.flink.connector.jdbc.databases.postgres.PostgresTestBase;
+import org.apache.flink.connector.jdbc.source.JdbcSource;
+import org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor;
+import org.apache.flink.connector.jdbc.split.JdbcGenericParameterValuesProvider;
+import org.apache.flink.connector.jdbc.testutils.TableManaged;
+import org.apache.flink.connector.jdbc.testutils.tables.templates.BooksTable;
+import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration;
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
+import org.apache.flink.streaming.api.functions.sink.SinkFunction;
+import org.apache.flink.test.junit5.MiniClusterExtension;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import java.io.Serializable;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.Collections;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedDeque;
+
+import static org.apache.flink.connector.jdbc.JdbcTestFixture.TEST_DATA;
+import static org.assertj.core.api.Assertions.assertThat;
+
+/** Test for backward compatibility. */
+public class DataStreamSourceTest implements PostgresTestBase {
+ public static Queue<JdbcTestFixture.TestEntry> collectedRecords;
+ private static final BooksTable TEST_TABLE = new BooksTable("SourceTable");
+
+ protected final ResultExtractor<JdbcTestFixture.TestEntry> extractor =
+ resultSet ->
+ new JdbcTestFixture.TestEntry(
+ resultSet.getInt("id"),
+ resultSet.getString("title"),
+ resultSet.getString("author"),
+ // Avoid the 'null -> 0.0d' bug on calling 'getDouble'
+ (Double) resultSet.getObject("price"),
+ resultSet.getInt("qty"));
+
+ @Override
+ public List<TableManaged> getManagedTables() {
+ return Collections.singletonList(TEST_TABLE);
+ }
+
+ @RegisterExtension
+ static final MiniClusterExtension MINI_CLUSTER =
+ new MiniClusterExtension(
+ new MiniClusterResourceConfiguration.Builder()
+ .setNumberTaskManagers(2)
+ .setNumberSlotsPerTaskManager(2)
+ .build());
+
+ @BeforeEach
+ void init() throws SQLException {
+ collectedRecords = new ConcurrentLinkedDeque<>();
+ try (Connection conn = getMetadata().getConnection();
+ PreparedStatement ps = conn.prepareStatement(TEST_TABLE.getInsertIntoQuery())) {
+ for (int i = 0; i < TEST_DATA.length; i++) {
+ ps.setInt(1, TEST_DATA[i].id);
+ ps.setString(2, TEST_DATA[i].title);
+ ps.setString(3, TEST_DATA[i].author);
+ if (TEST_DATA[i].price == null) {
+ ps.setNull(4, Types.DOUBLE);
+ } else {
+ ps.setDouble(4, TEST_DATA[i].price);
+ }
+ ps.setInt(5, TEST_DATA[i].qty);
+ ps.execute();
+ }
+ }
+ }
+
+ @Test
+ void testReadWithoutParallelismWithoutParamsProvider() throws Exception {
+ StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
+ env.setRestartStrategy(new RestartStrategies.NoRestartStrategyConfiguration());
+ env.setParallelism(1);
+ JdbcSource<JdbcTestFixture.TestEntry> jdbcSource =
+ JdbcSource.<JdbcTestFixture.TestEntry>builder()
+ .setTypeInformation(TypeInformation.of(JdbcTestFixture.TestEntry.class))
+ .setSql(TEST_TABLE.getSelectAllQuery())
+ .setDBUrl(getMetadata().getJdbcUrl())
+ .setUsername(getMetadata().getUsername())
+ .setPassword(getMetadata().getPassword())
+ .setDriverName(getMetadata().getDriverClass())
+ .setResultExtractor(extractor)
+ .build();
+ env.fromSource(jdbcSource, WatermarkStrategy.noWatermarks(), "TestSource")
+ .addSink(new TestingSinkFunction());
+ env.execute();
+ assertThat(collectedRecords).containsExactlyInAnyOrder(TEST_DATA);
+ }
+
+ @Test
+ void testReadWithoutParallelismWithParamsProvider() throws Exception {
+ StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
+ env.setRestartStrategy(new RestartStrategies.NoRestartStrategyConfiguration());
+ env.setParallelism(1);
+ JdbcSource<JdbcTestFixture.TestEntry> jdbcSource =
+ JdbcSource.<JdbcTestFixture.TestEntry>builder()
+ .setTypeInformation(TypeInformation.of(JdbcTestFixture.TestEntry.class))
+ .setSql(TEST_TABLE.getSelectByIdBetweenQuery())
+ .setJdbcParameterValuesProvider(
+ new JdbcGenericParameterValuesProvider(
+ new Serializable[][] {{1001, 1005}, {1006, 1010}}))
+ .setDBUrl(getMetadata().getJdbcUrl())
+ .setUsername(getMetadata().getUsername())
+ .setPassword(getMetadata().getPassword())
+ .setDriverName(getMetadata().getDriverClass())
+ .setResultExtractor(extractor)
+ .build();
+ env.fromSource(jdbcSource, WatermarkStrategy.noWatermarks(), "TestSource")
+ .addSink(new TestingSinkFunction());
+ env.execute();
+ assertThat(collectedRecords).containsExactlyInAnyOrder(TEST_DATA);
+ }
+
+ @Test
+ void testReadWithParallelismWithoutParamsProvider() throws Exception {
+ StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
+ env.setRestartStrategy(new RestartStrategies.NoRestartStrategyConfiguration());
+ env.setParallelism(2);
+ JdbcSource<JdbcTestFixture.TestEntry> jdbcSource =
+ JdbcSource.<JdbcTestFixture.TestEntry>builder()
+ .setTypeInformation(TypeInformation.of(JdbcTestFixture.TestEntry.class))
+ .setSql(TEST_TABLE.getSelectAllQuery())
+ .setDBUrl(getMetadata().getJdbcUrl())
+ .setUsername(getMetadata().getUsername())
+ .setPassword(getMetadata().getPassword())
+ .setDriverName(getMetadata().getDriverClass())
+ .setResultExtractor(extractor)
+ .build();
+ env.fromSource(jdbcSource, WatermarkStrategy.noWatermarks(), "TestSource")
+ .addSink(new TestingSinkFunction());
+ env.execute();
+ assertThat(collectedRecords).containsExactlyInAnyOrder(TEST_DATA);
+ }
+
+ @Test
+ void testReadWithParallelismWithParamsProvider() throws Exception {
+ StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
+ env.setRestartStrategy(new RestartStrategies.NoRestartStrategyConfiguration());
+ env.setParallelism(2);
+ JdbcSource<JdbcTestFixture.TestEntry> jdbcSource =
+ JdbcSource.<JdbcTestFixture.TestEntry>builder()
+ .setTypeInformation(TypeInformation.of(JdbcTestFixture.TestEntry.class))
+ .setSql(TEST_TABLE.getSelectByIdBetweenQuery())
+ .setJdbcParameterValuesProvider(
+ new JdbcGenericParameterValuesProvider(
+ new Serializable[][] {{1001, 1005}, {1006, 1010}}))
+ .setDBUrl(getMetadata().getJdbcUrl())
+ .setUsername(getMetadata().getUsername())
+ .setPassword(getMetadata().getPassword())
+ .setDriverName(getMetadata().getDriverClass())
+ .setResultExtractor(extractor)
+ .build();
+ env.fromSource(jdbcSource, WatermarkStrategy.noWatermarks(), "TestSource")
+ .addSink(new TestingSinkFunction());
+ env.execute();
+ assertThat(collectedRecords).containsExactlyInAnyOrder(TEST_DATA);
+ }
+
+ /** A sink function to collect the records. */
+ static class TestingSinkFunction implements SinkFunction<JdbcTestFixture.TestEntry> {
+
+ @Override
+ public void invoke(JdbcTestFixture.TestEntry value, Context context) throws Exception {
+ collectedRecords.add(value);
+ }
+ }
+}
diff --git a/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DynamicTableSinkTest.java b/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DynamicTableSinkTest.java
new file mode 100644
index 00000000..c926e6bf
--- /dev/null
+++ b/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DynamicTableSinkTest.java
@@ -0,0 +1,327 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.connector.jdbc.backward.compatibility;
+
+import org.apache.flink.connector.jdbc.databases.postgres.PostgresTestBase;
+import org.apache.flink.connector.jdbc.testutils.TableManaged;
+import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
+import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration;
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
+import org.apache.flink.table.api.DataTypes;
+import org.apache.flink.table.api.EnvironmentSettings;
+import org.apache.flink.table.api.Table;
+import org.apache.flink.table.api.TableEnvironment;
+import org.apache.flink.table.api.TableResult;
+import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
+import org.apache.flink.table.planner.factories.TestValuesTableFactory;
+import org.apache.flink.table.planner.runtime.utils.TestData;
+import org.apache.flink.test.junit5.MiniClusterExtension;
+import org.apache.flink.types.Row;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import static org.apache.flink.connector.jdbc.testutils.tables.TableBuilder.dbType;
+import static org.apache.flink.connector.jdbc.testutils.tables.TableBuilder.field;
+import static org.apache.flink.connector.jdbc.testutils.tables.TableBuilder.pkField;
+import static org.apache.flink.connector.jdbc.testutils.tables.TableBuilder.tableRow;
+import static org.assertj.core.api.Assertions.assertThat;
+
+/** Test for backward compatibility. */
+public class DynamicTableSinkTest implements PostgresTestBase {
+
+ @RegisterExtension
+ static final MiniClusterExtension MINI_CLUSTER =
+ new MiniClusterExtension(
+ new MiniClusterResourceConfiguration.Builder()
+ .setNumberTaskManagers(2)
+ .setNumberSlotsPerTaskManager(2)
+ .build());
+
+ protected final TableRow upsertOutputTable = createUpsertOutputTable();
+ protected final TableRow appendOutputTable = createAppendOutputTable();
+ protected final TableRow batchOutputTable = createBatchOutputTable();
+ protected final TableRow userOutputTable = createUserOutputTable();
+
+ protected TableRow createUpsertOutputTable() {
+ return tableRow(
+ "dynamicSinkForUpsert",
+ pkField("cnt", DataTypes.BIGINT().notNull()),
+ field("lencnt", DataTypes.BIGINT().notNull()),
+ pkField("cTag", DataTypes.INT().notNull()),
+ field("ts", dbType("TIMESTAMP"), DataTypes.TIMESTAMP()));
+ }
+
+ protected TableRow createAppendOutputTable() {
+ return tableRow(
+ "dynamicSinkForAppend",
+ field("id", DataTypes.INT().notNull()),
+ field("num", DataTypes.BIGINT().notNull()),
+ field("ts", dbType("TIMESTAMP"), DataTypes.TIMESTAMP()));
+ }
+
+ protected TableRow createBatchOutputTable() {
+ return tableRow(
+ "dynamicSinkForBatch",
+ field("NAME", DataTypes.VARCHAR(20).notNull()),
+ field("SCORE", DataTypes.BIGINT().notNull()));
+ }
+
+ protected TableRow createUserOutputTable() {
+ return tableRow(
+ "USER_TABLE",
+ pkField("user_id", DataTypes.VARCHAR(20).notNull()),
+ field("user_name", DataTypes.VARCHAR(20).notNull()),
+ field("email", DataTypes.VARCHAR(255)),
+ field("balance", DataTypes.DECIMAL(18, 2)),
+ field("balance2", DataTypes.DECIMAL(18, 2)));
+ }
+
+ @Override
+ public List<TableManaged> getManagedTables() {
+ return Arrays.asList(
+ upsertOutputTable, appendOutputTable, batchOutputTable, userOutputTable);
+ }
+
+ @AfterEach
+ void afterEach() {
+ TestValuesTableFactory.clearAllData();
+ }
+
+ protected List<Row> testUserData() {
+ return Arrays.asList(
+ Row.of(
+ "user1",
+ "Tom",
+ "tom123@gmail.com",
+ new BigDecimal("8.10"),
+ new BigDecimal("16.20")),
+ Row.of(
+ "user3",
+ "Bailey",
+ "bailey@qq.com",
+ new BigDecimal("9.99"),
+ new BigDecimal("19.98")),
+ Row.of(
+ "user4",
+ "Tina",
+ "tina@gmail.com",
+ new BigDecimal("11.30"),
+ new BigDecimal("22.60")));
+ }
+
+ protected List<Row> testData() {
+ return Arrays.asList(
+ Row.of(1, 1L, "Hi", Timestamp.valueOf("1970-01-01 00:00:00.001")),
+ Row.of(2, 2L, "Hello", Timestamp.valueOf("1970-01-01 00:00:00.002")),
+ Row.of(3, 2L, "Hello world", Timestamp.valueOf("1970-01-01 00:00:00.003")),
+ Row.of(
+ 4,
+ 3L,
+ "Hello world, how are you?",
+ Timestamp.valueOf("1970-01-01 00:00:00.004")),
+ Row.of(5, 3L, "I am fine.", Timestamp.valueOf("1970-01-01 00:00:00.005")),
+ Row.of(6, 3L, "Luke Skywalker", Timestamp.valueOf("1970-01-01 00:00:00.006")),
+ Row.of(7, 4L, "Comment#1", Timestamp.valueOf("1970-01-01 00:00:00.007")),
+ Row.of(8, 4L, "Comment#2", Timestamp.valueOf("1970-01-01 00:00:00.008")),
+ Row.of(9, 4L, "Comment#3", Timestamp.valueOf("1970-01-01 00:00:00.009")),
+ Row.of(10, 4L, "Comment#4", Timestamp.valueOf("1970-01-01 00:00:00.010")),
+ Row.of(11, 5L, "Comment#5", Timestamp.valueOf("1970-01-01 00:00:00.011")),
+ Row.of(12, 5L, "Comment#6", Timestamp.valueOf("1970-01-01 00:00:00.012")),
+ Row.of(13, 5L, "Comment#7", Timestamp.valueOf("1970-01-01 00:00:00.013")),
+ Row.of(14, 5L, "Comment#8", Timestamp.valueOf("1970-01-01 00:00:00.014")),
+ Row.of(15, 5L, "Comment#9", Timestamp.valueOf("1970-01-01 00:00:00.015")),
+ Row.of(16, 6L, "Comment#10", Timestamp.valueOf("1970-01-01 00:00:00.016")),
+ Row.of(17, 6L, "Comment#11", Timestamp.valueOf("1970-01-01 00:00:00.017")),
+ Row.of(18, 6L, "Comment#12", Timestamp.valueOf("1970-01-01 00:00:00.018")),
+ Row.of(19, 6L, "Comment#13", Timestamp.valueOf("1970-01-01 00:00:00.019")),
+ Row.of(20, 6L, "Comment#14", Timestamp.valueOf("1970-01-01 00:00:00.020")),
+ Row.of(21, 6L, "Comment#15", Timestamp.valueOf("1970-01-01 00:00:00.021")));
+ }
+
+ protected Map<Integer, Row> testDataMap() {
+ return testData().stream()
+ .collect(Collectors.toMap(r -> r.getFieldAs(0), Function.identity()));
+ }
+
+ private void createTestDataTempView(StreamTableEnvironment tEnv, String viewName) {
+ Table table = tEnv.fromValues(testData()).as("id", "num", "text", "ts");
+
+ tEnv.createTemporaryView(viewName, table);
+ }
+
+ @Test
+ protected void testUpsert() throws Exception {
+ StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
+ env.getConfig().enableObjectReuse();
+ StreamTableEnvironment tEnv = StreamTableEnvironment.create(env);
+
+ String viewName = "testData";
+ createTestDataTempView(tEnv, viewName);
+
+ String tableName = "upsertSink";
+ tEnv.executeSql(
+ upsertOutputTable.getCreateQueryForFlink(
+ getMetadata(),
+ tableName,
+ Arrays.asList(
+ "'sink.buffer-flush.max-rows' = '2'",
+ "'sink.buffer-flush.interval' = '0'",
+ "'sink.max-retries' = '0'")));
+
+ tEnv.executeSql(
+ String.format(
+ "INSERT INTO %s "
+ + " SELECT cnt, COUNT(len) AS lencnt, cTag, MAX(ts) AS ts "
+ + " FROM ( "
+ + " SELECT len, COUNT(id) as cnt, cTag, MAX(ts) AS ts "
+ + " FROM (SELECT id, CHAR_LENGTH(text) AS len, (CASE WHEN id > 0 THEN 1 ELSE 0 END) cTag, ts FROM %s) "
+ + " GROUP BY len, cTag "
+ + " ) "
+ + " GROUP BY cnt, cTag",
+ tableName, viewName))
+ .await();
+
+ Map<Integer, Row> mapTestData = testDataMap();
+ assertThat(upsertOutputTable.selectAllTable(getMetadata()))
+ .containsExactlyInAnyOrder(
+ Row.of(1L, 5L, 1, mapTestData.get(6).getField(3)),
+ Row.of(7L, 1L, 1, mapTestData.get(21).getField(3)),
+ Row.of(9L, 1L, 1, mapTestData.get(15).getField(3)));
+ }
+
+ @Test
+ void testAppend() throws Exception {
+ StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
+ env.getConfig().enableObjectReuse();
+ env.getConfig().setParallelism(1);
+ StreamTableEnvironment tEnv = StreamTableEnvironment.create(env);
+
+ String viewName = "testData";
+ createTestDataTempView(tEnv, viewName);
+
+ String tableName = "appendSink";
+ tEnv.executeSql(appendOutputTable.getCreateQueryForFlink(getMetadata(), tableName));
+
+ Set<Integer> searchIds = new HashSet<>(Arrays.asList(2, 10, 20));
+ tEnv.executeSql(
+ String.format(
+ "INSERT INTO %s SELECT id, num, ts FROM %s WHERE id IN (%s)",
+ tableName,
+ viewName,
+ searchIds.stream()
+ .map(Object::toString)
+ .collect(Collectors.joining(","))))
+ .await();
+
+ List<Row> tableRows = appendOutputTable.selectAllTable(getMetadata());
+ assertThat(tableRows.size()).isEqualTo(3);
+
+ Map<Integer, Row> mapTestData = testDataMap();
+ assertThat(tableRows)
+ .containsExactlyInAnyOrderElementsOf(
+ searchIds.stream()
+ .map(mapTestData::get)
+ .map(d -> Row.of(d.getField(0), d.getField(1), d.getField(3)))
+ .collect(Collectors.toList()));
+ }
+
+ @Test
+ void testBatchSink() throws Exception {
+ TableEnvironment tEnv = TableEnvironment.create(EnvironmentSettings.inBatchMode());
+
+ String tableName = "batchSink";
+ tEnv.executeSql(
+ batchOutputTable.getCreateQueryForFlink(
+ getMetadata(),
+ tableName,
+ Arrays.asList(
+ "'sink.buffer-flush.max-rows' = '2'",
+ "'sink.buffer-flush.interval' = '300ms'",
+ "'sink.max-retries' = '4'")));
+
+ TableResult tableResult =
+ tEnv.executeSql(
+ String.format(
+ "INSERT INTO %s "
+ + " SELECT user_name, score "
+ + " FROM (VALUES (1, 'Bob'), (22, 'Tom'), (42, 'Kim'), (42, 'Kim'), (1, 'Bob')) "
+ + " AS UserCountTable(score, user_name) ",
+ tableName));
+ tableResult.await();
+
+ assertThat(batchOutputTable.selectAllTable(getMetadata()))
+ .containsExactlyInAnyOrder(
+ Row.of("Bob", 1L),
+ Row.of("Tom", 22L),
+ Row.of("Kim", 42L),
+ Row.of("Kim", 42L),
+ Row.of("Bob", 1L));
+ }
+
+ @Test
+ protected void testReadingFromChangelogSource() throws Exception {
+ TableEnvironment tEnv = TableEnvironment.create(EnvironmentSettings.newInstance().build());
+ String dataId = TestValuesTableFactory.registerData(TestData.userChangelog());
+
+ String userTableLogs = "user_logs";
+ tEnv.executeSql(
+ String.format(
+ "CREATE TABLE %s ( "
+ + " user_id STRING, "
+ + " user_name STRING, "
+ + " email STRING, "
+ + " balance DECIMAL(18,2), "
+ + " balance2 AS balance * 2 "
+ + ") WITH ( "
+ + " 'connector' = 'values', "
+ + " 'data-id' = '%s', "
+ + " 'changelog-mode' = 'I,UA,UB,D' "
+ + ")",
+ userTableLogs, dataId));
+
+ String userTableSink = "user_sink";
+ tEnv.executeSql(
+ userOutputTable.getCreateQueryForFlink(
+ getMetadata(),
+ userTableSink,
+ Arrays.asList(
+ "'sink.buffer-flush.max-rows' = '2'",
+ "'sink.buffer-flush.interval' = '0'")));
+
+ tEnv.executeSql(
+ String.format(
+ "INSERT INTO %s SELECT * FROM %s", userTableSink, userTableLogs))
+ .await();
+
+ assertThat(userOutputTable.selectAllTable(getMetadata()))
+ .containsExactlyInAnyOrderElementsOf(testUserData());
+ }
+}
diff --git a/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DynamicTableSourceTest.java b/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DynamicTableSourceTest.java
new file mode 100644
index 00000000..abf92aba
--- /dev/null
+++ b/flink-connector-jdbc-backward-compatibility/src/test/java/org/apache/flink/connector/jdbc/backward/compatibility/DynamicTableSourceTest.java
@@ -0,0 +1,605 @@
+package org.apache.flink.connector.jdbc.backward.compatibility;
+
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.connector.jdbc.databases.postgres.PostgresTestBase;
+import org.apache.flink.connector.jdbc.testutils.TableManaged;
+import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
+import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration;
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
+import org.apache.flink.table.api.DataTypes;
+import org.apache.flink.table.api.TableEnvironment;
+import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
+import org.apache.flink.table.connector.source.lookup.cache.LookupCache;
+import org.apache.flink.table.data.DecimalData;
+import org.apache.flink.table.data.GenericRowData;
+import org.apache.flink.table.data.RowData;
+import org.apache.flink.table.data.TimestampData;
+import org.apache.flink.table.planner.factories.TestValuesTableFactory;
+import org.apache.flink.table.planner.runtime.utils.StreamTestSink;
+import org.apache.flink.table.runtime.functions.table.lookup.LookupCacheManager;
+import org.apache.flink.table.test.lookup.cache.LookupCacheAssert;
+import org.apache.flink.test.junit5.MiniClusterExtension;
+import org.apache.flink.types.Row;
+import org.apache.flink.util.CollectionUtil;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+
+import java.math.BigDecimal;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
+import java.time.temporal.TemporalUnit;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static org.apache.flink.connector.jdbc.testutils.tables.TableBuilder.dbType;
+import static org.apache.flink.connector.jdbc.testutils.tables.TableBuilder.field;
+import static org.apache.flink.connector.jdbc.testutils.tables.TableBuilder.tableRow;
+import static org.assertj.core.api.Assertions.assertThat;
+
+/** Test for backward compatibility. */
+public class DynamicTableSourceTest implements PostgresTestBase {
+
+ @RegisterExtension
+ static final MiniClusterExtension MINI_CLUSTER_RESOURCE =
+ new MiniClusterExtension(
+ new MiniClusterResourceConfiguration.Builder()
+ .setNumberTaskManagers(1)
+ .setConfiguration(new Configuration())
+ .build());
+
+ public static final String CREATE_TABLE_WITH_NAME_STATEMENT =
+ "CREATE TABLE value_source ( "
+ + " `id` BIGINT, "
+ + " `name` STRING, "
+ + " `proctime` AS PROCTIME()"
+ + ") WITH ("
+ + " 'connector' = 'values', "
+ + " 'data-id' = '%s'"
+ + ")";
+
+ public static final String CREATE_TABLE_WITH_NAME_AND_NICKNAME_STATEMENT =
+ "CREATE TABLE value_source ( "
+ + " `id` BIGINT, "
+ + " `name` STRING, "
+ + " `nickname` STRING, "
+ + " `proctime` AS PROCTIME()"
+ + ") WITH ("
+ + " 'connector' = 'values', "
+ + " 'data-id' = '%s'"
+ + ")";
+
+ private final TableRow inputTable = createInputTable();
+
+ public static StreamExecutionEnvironment env;
+ public static TableEnvironment tEnv;
+
+ protected TableRow createInputTable() {
+ return tableRow(
+ "jdbDynamicTableSource",
+ field("id", DataTypes.BIGINT().notNull()),
+ field("decimal_col", DataTypes.DECIMAL(10, 4)),
+ field("timestamp6_col", DataTypes.TIMESTAMP(6)),
+ // other fields
+ field("real_col", dbType("REAL"), DataTypes.FLOAT()),
+ field("double_col", dbType("DOUBLE PRECISION"), DataTypes.DOUBLE()),
+ field("time_col", dbType("TIME"), DataTypes.TIME()));
+ }
+
+ @Override
+ public List<TableManaged> getManagedTables() {
+ return Collections.singletonList(inputTable);
+ }
+
+ protected List<Row> getTestData() {
+ return Arrays.asList(
+ Row.of(
+ 1L,
+ BigDecimal.valueOf(100.1234),
+ LocalDateTime.parse("2020-01-01T15:35:00.123456"),
+ 1.175E-37F,
+ 1.79769E308D,
+ LocalTime.parse("15:35")),
+ Row.of(
+ 2L,
+ BigDecimal.valueOf(101.1234),
+ LocalDateTime.parse("2020-01-01T15:36:01.123456"),
+ -1.175E-37F,
+ -1.79769E308,
+ LocalTime.parse("15:36:01")));
+ }
+
+ @BeforeEach
+ void beforeEach() throws SQLException {
+ try (Connection conn = getMetadata().getConnection()) {
+ inputTable.insertIntoTableValues(conn, getTestData());
+ }
+ env = StreamExecutionEnvironment.getExecutionEnvironment();
+ tEnv = StreamTableEnvironment.create(env);
+ }
+
+ @AfterEach
+ void afterEach() {
+ StreamTestSink.clear();
+ }
+
+ @Test
+ void testJdbcSource() {
+ String testTable = "testTable";
+ tEnv.executeSql(inputTable.getCreateQueryForFlink(getMetadata(), testTable));
+
+ List<Row> collected = executeQuery("SELECT * FROM " + testTable);
+
+ assertThat(collected).containsExactlyInAnyOrderElementsOf(getTestData());
+ }
+
+ @Test
+ void testProject() {
+ String testTable = "testTable";
+ tEnv.executeSql(
+ inputTable.getCreateQueryForFlink(
+ getMetadata(),
+ testTable,
+ Arrays.asList(
+ "'scan.partition.column'='id'",
+ "'scan.partition.num'='2'",
+ "'scan.partition.lower-bound'='0'",
+ "'scan.partition.upper-bound'='100'")));
+
+ String fields = String.join(",", Arrays.copyOfRange(inputTable.getTableFields(), 0, 3));
+ List<Row> collected = executeQuery(String.format("SELECT %s FROM %s", fields, testTable));
+
+ List<Row> expected =
+ getTestData().stream()
+ .map(row -> Row.of(row.getField(0), row.getField(1), row.getField(2)))
+ .collect(Collectors.toList());
+
+ assertThat(collected).containsExactlyInAnyOrderElementsOf(expected);
+ }
+
+ @Test
+ public void testLimit() {
+ String testTable = "testTable";
+ tEnv.executeSql(
+ inputTable.getCreateQueryForFlink(
+ getMetadata(),
+ testTable,
+ Arrays.asList(
+ "'scan.partition.column'='id'",
+ "'scan.partition.num'='2'",
+ "'scan.partition.lower-bound'='1'",
+ "'scan.partition.upper-bound'='2'")));
+
+ List<Row> collected = executeQuery("SELECT * FROM " + testTable + " LIMIT 1");
+
+ assertThat(collected).hasSize(1);
+ assertThat(getTestData())
+ .as("The actual output is not a subset of the expected set.")
+ .containsAll(collected);
+ }
+
+ @Test
+ public void testFilter() {
+ String testTable = "testTable";
+ tEnv.executeSql(inputTable.getCreateQueryForFlink(getMetadata(), testTable));
+
+ // create a partitioned table to ensure no regression
+ String partitionedTable = "PARTITIONED_TABLE";
+ tEnv.executeSql(
+ inputTable.getCreateQueryForFlink(
+ getMetadata(),
+ partitionedTable,
+ Arrays.asList(
+ "'scan.partition.column'='id'",
+ "'scan.partition.num'='1'",
+ "'scan.partition.lower-bound'='1'",
+ "'scan.partition.upper-bound'='1'")));
+
+ // we create a VIEW here to test column remapping, ie. would filter push down work if we
+ // create a view that depends on our source table
+ tEnv.executeSql(
+ String.format(
+ "CREATE VIEW FAKE_TABLE (idx, %s) as (SELECT * from %s )",
+ Arrays.stream(inputTable.getTableFields())
+ .filter(f -> !f.equals("id"))
+ .collect(Collectors.joining(",")),
+ testTable));
+
+ Row onlyRow1 =
+ getTestData().stream()
+ .filter(row -> row.getFieldAs(0).equals(1L))
+ .findAny()
+ .orElseThrow(NullPointerException::new);
+
+ Row onlyRow2 =
+ getTestData().stream()
+ .filter(row -> row.getFieldAs(0).equals(2L))
+ .findAny()
+ .orElseThrow(NullPointerException::new);
+
+ List<Row> twoRows = getTestData();
+
+ // test simple filter
+ assertThat(executeQuery("SELECT * FROM FAKE_TABLE WHERE idx = 1"))
+ .containsExactly(onlyRow1);
+
+ // test TIMESTAMP filter
+ assertThat(
+ executeQuery(
+ "SELECT * FROM FAKE_TABLE "
+ + "WHERE timestamp6_col > TIMESTAMP '2020-01-01 15:35:00'"
+ + " AND timestamp6_col < TIMESTAMP '2020-01-01 15:35:01'"))
+ .containsExactly(onlyRow1);
+
+ // test the IN operator
+ assertThat(
+ executeQuery(
+ "SELECT * FROM FAKE_TABLE WHERE 1 = idx AND decimal_col IN (100.1234, 101.1234)"))
+ .containsExactly(onlyRow1);
+
+ // test mixing AND and OR operator
+ assertThat(
+ executeQuery(
+ "SELECT * FROM FAKE_TABLE WHERE idx = 1 AND decimal_col = 100.1234 OR decimal_col = 101.1234"))
+ .containsExactlyInAnyOrderElementsOf(twoRows);
+
+ // test mixing AND/OR with parenthesis, and the swapping the operand of equal expression
+ assertThat(
+ executeQuery(
+ "SELECT * FROM FAKE_TABLE WHERE (2 = idx AND decimal_col = 100.1234) OR decimal_col = 101.1234"))
+ .containsExactly(onlyRow2);
+
+ // test Greater than, just to make sure we didnt break anything that we cannot pushdown
+ assertThat(
+ executeQuery(
+ "SELECT * FROM FAKE_TABLE WHERE idx = 2 AND decimal_col > 100 OR decimal_col = 101.123"))
+ .containsExactly(onlyRow2);
+
+ // One more test of parenthesis
+ assertThat(
+ executeQuery(
+ "SELECT * FROM FAKE_TABLE WHERE 2 = idx AND (decimal_col = 100.1234 OR decimal_col = 102.1234)"))
+ .isEmpty();
+
+ assertThat(
+ executeQuery(
+ "SELECT * FROM "
+ + partitionedTable
+ + " WHERE id = 2 AND decimal_col > 100 OR decimal_col = 101.123"))
+ .isEmpty();
+
+ assertThat(
+ executeQuery(
+ "SELECT * FROM "
+ + partitionedTable
+ + " WHERE 1 = id AND decimal_col IN (100.1234, 101.1234)"))
+ .containsExactly(onlyRow1);
+ }
+
+ @ParameterizedTest
+ @EnumSource(Caching.class)
+ void testLookupJoin(Caching caching) {
+
+ String selectStatement =
+ "SELECT S.id, S.name, D.id, D.timestamp6_col, D.decimal_col FROM value_source"
+ + " AS S JOIN jdbc_lookup for system_time as of S.proctime AS D ON S.id = D.id";
+ List<Row> expectedResultSetRows =
+ Arrays.asList(
+ Row.of(
+ 1L,
+ "Alice",
+ 1L,
+ truncateTime(LocalDateTime.parse("2020-01-01T15:35:00.123456")),
+ BigDecimal.valueOf(100.1234)),
+ Row.of(
+ 1L,
+ "Alice",
+ 1L,
+ truncateTime(LocalDateTime.parse("2020-01-01T15:35:00.123456")),
+ BigDecimal.valueOf(100.1234)),
+ Row.of(
+ 2L,
+ "Bob",
+ 2L,
+ truncateTime(LocalDateTime.parse("2020-01-01T15:36:01.123456")),
+ BigDecimal.valueOf(101.1234)));
+
+ RowData key1 = GenericRowData.of(1L);
+ RowData value1 =
+ GenericRowData.of(
+ 1L,
+ DecimalData.fromBigDecimal(BigDecimal.valueOf(100.1234), 10, 4),
+ TimestampData.fromLocalDateTime(
+ truncateTime(LocalDateTime.parse("2020-01-01T15:35:00.123456"))));
+
+ RowData key2 = GenericRowData.of(2L);
+ RowData value2 =
+ GenericRowData.of(
+ 2L,
+ DecimalData.fromBigDecimal(BigDecimal.valueOf(101.1234), 10, 4),
+ TimestampData.fromLocalDateTime(
+ truncateTime(LocalDateTime.parse("2020-01-01T15:36:01.123456"))));
+
+ RowData key3 = GenericRowData.of(3L);
+
+ Map<RowData, Collection<RowData>> expectedCachedEntries = new HashMap<>();
+ expectedCachedEntries.put(key1, Collections.singletonList(value1));
+ expectedCachedEntries.put(key2, Collections.singletonList(value2));
+ expectedCachedEntries.put(key3, Collections.emptyList());
+
+ lookupTableTest(
+ caching,
+ sampleTableData(),
+ CREATE_TABLE_WITH_NAME_STATEMENT,
+ selectStatement,
+ expectedResultSetRows,
+ expectedCachedEntries);
+ }
+
+ private void lookupTableTest(
+ Caching caching,
+ Collection<Row> dataToRegister,
+ String createTableStatement,
+ String selectStatement,
+ List<Row> expectedResultSetRows,
+ Map<RowData, Collection<RowData>> expectedCachedEntries) {
+ // Create JDBC lookup table
+ List<String> cachingOptions = Collections.emptyList();
+ if (caching == Caching.ENABLE_CACHE) {
+ cachingOptions =
+ Arrays.asList(
+ "'lookup.cache.max-rows' = '100'", "'lookup.cache.ttl' = '10min'");
+ }
+ tEnv.executeSql(
+ inputTable.getCreateQueryForFlink(getMetadata(), "jdbc_lookup", cachingOptions));
+
+ // Create and prepare a value source
+ String dataId = TestValuesTableFactory.registerData(dataToRegister);
+ tEnv.executeSql(String.format(createTableStatement, dataId));
+
+ if (caching == Caching.ENABLE_CACHE) {
+ LookupCacheManager.keepCacheOnRelease(true);
+ }
+
+ // Execute lookup join
+ try {
+ List<Row> collected = executeQuery(selectStatement);
+ int expectedSize = expectedResultSetRows.size();
+
+ // check we go the expected number of rows
+ assertThat(collected)
+ .as("Actual output is not size " + expectedSize)
+ .hasSize(expectedSize)
+ .as("The actual output is not a subset of the expected set")
+ .containsAll(expectedResultSetRows);
+
+ if (caching == Caching.ENABLE_CACHE) {
+ validateCachedValues(expectedCachedEntries);
+ }
+ } finally {
+ if (caching == Caching.ENABLE_CACHE) {
+ LookupCacheManager.getInstance().checkAllReleased();
+ LookupCacheManager.getInstance().clear();
+ LookupCacheManager.keepCacheOnRelease(false);
+ }
+ }
+ }
+
+ @ParameterizedTest
+ @EnumSource(Caching.class)
+ void testLookupJoinWithFilter(Caching caching) {
+ List<Row> expectedResultSetRows =
+ Arrays.asList(
+ Row.of(
+ 2L,
+ "Bob",
+ 2L,
+ truncateTime(LocalDateTime.parse("2020-01-01T15:36:01.123456")),
+ BigDecimal.valueOf(101.1234)));
+
+ RowData key2 = GenericRowData.of(2L);
+ RowData value2 =
+ GenericRowData.of(
+ 2L,
+ DecimalData.fromBigDecimal(BigDecimal.valueOf(101.1234), 10, 4),
+ TimestampData.fromLocalDateTime(
+ truncateTime(LocalDateTime.parse("2020-01-01T15:36:01.123456"))));
+
+ Map<RowData, Collection<RowData>> expectedCachedEntries = new HashMap<>();
+ expectedCachedEntries.put(key2, Collections.singletonList(value2));
+
+ lookupTableTest(
+ caching,
+ sampleTableData(),
+ CREATE_TABLE_WITH_NAME_STATEMENT,
+ "SELECT S.id, S.name, D.id, D.timestamp6_col, D.decimal_col FROM value_source"
+ + " AS S JOIN jdbc_lookup for system_time as of S.proctime AS D ON "
+ + "S.id = D.id AND S.name = \'Bob\'",
+ expectedResultSetRows,
+ expectedCachedEntries);
+ }
+
+ private static List<Row> sampleTableData() {
+ return Arrays.asList(
+ Row.of(1L, "Alice"), Row.of(1L, "Alice"), Row.of(2L, "Bob"), Row.of(3L, "Charlie"));
+ }
+
+ private static List<Row> sampleTableDataWithNickNames() {
+ return Arrays.asList(
+ Row.of(1L, "Alice", "ABC"),
+ Row.of(1L, "Alice", "ADD"),
+ Row.of(2L, "Bob", "BGH"),
+ Row.of(3L, "Charlie", "CHJ"));
+ }
+
+ @ParameterizedTest
+ @EnumSource(Caching.class)
+ void testLookupJoinWithMultipleFilters(Caching caching) {
+
+ List<Row> expectedResultSetRows =
+ Arrays.asList(
+ Row.of(
+ 1L,
+ "Alice",
+ "ADD",
+ 1L,
+ truncateTime(LocalDateTime.parse("2020-01-01T15:35:00.123456")),
+ BigDecimal.valueOf(100.1234)));
+
+ RowData key1 = GenericRowData.of(1L);
+ RowData value1 =
+ GenericRowData.of(
+ 1L,
+ DecimalData.fromBigDecimal(BigDecimal.valueOf(100.1234), 10, 4),
+ TimestampData.fromLocalDateTime(
+ truncateTime(LocalDateTime.parse("2020-01-01T15:35:00.123456"))));
+
+ Map<RowData, Collection<RowData>> expectedCachedEntries = new HashMap<>();
+ expectedCachedEntries.put(key1, Collections.singletonList(value1));
+
+ lookupTableTest(
+ caching,
+ sampleTableDataWithNickNames(),
+ CREATE_TABLE_WITH_NAME_AND_NICKNAME_STATEMENT,
+ "SELECT S.id, S.name, S.nickname, D.id, D.timestamp6_col, D.decimal_col FROM value_source"
+ + " AS S JOIN jdbc_lookup for system_time as of S.proctime AS D ON "
+ + "S.id = D.id AND S.name = 'Alice' AND S.nickname = 'ADD'",
+ expectedResultSetRows,
+ expectedCachedEntries);
+ }
+
+ @ParameterizedTest
+ @EnumSource(Caching.class)
+ void testLookupJoinWithLikeFilter(Caching caching) {
+
+ List<Row> expectedResultSetRows =
+ Arrays.asList(
+ Row.of(
+ 1L,
+ "Alice",
+ "ABC",
+ 1L,
+ truncateTime(LocalDateTime.parse("2020-01-01T15:35:00.123456")),
+ BigDecimal.valueOf(100.1234)));
+
+ RowData key1 = GenericRowData.of(1L);
+ RowData value1 =
+ GenericRowData.of(
+ 1L,
+ DecimalData.fromBigDecimal(BigDecimal.valueOf(100.1234), 10, 4),
+ TimestampData.fromLocalDateTime(
+ truncateTime(LocalDateTime.parse("2020-01-01T15:35:00.123456"))));
+
+ Map<RowData, Collection<RowData>> expectedCachedEntries = new HashMap<>();
+ expectedCachedEntries.put(key1, Collections.singletonList(value1));
+
+ lookupTableTest(
+ caching,
+ Arrays.asList(
+ Row.of(1L, "Alice", "ABC"),
+ Row.of(1L, "Alice", "ADD"),
+ Row.of(2L, "Bob", "BGH"),
+ Row.of(3L, "Charlie", "CHJ")),
+ CREATE_TABLE_WITH_NAME_AND_NICKNAME_STATEMENT,
+ "SELECT S.id, S.name, S.nickname, D.id, D.timestamp6_col, D.decimal_col FROM value_source"
+ + " AS S JOIN jdbc_lookup for system_time as of S.proctime AS D ON "
+ + "S.id = D.id AND S.name LIKE 'Al%' AND S.nickname = 'ABC' ",
+ expectedResultSetRows,
+ expectedCachedEntries);
+ }
+
+ @ParameterizedTest
+ @EnumSource(Caching.class)
+ void testLookupJoinWithORFilter(Caching caching) {
+
+ List<Row> expectedResultSetRows =
+ Arrays.asList(
+ Row.of(
+ 1L,
+ "Alice",
+ "ABC",
+ 1L,
+ truncateTime(LocalDateTime.parse("2020-01-01T15:35:00.123456")),
+ BigDecimal.valueOf(100.1234)),
+ Row.of(
+ 2L,
+ "Bob",
+ "BGH",
+ 2L,
+ truncateTime(LocalDateTime.parse("2020-01-01T15:36:01.123456")),
+ BigDecimal.valueOf(101.1234)));
+
+ RowData key1 = GenericRowData.of(1L);
+ RowData value1 =
+ GenericRowData.of(
+ 1L,
+ DecimalData.fromBigDecimal(BigDecimal.valueOf(100.1234), 10, 4),
+ TimestampData.fromLocalDateTime(
+ truncateTime(LocalDateTime.parse("2020-01-01T15:35:00.123456"))));
+
+ RowData key2 = GenericRowData.of(2L);
+ RowData value2 =
+ GenericRowData.of(
+ 2L,
+ DecimalData.fromBigDecimal(BigDecimal.valueOf(101.1234), 10, 4),
+ TimestampData.fromLocalDateTime(
+ truncateTime(LocalDateTime.parse("2020-01-01T15:36:01.123456"))));
+
+ Map<RowData, Collection<RowData>> expectedCachedEntries = new HashMap<>();
+ expectedCachedEntries.put(key1, Collections.singletonList(value1));
+ expectedCachedEntries.put(key2, Collections.singletonList(value2));
+
+ lookupTableTest(
+ caching,
+ Arrays.asList(
+ Row.of(1L, "Alice", "ABC"),
+ Row.of(1L, "Alice", "ADD"),
+ Row.of(2L, "Bob", "BGH"),
+ Row.of(3L, "Charlie", "CHJ")),
+ CREATE_TABLE_WITH_NAME_AND_NICKNAME_STATEMENT,
+ "SELECT S.id, S.name, S.nickname, D.id, D.timestamp6_col, D.decimal_col FROM value_source"
+ + " AS S JOIN jdbc_lookup for system_time as of S.proctime AS D ON "
+ + "S.id = D.id AND (S.name = \'Bob\' OR S.nickname = \'ABC\')",
+ expectedResultSetRows,
+ expectedCachedEntries);
+ }
+
+ protected TemporalUnit timestampPrecision() {
+ return ChronoUnit.MICROS;
+ }
+
+ private LocalDateTime truncateTime(LocalDateTime value) {
+ return value.truncatedTo(timestampPrecision());
+ }
+
+ private List<Row> executeQuery(String query) {
+ return CollectionUtil.iteratorToList(tEnv.executeSql(query).collect());
+ }
+
+ private void validateCachedValues(Map<RowData, Collection<RowData>> expectedCachedEntries) {
+ // Validate cache
+ Map<String, LookupCacheManager.RefCountedCache> managedCaches =
+ LookupCacheManager.getInstance().getManagedCaches();
+ assertThat(managedCaches).as("There should be only 1 shared cache registered").hasSize(1);
+ LookupCache cache = managedCaches.get(managedCaches.keySet().iterator().next()).getCache();
+ // jdbc does support project push down, the cached row has been projected
+ LookupCacheAssert.assertThat(cache).containsExactlyEntriesOf(expectedCachedEntries);
+ }
+
+ private enum Caching {
+ ENABLE_CACHE,
+ DISABLE_CACHE
+ }
+}
diff --git a/flink-connector-jdbc-backward-compatibility/src/test/resources/log4j2-test.properties b/flink-connector-jdbc-backward-compatibility/src/test/resources/log4j2-test.properties
new file mode 100644
index 00000000..5a383778
--- /dev/null
+++ b/flink-connector-jdbc-backward-compatibility/src/test/resources/log4j2-test.properties
@@ -0,0 +1,28 @@
+################################################################################
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+################################################################################
+
+# Set root logger level to OFF to not flood build logs
+# set manually to INFO for debugging purposes
+rootLogger.level = WARN
+rootLogger.appenderRef.test.ref = TestLogger
+
+appender.testlogger.name = TestLogger
+appender.testlogger.type = CONSOLE
+appender.testlogger.target = SYSTEM_ERR
+appender.testlogger.layout.type = PatternLayout
+appender.testlogger.layout.pattern = %-4r [%t] %-5p %c %x - %m%n
(flink-connector-jdbc) 02/14: [FLINK-35364] Create core module and move code
Posted by fa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git
commit b5c030bb3910a356a219fa3c0f52ef9cb93d5041
Author: Joao Boto <bo...@boto.pro>
AuthorDate: Sat May 18 05:05:59 2024 +0200
[FLINK-35364] Create core module and move code
---
.../0c7b60d6-a12c-432d-8a72-747cabaeb7ed | 0
.../0f94f11b-9bc8-445a-8be8-e7dfd8a384b0 | 0
.../2047daea-3713-4298-bdb3-e269f539363f | 303 ++++++++++++++++++++
.../4bca2274-65a9-4a61-81ef-767d58233ea0 | 0
.../596bd7eb-1ed5-4963-a56a-941766d61233 | 0
.../6b9ab1b0-c14d-4667-bab5-407b81fba98b | 0
.../b10c194a-0517-4744-830f-81abfb71ab18 | 0
.../d45c3af5-52c6-45fd-9926-75e75e77473a | 0
.../f242ee43-a122-4d2f-a291-6439cdb9029f | 0
.../archunit-violations/stored.rules | 11 +-
flink-connector-jdbc-core/pom.xml | 313 +++++++++++++++++++++
.../connector/jdbc/JdbcConnectionOptions.java | 0
.../connector/jdbc/JdbcExactlyOnceOptions.java | 0
.../flink/connector/jdbc/JdbcExecutionOptions.java | 0
.../flink/connector/jdbc/JdbcInputFormat.java | 0
.../flink/connector/jdbc/JdbcRowOutputFormat.java | 0
.../org/apache/flink/connector/jdbc/JdbcSink.java | 0
.../flink/connector/jdbc/JdbcStatementBuilder.java | 0
.../jdbc/catalog/AbstractJdbcCatalog.java | 0
.../flink/connector/jdbc/catalog/JdbcCatalog.java | 0
.../connector/jdbc/catalog/JdbcCatalogUtils.java | 0
.../jdbc/catalog/factory/JdbcCatalogFactory.java | 0
.../catalog/factory/JdbcCatalogFactoryOptions.java | 0
.../jdbc/converter/AbstractJdbcRowConverter.java | 0
.../AbstractPostgresCompatibleRowConverter.java | 0
.../connector/jdbc/converter/JdbcRowConverter.java | 0
.../databases/cratedb/catalog/CrateDBCatalog.java | 0
.../cratedb/catalog/CrateDBTablePath.java | 0
.../cratedb/catalog/CrateDBTypeMapper.java | 0
.../databases/cratedb/dialect/CrateDBDialect.java | 0
.../cratedb/dialect/CrateDBDialectFactory.java | 0
.../cratedb/dialect/CrateDBRowConverter.java | 0
.../jdbc/databases/db2/dialect/Db2Dialect.java | 0
.../databases/db2/dialect/Db2DialectFactory.java | 0
.../databases/db2/dialect/Db2RowConverter.java | 0
.../jdbc/databases/derby/dialect/DerbyDialect.java | 0
.../derby/dialect/DerbyDialectFactory.java | 0
.../databases/derby/dialect/DerbyRowConverter.java | 0
.../jdbc/databases/mysql/catalog/MySqlCatalog.java | 0
.../databases/mysql/catalog/MySqlTypeMapper.java | 0
.../databases/mysql/dialect/MySQLRowConverter.java | 0
.../jdbc/databases/mysql/dialect/MySqlDialect.java | 0
.../mysql/dialect/MySqlDialectFactory.java | 0
.../oceanbase/dialect/OceanBaseDialect.java | 0
.../oceanbase/dialect/OceanBaseDialectFactory.java | 0
.../oceanbase/dialect/OceanBaseRowConverter.java | 0
.../databases/oracle/dialect/OracleDialect.java | 0
.../oracle/dialect/OracleDialectFactory.java | 0
.../oracle/dialect/OracleRowConverter.java | 0
.../postgres/catalog/PostgresCatalog.java | 0
.../postgres/catalog/PostgresTablePath.java | 0
.../postgres/catalog/PostgresTypeMapper.java | 0
.../postgres/dialect/PostgresDialect.java | 0
.../postgres/dialect/PostgresDialectFactory.java | 0
.../postgres/dialect/PostgresRowConverter.java | 0
.../sqlserver/dialect/SqlServerDialect.java | 0
.../sqlserver/dialect/SqlServerDialectFactory.java | 0
.../sqlserver/dialect/SqlServerRowConverter.java | 0
.../jdbc/databases/trino/dialect/TrinoDialect.java | 0
.../trino/dialect/TrinoDialectFactory.java | 0
.../databases/trino/dialect/TrinoRowConverter.java | 0
.../connections/JdbcConnectionProvider.java | 0
.../connections/SimpleJdbcConnectionProvider.java | 0
.../xa/PoolingXaConnectionProvider.java | 0
.../connections/xa/SimpleXaConnectionProvider.java | 0
.../jdbc/datasource/connections/xa/XaCommand.java | 0
.../connections/xa/XaConnectionProvider.java | 0
.../datasource/statements/JdbcQueryStatement.java | 0
.../statements/SimpleJdbcQueryStatement.java | 0
.../datasource/transactions/xa/XaTransaction.java | 0
.../transactions/xa/XaTransactionResult.java | 0
.../transactions/xa/domain/TransactionId.java | 0
.../xa/exceptions/EmptyTransactionXaException.java | 0
.../xa/exceptions/TransientXaException.java | 0
.../transactions/xa/exceptions/XaError.java | 0
.../connector/jdbc/dialect/AbstractDialect.java | 0
.../dialect/AbstractPostgresCompatibleDialect.java | 0
.../flink/connector/jdbc/dialect/JdbcDialect.java | 0
.../connector/jdbc/dialect/JdbcDialectFactory.java | 0
.../connector/jdbc/dialect/JdbcDialectLoader.java | 0
.../jdbc/dialect/JdbcDialectTypeMapper.java | 0
.../jdbc/internal/GenericJdbcSinkFunction.java | 0
.../connector/jdbc/internal/JdbcOutputFormat.java | 0
.../jdbc/internal/JdbcOutputSerializer.java | 0
.../jdbc/internal/RowJdbcOutputFormat.java | 0
.../jdbc/internal/TableJdbcUpsertOutputFormat.java | 0
.../executor/InsertOrUpdateJdbcExecutor.java | 0
.../executor/JdbcBatchStatementExecutor.java | 0
.../executor/KeyedBatchStatementExecutor.java | 0
.../executor/SimpleBatchStatementExecutor.java | 0
.../TableBufferReducedStatementExecutor.java | 0
.../executor/TableBufferedStatementExecutor.java | 0
.../TableInsertOrUpdateStatementExecutor.java | 0
.../executor/TableSimpleStatementExecutor.java | 0
.../options/InternalJdbcConnectionOptions.java | 0
.../jdbc/internal/options/JdbcDmlOptions.java | 0
.../jdbc/internal/options/JdbcInsertOptions.java | 0
.../jdbc/internal/options/JdbcReadOptions.java | 0
.../internal/options/JdbcTypedQueryOptions.java | 0
.../apache/flink/connector/jdbc/sink/JdbcSink.java | 0
.../flink/connector/jdbc/sink/JdbcSinkBuilder.java | 0
.../jdbc/sink/committer/JdbcCommitable.java | 0
.../sink/committer/JdbcCommitableSerializer.java | 0
.../jdbc/sink/committer/JdbcCommitter.java | 0
.../connector/jdbc/sink/writer/JdbcWriter.java | 0
.../jdbc/sink/writer/JdbcWriterState.java | 0
.../sink/writer/JdbcWriterStateSerializer.java | 0
.../flink/connector/jdbc/source/JdbcSource.java | 0
.../connector/jdbc/source/JdbcSourceBuilder.java | 0
.../connector/jdbc/source/JdbcSourceOptions.java | 0
.../enumerator/JdbcSourceEnumStateSerializer.java | 0
.../source/enumerator/JdbcSourceEnumerator.java | 0
.../enumerator/JdbcSourceEnumeratorState.java | 0
.../enumerator/JdbcSqlSplitEnumeratorBase.java | 0
.../enumerator/SqlTemplateSplitEnumerator.java | 0
.../jdbc/source/reader/JdbcRecordEmitter.java | 0
.../jdbc/source/reader/JdbcSourceReader.java | 0
.../jdbc/source/reader/JdbcSourceSplitReader.java | 0
.../jdbc/source/reader/RecordAndOffset.java | 0
.../source/reader/extractor/ResultExtractor.java | 0
.../reader/extractor/RowResultExtractor.java | 0
.../jdbc/source/split/CheckpointedOffset.java | 0
.../jdbc/source/split/JdbcSourceSplit.java | 0
.../source/split/JdbcSourceSplitSerializer.java | 0
.../jdbc/source/split/JdbcSourceSplitState.java | 0
.../CompositeJdbcParameterValuesProvider.java | 0
.../split/JdbcGenericParameterValuesProvider.java | 0
.../JdbcNumericBetweenParametersProvider.java | 0
.../jdbc/split/JdbcParameterValuesProvider.java | 0
.../split/JdbcSlideTimingParameterProvider.java | 0
.../statement/FieldNamedPreparedStatement.java | 0
.../statement/FieldNamedPreparedStatementImpl.java | 0
.../connector/jdbc/statement/StatementFactory.java | 0
.../connector/jdbc/table/JdbcConnectorOptions.java | 0
.../jdbc/table/JdbcDynamicTableFactory.java | 0
.../connector/jdbc/table/JdbcDynamicTableSink.java | 0
.../jdbc/table/JdbcDynamicTableSource.java | 0
...JdbcFilterPushdownPreparedStatementVisitor.java | 0
.../jdbc/table/JdbcOutputFormatBuilder.java | 0
.../jdbc/table/JdbcRowDataInputFormat.java | 0
.../jdbc/table/JdbcRowDataLookupFunction.java | 0
.../jdbc/table/ParameterizedPredicate.java | 0
.../jdbc/table/RowDataResultExtractor.java | 27 +-
.../jdbc/utils/ContinuousUnBoundingSettings.java | 0
.../flink/connector/jdbc/utils/JdbcTypeUtil.java | 0
.../flink/connector/jdbc/utils/JdbcUtils.java | 0
.../flink/connector/jdbc/xa/CheckpointAndXid.java | 0
.../jdbc/xa/CheckpointAndXidSerializer.java | 0
.../connector/jdbc/xa/JdbcXaSinkFunction.java | 0
.../connector/jdbc/xa/JdbcXaSinkFunctionState.java | 0
.../apache/flink/connector/jdbc/xa/JobSubtask.java | 0
.../connector/jdbc/xa/SemanticXidGenerator.java | 0
.../apache/flink/connector/jdbc/xa/XaFacade.java | 0
.../flink/connector/jdbc/xa/XaFacadeImpl.java | 0
.../connector/jdbc/xa/XaFacadePoolingImpl.java | 0
.../apache/flink/connector/jdbc/xa/XaGroupOps.java | 0
.../flink/connector/jdbc/xa/XaGroupOpsImpl.java | 0
.../connector/jdbc/xa/XaSinkStateHandler.java | 0
.../connector/jdbc/xa/XaSinkStateHandlerImpl.java | 0
.../connector/jdbc/xa/XaSinkStateSerializer.java | 0
.../flink/connector/jdbc/xa/XidGenerator.java | 0
.../apache/flink/connector/jdbc/xa/XidImpl.java | 0
.../flink/connector/jdbc/xa/XidSerializer.java | 0
.../flink/connector/jdbc/xa/package-info.java | 0
...flink.connector.jdbc.dialect.JdbcDialectFactory | 0
.../org.apache.flink.table.factories.Factory | 0
.../ProductionCodeArchitectureTest.java | 0
.../architecture/TestCodeArchitectureTest.java | 0
.../reader/splitreader/TestingSplitsChange.java | 0
.../connector/jdbc/JdbcConnectionOptionsTest.java | 0
.../flink/connector/jdbc/JdbcDataTestBase.java | 0
.../apache/flink/connector/jdbc/JdbcITCase.java | 0
.../flink/connector/jdbc/JdbcInputFormatTest.java | 0
.../connector/jdbc/JdbcRowOutputFormatTest.java | 0
.../apache/flink/connector/jdbc/JdbcTestBase.java | 0
.../flink/connector/jdbc/JdbcTestCheckpoint.java | 0
.../flink/connector/jdbc/JdbcTestFixture.java | 0
.../jdbc/catalog/JdbcCatalogUtilsTest.java | 0
.../converter/AbstractJdbcRowConverterTest.java | 0
.../cratedb/catalog/CrateDBCatalogITCase.java | 0
.../cratedb/catalog/CrateDBCatalogTest.java | 0
.../cratedb/catalog/CrateDBCatalogTestBase.java | 0
.../cratedb/catalog/CrateDBTablePathTest.java | 0
.../databases/cratedb/catalog/CrateDBTestBase.java | 0
.../cratedb/dialect/CrateDBDialectTypeTest.java | 0
.../connector/jdbc/databases/db2/Db2TestBase.java | 0
.../databases/db2/dialect/Db2DialectTypeTest.java | 0
.../db2/dialect/Db2PreparedStatementTest.java | 0
.../db2/table/Db2DynamicTableSinkITCase.java | 0
.../db2/table/Db2DynamicTableSourceITCase.java | 0
.../db2/xa/Db2ExactlyOnceSinkE2eTest.java | 0
.../jdbc/databases/derby/DerbyTestBase.java | 0
.../derby/table/DerbyDynamicTableSinkITCase.java | 0
.../derby/table/DerbyDynamicTableSourceITCase.java | 0
.../derby/xa/DerbyExactlyOnceSinkE2eTest.java | 0
.../connector/jdbc/databases/h2/H2XaTestBase.java | 0
.../jdbc/databases/mysql/MySqlTestBase.java | 0
.../mysql/catalog/MySql56CatalogITCase.java | 0
.../mysql/catalog/MySql57CatalogITCase.java | 0
.../mysql/catalog/MySqlCatalogITCase.java | 0
.../mysql/catalog/MySqlCatalogTestBase.java | 0
.../databases/mysql/dialect/MySqlDialectTest.java | 0
.../mysql/dialect/MySqlDialectTypeTest.java | 0
.../mysql/table/MySqlDynamicTableSinkITCase.java | 0
.../mysql/table/MySqlDynamicTableSourceITCase.java | 0
.../mysql/table/UnsignedTypeConversionITCase.java | 0
.../mysql/xa/MySqlExactlyOnceSinkE2eTest.java | 0
.../oceanbase/OceanBaseMysqlTestBase.java | 0
.../oceanbase/OceanBaseOracleTestBase.java | 0
.../oceanbase/dialect/OceanBaseDialectTest.java | 0
.../dialect/OceanBaseMysqlDialectTypeTest.java | 0
.../dialect/OceanBaseOracleDialectTypeTest.java | 0
.../OceanBaseMySqlDynamicTableSinkITCase.java | 0
.../OceanBaseMySqlDynamicTableSourceITCase.java | 0
.../OceanBaseOracleDynamicTableSinkITCase.java | 0
.../OceanBaseOracleDynamicTableSourceITCase.java | 0
.../oceanbase/table/OceanBaseTableRow.java | 0
.../jdbc/databases/oracle/OracleTestBase.java | 0
.../oracle/dialect/OracleDialectTypeTest.java | 0
.../dialect/OraclePreparedStatementTest.java | 0
.../oracle/table/OracleDynamicTableSinkITCase.java | 0
.../table/OracleDynamicTableSourceITCase.java | 0
.../oracle/table/OracleTableSourceITCase.java | 0
.../oracle/xa/OracleExactlyOnceSinkE2eTest.java | 0
.../jdbc/databases/postgres/PostgresTestBase.java | 0
.../postgres/catalog/PostgresCatalogITCase.java | 0
.../postgres/catalog/PostgresCatalogTest.java | 0
.../postgres/catalog/PostgresCatalogTestBase.java | 0
.../postgres/catalog/PostgresTablePathTest.java | 0
.../catalog/factory/JdbcCatalogFactoryTest.java | 0
.../postgres/dialect/PostgresDialectTypeTest.java | 0
.../table/PostgresDynamicTableSinkITCase.java | 0
.../table/PostgresDynamicTableSourceITCase.java | 0
.../xa/PostgresExactlyOnceSinkE2eTest.java | 0
.../databases/sqlserver/SqlServerTestBase.java | 0
.../dialect/SqlServerPreparedStatementTest.java | 0
.../table/SqlServerDynamicTableSinkITCase.java | 0
.../table/SqlServerDynamicTableSourceITCase.java | 0
.../table/SqlServerTableSourceITCase.java | 0
.../xa/SqlServerExactlyOnceSinkE2eTest.java | 0
.../jdbc/databases/trino/TrinoTestBase.java | 0
.../trino/dialect/TrinoDialectTypeTest.java | 0
.../trino/dialect/TrinoPreparedStatementTest.java | 0
.../trino/table/TrinoDynamicTableSinkITCase.java | 0
.../trino/table/TrinoDynamicTableSourceITCase.java | 0
.../xa/SimpleXaConnectionProviderTest.java | 0
.../xa/TransactionIdConnectionTest.java | 0
.../transactions/xa/domain/TransactionIdTest.java | 0
.../jdbc/dialect/JdbcDialectTypeTest.java | 0
.../flink/connector/jdbc/fakedb/FakeDBUtils.java | 0
.../jdbc/fakedb/driver/FakeConnection.java | 0
.../jdbc/fakedb/driver/FakeConnection1.java | 0
.../jdbc/fakedb/driver/FakeConnection2.java | 0
.../jdbc/fakedb/driver/FakeConnection3.java | 0
.../connector/jdbc/fakedb/driver/FakeDriver1.java | 0
.../connector/jdbc/fakedb/driver/FakeDriver2.java | 0
.../connector/jdbc/fakedb/driver/FakeDriver3.java | 0
.../connector/jdbc/internal/JdbcFullTest.java | 0
.../jdbc/internal/JdbcOutputSerializerTest.java | 0
.../jdbc/internal/JdbcTableOutputFormatTest.java | 0
...ProviderDriverClassConcurrentLoadingITCase.java | 0
.../SimpleJdbcConnectionProviderTest.java | 0
.../jdbc/sink/AtLeastOnceJdbcSinkTest.java | 0
.../connector/jdbc/sink/BaseJdbcSinkTest.java | 0
.../jdbc/sink/ExactlyOnceJdbcSinkTest.java | 0
.../sink/writer/AlLeastOnceJdbcWriterTest.java | 0
.../jdbc/sink/writer/BaseJdbcWriterTest.java | 0
.../sink/writer/ExactlyOnceJdbcWriterTest.java | 0
.../sink/writer/JdbcWriterStateSerializerTest.java | 0
.../jdbc/sink/writer/JdbcWriterStateTest.java | 0
.../jdbc/source/JdbcSourceBuilderTest.java | 0
.../connector/jdbc/source/JdbcSourceITCase.java | 0
.../jdbc/source/JdbcSourceStreamRelatedITCase.java | 0
.../JdbcSourceEnumStateSerializerTest.java | 0
.../enumerator/JdbcSourceEnumeratorTest.java | 0
.../jdbc/source/reader/JdbcSourceReaderTest.java | 0
.../source/reader/JdbcSourceSplitReaderTest.java | 0
.../split/JdbcSourceSplitSerializerTest.java | 0
.../NumericBetweenParametersProviderTest.java | 0
.../FieldNamedPreparedStatementImplTest.java | 0
.../jdbc/table/JdbcAppendOnlyWriterTest.java | 0
.../jdbc/table/JdbcDynamicTableFactoryTest.java | 0
.../jdbc/table/JdbcDynamicTableSinkITCase.java | 0
.../jdbc/table/JdbcDynamicTableSourceITCase.java | 0
...FilterPushdownPreparedStatementVisitorTest.java | 0
.../connector/jdbc/table/JdbcLookupTestBase.java | 0
.../connector/jdbc/table/JdbcOutputFormatTest.java | 0
.../jdbc/table/JdbcRowDataInputFormatTest.java | 0
.../jdbc/table/JdbcRowDataLookupFunctionTest.java | 0
.../connector/jdbc/table/JdbcTablePlanTest.java | 0
.../jdbc/testutils/DatabaseExtension.java | 0
.../connector/jdbc/testutils/DatabaseMetadata.java | 0
.../connector/jdbc/testutils/DatabaseTest.java | 0
.../connector/jdbc/testutils/JdbcITCaseBase.java | 0
.../connector/jdbc/testutils/TableManaged.java | 0
.../databases/cratedb/CrateDBDatabase.java | 0
.../databases/cratedb/CrateDBMetadata.java | 0
.../jdbc/testutils/databases/db2/Db2Database.java | 0
.../jdbc/testutils/databases/db2/Db2Metadata.java | 0
.../testutils/databases/derby/DerbyDatabase.java | 0
.../testutils/databases/derby/DerbyMetadata.java | 0
.../jdbc/testutils/databases/h2/H2Metadata.java | 0
.../jdbc/testutils/databases/h2/H2XaDatabase.java | 0
.../databases/h2/xa/H2XaConnectionWrapper.java | 0
.../testutils/databases/h2/xa/H2XaDsWrapper.java | 0
.../databases/h2/xa/H2XaResourceWrapper.java | 0
.../testutils/databases/h2/xa/package-info.java | 0
.../testutils/databases/mysql/MySql56Database.java | 0
.../testutils/databases/mysql/MySql57Database.java | 0
.../testutils/databases/mysql/MySqlContainer.java | 0
.../testutils/databases/mysql/MySqlDatabase.java | 0
.../testutils/databases/mysql/MySqlImages.java | 0
.../testutils/databases/mysql/MySqlMetadata.java | 0
.../databases/oceanbase/OceanBaseContainer.java | 0
.../databases/oceanbase/OceanBaseDatabase.java | 0
.../databases/oceanbase/OceanBaseImages.java | 0
.../databases/oceanbase/OceanBaseMetadata.java | 0
.../databases/oceanbase/OceanBaseTestDatabase.java | 0
.../testutils/databases/oracle/OracleDatabase.java | 0
.../testutils/databases/oracle/OracleImages.java | 0
.../testutils/databases/oracle/OracleMetadata.java | 0
.../databases/postgres/PostgresDatabase.java | 0
.../databases/postgres/PostgresImages.java | 0
.../databases/postgres/PostgresMetadata.java | 0
.../databases/sqlserver/SqlServerDatabase.java | 0
.../databases/sqlserver/SqlServerImages.java | 0
.../databases/sqlserver/SqlServerMetadata.java | 0
.../testutils/databases/trino/TrinoDatabase.java | 0
.../testutils/databases/trino/TrinoImages.java | 0
.../testutils/databases/trino/TrinoMetadata.java | 0
.../testutils/functions/JdbcResultSetBuilder.java | 0
.../connector/jdbc/testutils/tables/TableBase.java | 0
.../jdbc/testutils/tables/TableBuilder.java | 0
.../jdbc/testutils/tables/TableBuilderTest.java | 0
.../jdbc/testutils/tables/TableField.java | 0
.../connector/jdbc/testutils/tables/TableRow.java | 0
.../testutils/tables/templates/BooksTable.java | 0
.../connector/jdbc/utils/JdbcTypeUtilTest.java | 0
.../jdbc/xa/CheckpointAndXidSerializersTest.java | 0
.../jdbc/xa/JdbcExactlyOnceSinkE2eTest.java | 3 +-
.../connector/jdbc/xa/JdbcXaFacadeImplTest.java | 0
.../connector/jdbc/xa/JdbcXaFacadeTestHelper.java | 0
.../connector/jdbc/xa/JdbcXaSinkDerbyTest.java | 0
.../flink/connector/jdbc/xa/JdbcXaSinkH2Test.java | 0
.../connector/jdbc/xa/JdbcXaSinkMigrationTest.java | 0
.../jdbc/xa/JdbcXaSinkNoInsertionTest.java | 0
.../connector/jdbc/xa/JdbcXaSinkTestBase.java | 0
.../connector/jdbc/xa/JdbcXaSinkTestHelper.java | 0
.../jdbc/xa/SemanticXidGeneratorTest.java | 0
.../apache/flink/connector/jdbc/xa/XaXidTest.java | 0
.../connector/jdbc/xa/XidSerializersTest.java | 0
.../resources/META-INF/services/java.sql.Driver | 0
.../src/test/resources/archunit.properties | 0
.../src/test/resources/log4j2-test.properties | 0
.../connector/jdbc/table/JdbcTablePlanTest.xml | 0
flink-connector-jdbc/pom.xml | 288 +++----------------
pom.xml | 1 +
357 files changed, 675 insertions(+), 271 deletions(-)
diff --git a/flink-connector-jdbc/archunit-violations/0c7b60d6-a12c-432d-8a72-747cabaeb7ed b/flink-connector-jdbc-core/archunit-violations/0c7b60d6-a12c-432d-8a72-747cabaeb7ed
similarity index 100%
rename from flink-connector-jdbc/archunit-violations/0c7b60d6-a12c-432d-8a72-747cabaeb7ed
rename to flink-connector-jdbc-core/archunit-violations/0c7b60d6-a12c-432d-8a72-747cabaeb7ed
diff --git a/flink-connector-jdbc/archunit-violations/0f94f11b-9bc8-445a-8be8-e7dfd8a384b0 b/flink-connector-jdbc-core/archunit-violations/0f94f11b-9bc8-445a-8be8-e7dfd8a384b0
similarity index 100%
rename from flink-connector-jdbc/archunit-violations/0f94f11b-9bc8-445a-8be8-e7dfd8a384b0
rename to flink-connector-jdbc-core/archunit-violations/0f94f11b-9bc8-445a-8be8-e7dfd8a384b0
diff --git a/flink-connector-jdbc-core/archunit-violations/2047daea-3713-4298-bdb3-e269f539363f b/flink-connector-jdbc-core/archunit-violations/2047daea-3713-4298-bdb3-e269f539363f
new file mode 100644
index 00000000..662348fa
--- /dev/null
+++ b/flink-connector-jdbc-core/archunit-violations/2047daea-3713-4298-bdb3-e269f539363f
@@ -0,0 +1,303 @@
+Class <org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog> extends class <org.apache.flink.table.catalog.AbstractCatalog> in (AbstractJdbcCatalog.java:0)
+Class <org.apache.flink.connector.jdbc.table.JdbcFilterPushdownPreparedStatementVisitor> extends class <org.apache.flink.table.expressions.ExpressionDefaultVisitor> in (JdbcFilterPushdownPreparedStatementVisitor.java:0)
+Constructor <org.apache.flink.connector.jdbc.JdbcConnectionOptions.<init>(java.lang.String, java.lang.String, int, java.util.Properties)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcConnectionOptions.java:50)
+Constructor <org.apache.flink.connector.jdbc.JdbcConnectionOptions.<init>(java.lang.String, java.lang.String, int, java.util.Properties)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcConnectionOptions.java:53)
+Constructor <org.apache.flink.connector.jdbc.JdbcConnectionOptions.<init>(java.lang.String, java.lang.String, int, java.util.Properties)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcConnectionOptions.java:57)
+Constructor <org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions.<init>(boolean, int, boolean, java.util.Optional, boolean)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcExactlyOnceOptions.java:75)
+Constructor <org.apache.flink.connector.jdbc.JdbcExecutionOptions.<init>(long, int, int)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean)> in (JdbcExecutionOptions.java:38)
+Constructor <org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog.<init>(java.lang.ClassLoader, java.lang.String, java.lang.String, java.lang.String, java.util.Properties)> calls constructor <org.apache.flink.table.catalog.AbstractCatalog.<init>(java.lang.String, java.lang.String)> in (AbstractJdbcCatalog.java:121)
+Constructor <org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog.<init>(java.lang.ClassLoader, java.lang.String, java.lang.String, java.lang.String, java.util.Properties)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean)> in (AbstractJdbcCatalog.java:124)
+Constructor <org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog.<init>(java.lang.ClassLoader, java.lang.String, java.lang.String, java.lang.String, java.util.Properties)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean)> in (AbstractJdbcCatalog.java:132)
+Constructor <org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog.<init>(java.lang.ClassLoader, java.lang.String, java.lang.String, java.lang.String, java.util.Properties)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean)> in (AbstractJdbcCatalog.java:134)
+Constructor <org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog.<init>(java.lang.ClassLoader, java.lang.String, java.lang.String, java.lang.String, java.util.Properties)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (AbstractJdbcCatalog.java:123)
+Constructor <org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog.<init>(java.lang.ClassLoader, java.lang.String, java.lang.String, java.lang.String, java.util.Properties)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (AbstractJdbcCatalog.java:131)
+Constructor <org.apache.flink.connector.jdbc.catalog.JdbcCatalog.<init>(java.lang.ClassLoader, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcCatalog.java:0)
+Constructor <org.apache.flink.connector.jdbc.converter.AbstractJdbcRowConverter.<init>(org.apache.flink.table.types.logical.RowType)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (AbstractJdbcRowConverter.java:60)
+Constructor <org.apache.flink.connector.jdbc.databases.cratedb.catalog.CrateDBCatalog.<init>(java.lang.ClassLoader, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (CrateDBCatalog.java:0)
+Constructor <org.apache.flink.connector.jdbc.databases.mysql.catalog.MySqlCatalog.<init>(java.lang.ClassLoader, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (MySqlCatalog.java:0)
+Constructor <org.apache.flink.connector.jdbc.databases.mysql.catalog.MySqlCatalog.<init>(java.lang.ClassLoader, java.lang.String, java.lang.String, java.lang.String, java.util.Properties)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (MySqlCatalog.java:92)
+Constructor <org.apache.flink.connector.jdbc.databases.mysql.catalog.MySqlCatalog.<init>(java.lang.ClassLoader, java.lang.String, java.lang.String, java.lang.String, java.util.Properties)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (MySqlCatalog.java:94)
+Constructor <org.apache.flink.connector.jdbc.databases.postgres.catalog.PostgresCatalog.<init>(java.lang.ClassLoader, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (PostgresCatalog.java:0)
+Constructor <org.apache.flink.connector.jdbc.databases.postgres.catalog.PostgresTablePath.<init>(java.lang.String, java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (PostgresTablePath.java:41)
+Constructor <org.apache.flink.connector.jdbc.databases.postgres.catalog.PostgresTablePath.<init>(java.lang.String, java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (PostgresTablePath.java:44)
+Constructor <org.apache.flink.connector.jdbc.datasource.connections.xa.SimpleXaConnectionProvider.<init>(java.util.function.Supplier, java.lang.Integer)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (SimpleXaConnectionProvider.java:81)
+Constructor <org.apache.flink.connector.jdbc.internal.GenericJdbcSinkFunction.<init>(org.apache.flink.connector.jdbc.internal.JdbcOutputFormat)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (GenericJdbcSinkFunction.java:44)
+Constructor <org.apache.flink.connector.jdbc.internal.JdbcOutputFormat.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.internal.JdbcOutputFormat$StatementExecutorFactory)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcOutputFormat.java:87)
+Constructor <org.apache.flink.connector.jdbc.internal.JdbcOutputFormat.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.internal.JdbcOutputFormat$StatementExecutorFactory)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcOutputFormat.java:88)
+Constructor <org.apache.flink.connector.jdbc.internal.JdbcOutputFormat.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.internal.JdbcOutputFormat$StatementExecutorFactory)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcOutputFormat.java:89)
+Constructor <org.apache.flink.connector.jdbc.internal.TableJdbcUpsertOutputFormat.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.internal.JdbcOutputFormat$StatementExecutorFactory, org.apache.flink.connector.jdbc.internal.JdbcOutputFormat$StatementExecutorFactory)> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (TableJdbcUpsertOutputFormat.java:0)
+Constructor <org.apache.flink.connector.jdbc.internal.executor.InsertOrUpdateJdbcExecutor.<init>(java.lang.String, java.lang.String, java.lang.String, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, java.util.function.Function, java.util.function.Function)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (InsertOrUpdateJdbcExecutor.java:76)
+Constructor <org.apache.flink.connector.jdbc.internal.executor.InsertOrUpdateJdbcExecutor.<init>(java.lang.String, java.lang.String, java.lang.String, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, java.util.function.Function, java.util.function.Function)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (InsertOrUpdateJdbcExecutor.java:77)
+Constructor <org.apache.flink.connector.jdbc.internal.executor.InsertOrUpdateJdbcExecutor.<init>(java.lang.String, java.lang.String, java.lang.String, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, java.util.function.Function, java.util.function.Function)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (InsertOrUpdateJdbcExecutor.java:78)
+Constructor <org.apache.flink.connector.jdbc.internal.executor.InsertOrUpdateJdbcExecutor.<init>(java.lang.String, java.lang.String, java.lang.String, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, java.util.function.Function, java.util.function.Function)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (InsertOrUpdateJdbcExecutor.java:79)
+Constructor <org.apache.flink.connector.jdbc.internal.executor.InsertOrUpdateJdbcExecutor.<init>(java.lang.String, java.lang.String, java.lang.String, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, java.util.function.Function, java.util.function.Function)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (InsertOrUpdateJdbcExecutor.java:80)
+Constructor <org.apache.flink.connector.jdbc.internal.executor.InsertOrUpdateJdbcExecutor.<init>(java.lang.String, java.lang.String, java.lang.String, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, java.util.function.Function, java.util.function.Function)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (InsertOrUpdateJdbcExecutor.java:81)
+Constructor <org.apache.flink.connector.jdbc.internal.executor.InsertOrUpdateJdbcExecutor.<init>(java.lang.String, java.lang.String, java.lang.String, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, java.util.function.Function, java.util.function.Function)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (InsertOrUpdateJdbcExecutor.java:82)
+Constructor <org.apache.flink.connector.jdbc.internal.executor.InsertOrUpdateJdbcExecutor.<init>(java.lang.String, java.lang.String, java.lang.String, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, java.util.function.Function, java.util.function.Function)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (InsertOrUpdateJdbcExecutor.java:83)
+Constructor <org.apache.flink.connector.jdbc.internal.executor.TableInsertOrUpdateStatementExecutor.<init>(org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, java.util.function.Functi [...]
+Constructor <org.apache.flink.connector.jdbc.internal.executor.TableInsertOrUpdateStatementExecutor.<init>(org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, java.util.function.Functi [...]
+Constructor <org.apache.flink.connector.jdbc.internal.executor.TableInsertOrUpdateStatementExecutor.<init>(org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, java.util.function.Functi [...]
+Constructor <org.apache.flink.connector.jdbc.internal.executor.TableInsertOrUpdateStatementExecutor.<init>(org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, java.util.function.Functi [...]
+Constructor <org.apache.flink.connector.jdbc.internal.executor.TableInsertOrUpdateStatementExecutor.<init>(org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, java.util.function.Functi [...]
+Constructor <org.apache.flink.connector.jdbc.internal.executor.TableInsertOrUpdateStatementExecutor.<init>(org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, java.util.function.Functi [...]
+Constructor <org.apache.flink.connector.jdbc.internal.executor.TableSimpleStatementExecutor.<init>(org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.converter.JdbcRowConverter)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (TableSimpleStatementExecutor.java:47)
+Constructor <org.apache.flink.connector.jdbc.internal.executor.TableSimpleStatementExecutor.<init>(org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.converter.JdbcRowConverter)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (TableSimpleStatementExecutor.java:48)
+Constructor <org.apache.flink.connector.jdbc.internal.options.JdbcDmlOptions.<init>(java.lang.String, org.apache.flink.connector.jdbc.dialect.JdbcDialect, [Ljava.lang.String;, [I, [Ljava.lang.String;)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcDmlOptions.java:51)
+Constructor <org.apache.flink.connector.jdbc.internal.options.JdbcDmlOptions.<init>(java.lang.String, org.apache.flink.connector.jdbc.dialect.JdbcDialect, [Ljava.lang.String;, [I, [Ljava.lang.String;)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcDmlOptions.java:52)
+Constructor <org.apache.flink.connector.jdbc.internal.options.JdbcDmlOptions.<init>(java.lang.String, org.apache.flink.connector.jdbc.dialect.JdbcDialect, [Ljava.lang.String;, [I, [Ljava.lang.String;)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcDmlOptions.java:53)
+Constructor <org.apache.flink.connector.jdbc.internal.options.JdbcInsertOptions.<init>(java.lang.String, [I)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcInsertOptions.java:33)
+Constructor <org.apache.flink.connector.jdbc.sink.writer.JdbcWriter.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.statements.JdbcQueryStatement, org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer, org.apache.flink.connector.base.DeliveryGuarantee, java.util.Collection, org.apache.flink.a [...]
+Constructor <org.apache.flink.connector.jdbc.sink.writer.JdbcWriter.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.statements.JdbcQueryStatement, org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer, org.apache.flink.connector.base.DeliveryGuarantee, java.util.Collection, org.apache.flink.a [...]
+Constructor <org.apache.flink.connector.jdbc.sink.writer.JdbcWriter.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.statements.JdbcQueryStatement, org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer, org.apache.flink.connector.base.DeliveryGuarantee, java.util.Collection, org.apache.flink.a [...]
+Constructor <org.apache.flink.connector.jdbc.sink.writer.JdbcWriter.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.statements.JdbcQueryStatement, org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer, org.apache.flink.connector.base.DeliveryGuarantee, java.util.Collection, org.apache.flink.a [...]
+Constructor <org.apache.flink.connector.jdbc.sink.writer.JdbcWriter.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.statements.JdbcQueryStatement, org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer, org.apache.flink.connector.base.DeliveryGuarantee, java.util.Collection, org.apache.flink.a [...]
+Constructor <org.apache.flink.connector.jdbc.sink.writer.JdbcWriter.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.statements.JdbcQueryStatement, org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer, org.apache.flink.connector.base.DeliveryGuarantee, java.util.Collection, org.apache.flink.a [...]
+Constructor <org.apache.flink.connector.jdbc.sink.writer.JdbcWriter.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.statements.JdbcQueryStatement, org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer, org.apache.flink.connector.base.DeliveryGuarantee, java.util.Collection, org.apache.flink.a [...]
+Constructor <org.apache.flink.connector.jdbc.sink.writer.JdbcWriter.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.statements.JdbcQueryStatement, org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer, org.apache.flink.connector.base.DeliveryGuarantee, java.util.Collection, org.apache.flink.a [...]
+Constructor <org.apache.flink.connector.jdbc.sink.writer.JdbcWriter.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.statements.JdbcQueryStatement, org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer, org.apache.flink.connector.base.DeliveryGuarantee, java.util.Collection, org.apache.flink.a [...]
+Constructor <org.apache.flink.connector.jdbc.source.JdbcSource.<init>(org.apache.flink.configuration.Configuration, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.source.enumerator.JdbcSqlSplitEnumeratorBase$Provider, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.base.DeliveryGuarantee)> calls method <org.apache.flink. [...]
+Constructor <org.apache.flink.connector.jdbc.source.JdbcSource.<init>(org.apache.flink.configuration.Configuration, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.source.enumerator.JdbcSqlSplitEnumeratorBase$Provider, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.base.DeliveryGuarantee)> calls method <org.apache.flink. [...]
+Constructor <org.apache.flink.connector.jdbc.source.JdbcSource.<init>(org.apache.flink.configuration.Configuration, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.source.enumerator.JdbcSqlSplitEnumeratorBase$Provider, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.base.DeliveryGuarantee)> calls method <org.apache.flink. [...]
+Constructor <org.apache.flink.connector.jdbc.source.JdbcSource.<init>(org.apache.flink.configuration.Configuration, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.source.enumerator.JdbcSqlSplitEnumeratorBase$Provider, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.base.DeliveryGuarantee)> calls method <org.apache.flink. [...]
+Constructor <org.apache.flink.connector.jdbc.source.JdbcSource.<init>(org.apache.flink.configuration.Configuration, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.source.enumerator.JdbcSqlSplitEnumeratorBase$Provider, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.base.DeliveryGuarantee)> calls method <org.apache.flink. [...]
+Constructor <org.apache.flink.connector.jdbc.source.JdbcSource.<init>(org.apache.flink.configuration.Configuration, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.source.enumerator.JdbcSqlSplitEnumeratorBase$Provider, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.base.DeliveryGuarantee)> calls method <org.apache.flink. [...]
+Constructor <org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumStateSerializer.<init>(org.apache.flink.connector.jdbc.source.split.JdbcSourceSplitSerializer)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcSourceEnumStateSerializer.java:47)
+Constructor <org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumerator.<init>(org.apache.flink.api.connector.source.SplitEnumeratorContext, org.apache.flink.connector.jdbc.source.enumerator.JdbcSqlSplitEnumeratorBase, java.util.List)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcSourceEnumerator.java:54)
+Constructor <org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumerator.<init>(org.apache.flink.api.connector.source.SplitEnumeratorContext, org.apache.flink.connector.jdbc.source.enumerator.JdbcSqlSplitEnumeratorBase, java.util.List)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcSourceEnumerator.java:55)
+Constructor <org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumerator.<init>(org.apache.flink.api.connector.source.SplitEnumeratorContext, org.apache.flink.connector.jdbc.source.enumerator.JdbcSqlSplitEnumeratorBase, java.util.List)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcSourceEnumerator.java:57)
+Constructor <org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumeratorState.<init>(java.util.List, java.util.List, java.util.List, java.io.Serializable)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcSourceEnumeratorState.java:47)
+Constructor <org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumeratorState.<init>(java.util.List, java.util.List, java.util.List, java.io.Serializable)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcSourceEnumeratorState.java:48)
+Constructor <org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumeratorState.<init>(java.util.List, java.util.List, java.util.List, java.io.Serializable)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcSourceEnumeratorState.java:49)
+Constructor <org.apache.flink.connector.jdbc.source.enumerator.SqlTemplateSplitEnumerator.<init>(java.io.Serializable, java.lang.String, org.apache.flink.connector.jdbc.split.JdbcParameterValuesProvider)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (SqlTemplateSplitEnumerator.java:47)
+Constructor <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.<init>(org.apache.flink.api.connector.source.SourceReaderContext, org.apache.flink.configuration.Configuration, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.base.DeliveryGuarantee, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor)> calls method <org.apache.flink.util.Preco [...]
+Constructor <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.<init>(org.apache.flink.api.connector.source.SourceReaderContext, org.apache.flink.configuration.Configuration, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.base.DeliveryGuarantee, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor)> calls method <org.apache.flink.util.Preco [...]
+Constructor <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.<init>(org.apache.flink.api.connector.source.SourceReaderContext, org.apache.flink.configuration.Configuration, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.base.DeliveryGuarantee, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor)> calls method <org.apache.flink.util.Preco [...]
+Constructor <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.<init>(org.apache.flink.api.connector.source.SourceReaderContext, org.apache.flink.configuration.Configuration, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.base.DeliveryGuarantee, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor)> calls method <org.apache.flink.util.Preco [...]
+Constructor <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.<init>(org.apache.flink.api.connector.source.SourceReaderContext, org.apache.flink.configuration.Configuration, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.base.DeliveryGuarantee, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor)> calls method <org.apache.flink.util.Preco [...]
+Constructor <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.<init>(org.apache.flink.api.connector.source.SourceReaderContext, org.apache.flink.configuration.Configuration, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.base.DeliveryGuarantee, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor)> calls method <org.apache.flink.util.Preco [...]
+Constructor <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.<init>(org.apache.flink.api.connector.source.SourceReaderContext, org.apache.flink.configuration.Configuration, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.base.DeliveryGuarantee, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor)> calls method <org.apache.flink.util.Preco [...]
+Constructor <org.apache.flink.connector.jdbc.source.split.JdbcSourceSplitState.<init>(org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcSourceSplitState.java:38)
+Constructor <org.apache.flink.connector.jdbc.split.CompositeJdbcParameterValuesProvider.<init>(org.apache.flink.connector.jdbc.split.JdbcParameterValuesProvider, org.apache.flink.connector.jdbc.split.JdbcParameterValuesProvider)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (CompositeJdbcParameterValuesProvider.java:34)
+Constructor <org.apache.flink.connector.jdbc.split.JdbcNumericBetweenParametersProvider.<init>(long, long)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcNumericBetweenParametersProvider.java:55)
+Constructor <org.apache.flink.connector.jdbc.split.JdbcNumericBetweenParametersProvider.<init>(long, long, long)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcNumericBetweenParametersProvider.java:68)
+Constructor <org.apache.flink.connector.jdbc.table.JdbcDynamicTableSource$JdbcDataStreamScanProvider.<init>(org.apache.flink.connector.jdbc.source.JdbcSource)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcDynamicTableSource.java:319)
+Constructor <org.apache.flink.connector.jdbc.table.JdbcFilterPushdownPreparedStatementVisitor.<init>(java.util.function.Function)> calls constructor <org.apache.flink.table.expressions.ExpressionDefaultVisitor.<init>()> in (JdbcFilterPushdownPreparedStatementVisitor.java:52)
+Constructor <org.apache.flink.connector.jdbc.table.JdbcRowDataLookupFunction.<init>(org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions, int, [Ljava.lang.String;, [Lorg.apache.flink.table.types.DataType;, [Ljava.lang.String;, org.apache.flink.table.types.logical.RowType, java.util.List, [Ljava.io.Serializable;)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.String, [Ljava.lang.Object;)> in (JdbcRowDataLookupFunction.java:95)
+Constructor <org.apache.flink.connector.jdbc.table.JdbcRowDataLookupFunction.<init>(org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions, int, [Ljava.lang.String;, [Lorg.apache.flink.table.types.DataType;, [Ljava.lang.String;, org.apache.flink.table.types.logical.RowType, java.util.List, [Ljava.io.Serializable;)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcRowDataLookupFunction.java:82)
+Constructor <org.apache.flink.connector.jdbc.table.JdbcRowDataLookupFunction.<init>(org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions, int, [Ljava.lang.String;, [Lorg.apache.flink.table.types.DataType;, [Ljava.lang.String;, org.apache.flink.table.types.logical.RowType, java.util.List, [Ljava.io.Serializable;)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcRowDataLookupFunction.java:83)
+Constructor <org.apache.flink.connector.jdbc.table.JdbcRowDataLookupFunction.<init>(org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions, int, [Ljava.lang.String;, [Lorg.apache.flink.table.types.DataType;, [Ljava.lang.String;, org.apache.flink.table.types.logical.RowType, java.util.List, [Ljava.io.Serializable;)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcRowDataLookupFunction.java:84)
+Constructor <org.apache.flink.connector.jdbc.table.JdbcRowDataLookupFunction.<init>(org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions, int, [Ljava.lang.String;, [Lorg.apache.flink.table.types.DataType;, [Ljava.lang.String;, org.apache.flink.table.types.logical.RowType, java.util.List, [Ljava.io.Serializable;)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcRowDataLookupFunction.java:85)
+Constructor <org.apache.flink.connector.jdbc.table.JdbcRowDataLookupFunction.<init>(org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions, int, [Ljava.lang.String;, [Lorg.apache.flink.table.types.DataType;, [Ljava.lang.String;, org.apache.flink.table.types.logical.RowType, java.util.List, [Ljava.io.Serializable;)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcRowDataLookupFunction.java:86)
+Constructor <org.apache.flink.connector.jdbc.table.JdbcRowDataLookupFunction.<init>(org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions, int, [Ljava.lang.String;, [Lorg.apache.flink.table.types.DataType;, [Ljava.lang.String;, org.apache.flink.table.types.logical.RowType, java.util.List, [Ljava.io.Serializable;)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcRowDataLookupFunction.java:87)
+Constructor <org.apache.flink.connector.jdbc.table.JdbcRowDataLookupFunction.<init>(org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions, int, [Ljava.lang.String;, [Lorg.apache.flink.table.types.DataType;, [Ljava.lang.String;, org.apache.flink.table.types.logical.RowType, java.util.List, [Ljava.io.Serializable;)> has parameter of type <[Lorg.apache.flink.table.types.DataType;> in (JdbcRowDataLookupFunction.java:0)
+Constructor <org.apache.flink.connector.jdbc.table.RowDataResultExtractor.<init>(org.apache.flink.connector.jdbc.converter.JdbcRowConverter)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (RowDataResultExtractor.java:35)
+Constructor <org.apache.flink.connector.jdbc.xa.CheckpointAndXid.<init>(long, javax.transaction.xa.Xid, int, boolean)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (CheckpointAndXid.java:46)
+Constructor <org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunction.<init>(org.apache.flink.connector.jdbc.internal.JdbcOutputFormat, org.apache.flink.connector.jdbc.xa.XaFacade, org.apache.flink.connector.jdbc.xa.XidGenerator, org.apache.flink.connector.jdbc.xa.XaSinkStateHandler, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.xa.XaGroupOps)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcXaSink [...]
+Constructor <org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunction.<init>(org.apache.flink.connector.jdbc.internal.JdbcOutputFormat, org.apache.flink.connector.jdbc.xa.XaFacade, org.apache.flink.connector.jdbc.xa.XidGenerator, org.apache.flink.connector.jdbc.xa.XaSinkStateHandler, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.xa.XaGroupOps)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcXaSinkFunction.j [...]
+Constructor <org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunction.<init>(org.apache.flink.connector.jdbc.internal.JdbcOutputFormat, org.apache.flink.connector.jdbc.xa.XaFacade, org.apache.flink.connector.jdbc.xa.XidGenerator, org.apache.flink.connector.jdbc.xa.XaSinkStateHandler, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.xa.XaGroupOps)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcXaSinkFunction.j [...]
+Constructor <org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunction.<init>(org.apache.flink.connector.jdbc.internal.JdbcOutputFormat, org.apache.flink.connector.jdbc.xa.XaFacade, org.apache.flink.connector.jdbc.xa.XidGenerator, org.apache.flink.connector.jdbc.xa.XaSinkStateHandler, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.xa.XaGroupOps)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcXaSinkFunction.j [...]
+Constructor <org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunction.<init>(org.apache.flink.connector.jdbc.internal.JdbcOutputFormat, org.apache.flink.connector.jdbc.xa.XaFacade, org.apache.flink.connector.jdbc.xa.XidGenerator, org.apache.flink.connector.jdbc.xa.XaSinkStateHandler, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.xa.XaGroupOps)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcXaSinkFunction.j [...]
+Constructor <org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunction.<init>(org.apache.flink.connector.jdbc.internal.JdbcOutputFormat, org.apache.flink.connector.jdbc.xa.XaFacade, org.apache.flink.connector.jdbc.xa.XidGenerator, org.apache.flink.connector.jdbc.xa.XaSinkStateHandler, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.xa.XaGroupOps)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcXaSinkFunction.j [...]
+Constructor <org.apache.flink.connector.jdbc.xa.XaFacadeImpl.<init>(java.util.function.Supplier, java.lang.Integer)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (XaFacadeImpl.java:90)
+Constructor <org.apache.flink.connector.jdbc.xa.XidImpl.<init>(int, [B, [B)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean)> in (XidImpl.java:46)
+Constructor <org.apache.flink.connector.jdbc.xa.XidImpl.<init>(int, [B, [B)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean)> in (XidImpl.java:47)
+Field <org.apache.flink.connector.jdbc.converter.AbstractJdbcRowConverter.fieldTypes> has type <[Lorg.apache.flink.table.types.logical.LogicalType;> in (AbstractJdbcRowConverter.java:0)
+Field <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.fieldDataTypes> has type <[Lorg.apache.flink.table.types.DataType;> in (JdbcOutputFormatBuilder.java:0)
+Interface <org.apache.flink.connector.jdbc.JdbcStatementBuilder> extends interface <org.apache.flink.util.function.BiConsumerWithException> in (JdbcStatementBuilder.java:0)
+Method <org.apache.flink.connector.jdbc.JdbcConnectionOptions$JdbcConnectionOptionsBuilder.withProperty(java.lang.String, java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcConnectionOptions.java:116)
+Method <org.apache.flink.connector.jdbc.JdbcConnectionOptions$JdbcConnectionOptionsBuilder.withProperty(java.lang.String, java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcConnectionOptions.java:117)
+Method <org.apache.flink.connector.jdbc.JdbcInputFormat$JdbcInputFormatBuilder.setFetchSize(int)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.String, [Ljava.lang.Object;)> in (JdbcInputFormat.java:406)
+Method <org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog.databaseExists(java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean)> in (AbstractJdbcCatalog.java:221)
+Method <org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog.getDatabase(java.lang.String)> calls constructor <org.apache.flink.table.catalog.CatalogDatabaseImpl.<init>(java.util.Map, java.lang.String)> in (AbstractJdbcCatalog.java:252)
+Method <org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog.getDatabase(java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (AbstractJdbcCatalog.java:248)
+Method <org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog.getPrimaryKey(java.sql.DatabaseMetaData, java.lang.String, java.lang.String, java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (AbstractJdbcCatalog.java:194)
+Method <org.apache.flink.connector.jdbc.catalog.JdbcCatalog.getInternal()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcCatalog.java:0)
+Method <org.apache.flink.connector.jdbc.catalog.JdbcCatalogUtils.validateJdbcUrl(java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean)> in (JdbcCatalogUtils.java:44)
+Method <org.apache.flink.connector.jdbc.converter.AbstractPostgresCompatibleRowConverter.createPostgresArrayConverter(org.apache.flink.table.types.logical.ArrayType)> calls method <org.apache.flink.table.types.logical.utils.LogicalTypeUtils.toInternalConversionClass(org.apache.flink.table.types.logical.LogicalType)> in (AbstractPostgresCompatibleRowConverter.java:75)
+Method <org.apache.flink.connector.jdbc.databases.cratedb.catalog.CrateDBTablePath.fromFlinkTableName(java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (CrateDBTablePath.java:41)
+Method <org.apache.flink.connector.jdbc.databases.mysql.catalog.MySqlCatalog.listTables(java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (MySqlCatalog.java:114)
+Method <org.apache.flink.connector.jdbc.databases.postgres.catalog.PostgresCatalog.listTables(java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (PostgresCatalog.java:184)
+Method <org.apache.flink.connector.jdbc.databases.postgres.catalog.PostgresTablePath.fromFlinkTableName(java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (PostgresTablePath.java:56)
+Method <org.apache.flink.connector.jdbc.datasource.connections.SimpleJdbcConnectionProvider.loadDriver(java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (SimpleJdbcConnectionProvider.java:86)
+Method <org.apache.flink.connector.jdbc.datasource.connections.xa.PoolingXaConnectionProvider.endAndPrepare(javax.transaction.xa.Xid)> calls method <org.apache.flink.util.Preconditions.checkState(boolean)> in (PoolingXaConnectionProvider.java:109)
+Method <org.apache.flink.connector.jdbc.datasource.connections.xa.PoolingXaConnectionProvider.open()> calls method <org.apache.flink.util.Preconditions.checkState(boolean)> in (PoolingXaConnectionProvider.java:79)
+Method <org.apache.flink.connector.jdbc.datasource.connections.xa.PoolingXaConnectionProvider.peekPooled()> calls method <org.apache.flink.util.ExceptionUtils.rethrow(java.lang.Throwable)> in (PoolingXaConnectionProvider.java:202)
+Method <org.apache.flink.connector.jdbc.datasource.connections.xa.PoolingXaConnectionProvider.start(javax.transaction.xa.Xid)> calls method <org.apache.flink.util.Preconditions.checkState(boolean)> in (PoolingXaConnectionProvider.java:91)
+Method <org.apache.flink.connector.jdbc.datasource.connections.xa.SimpleXaConnectionProvider.execute(org.apache.flink.connector.jdbc.datasource.connections.xa.XaCommand)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (SimpleXaConnectionProvider.java:261)
+Method <org.apache.flink.connector.jdbc.datasource.connections.xa.SimpleXaConnectionProvider.from(javax.sql.XADataSource)> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (SimpleXaConnectionProvider.java:0)
+Method <org.apache.flink.connector.jdbc.datasource.connections.xa.SimpleXaConnectionProvider.getConnection()> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (SimpleXaConnectionProvider.java:128)
+Method <org.apache.flink.connector.jdbc.datasource.connections.xa.SimpleXaConnectionProvider.open()> calls method <org.apache.flink.util.Preconditions.checkState(boolean)> in (SimpleXaConnectionProvider.java:101)
+Method <org.apache.flink.connector.jdbc.datasource.connections.xa.SimpleXaConnectionProvider.open()> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (SimpleXaConnectionProvider.java:87)
+Method <org.apache.flink.connector.jdbc.datasource.connections.xa.SimpleXaConnectionProvider.recover()> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (SimpleXaConnectionProvider.java:246)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.XaTransaction.checkState()> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (XaTransaction.java:121)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.XaTransaction.checkState()> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (XaTransaction.java:122)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.XaTransaction.createTx(long)> calls method <org.apache.flink.util.ExceptionUtils.rethrowIOException(java.lang.Throwable)> in (XaTransaction.java:135)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.XaTransaction.createTx(long)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (XaTransaction.java:130)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.XaTransaction.open(org.apache.flink.connector.jdbc.sink.writer.JdbcWriterState)> calls method <org.apache.flink.util.ExceptionUtils.rethrowIOException(java.lang.Throwable)> in (XaTransaction.java:86)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.XaTransaction.prepareTx()> calls method <org.apache.flink.util.ExceptionUtils.rethrowIOException(java.lang.Throwable)> in (XaTransaction.java:151)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.deserialize([B)> calls constructor <org.apache.flink.core.memory.DataInputDeserializer.<init>([B)> in (TransactionId.java:96)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.deserialize([B)> calls method <org.apache.flink.core.memory.DataInputDeserializer.readInt()> in (TransactionId.java:101)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.deserialize([B)> calls method <org.apache.flink.core.memory.DataInputDeserializer.readInt()> in (TransactionId.java:98)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.deserialize([B)> calls method <org.apache.flink.core.memory.DataInputDeserializer.readInt()> in (TransactionId.java:99)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.deserialize([B)> calls method <org.apache.flink.core.memory.DataInputDeserializer.readLong()> in (TransactionId.java:100)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.fromXid(int, [B, [B, boolean)> calls constructor <org.apache.flink.core.memory.DataInputDeserializer.<init>([B)> in (TransactionId.java:83)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.fromXid(int, [B, [B, boolean)> calls constructor <org.apache.flink.core.memory.DataInputDeserializer.<init>([B)> in (TransactionId.java:87)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.fromXid(int, [B, [B, boolean)> calls method <org.apache.flink.core.memory.DataInputDeserializer.readInt()> in (TransactionId.java:85)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.fromXid(int, [B, [B, boolean)> calls method <org.apache.flink.core.memory.DataInputDeserializer.readInt()> in (TransactionId.java:88)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.fromXid(int, [B, [B, boolean)> calls method <org.apache.flink.core.memory.DataInputDeserializer.readLong()> in (TransactionId.java:89)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.getBranchQualifier()> calls constructor <org.apache.flink.core.memory.DataOutputSerializer.<init>(int)> in (TransactionId.java:172)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.getBranchQualifier()> calls method <org.apache.flink.core.memory.DataOutputSerializer.getSharedBuffer()> in (TransactionId.java:175)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.getBranchQualifier()> calls method <org.apache.flink.core.memory.DataOutputSerializer.writeInt(int)> in (TransactionId.java:173)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.getBranchQualifier()> calls method <org.apache.flink.core.memory.DataOutputSerializer.writeLong(long)> in (TransactionId.java:174)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.getBranchQualifier()> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (TransactionId.java:169)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.getGlobalTransactionId()> calls constructor <org.apache.flink.core.memory.DataOutputSerializer.<init>(int)> in (TransactionId.java:158)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.getGlobalTransactionId()> calls method <org.apache.flink.core.memory.DataOutputSerializer.getSharedBuffer()> in (TransactionId.java:161)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.getGlobalTransactionId()> calls method <org.apache.flink.core.memory.DataOutputSerializer.write([B, int, int)> in (TransactionId.java:159)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.getGlobalTransactionId()> calls method <org.apache.flink.core.memory.DataOutputSerializer.writeInt(int)> in (TransactionId.java:160)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.readJobId(org.apache.flink.core.memory.DataInputDeserializer)> calls method <org.apache.flink.core.memory.DataInputDeserializer.read([B)> in (TransactionId.java:110)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.readJobId(org.apache.flink.core.memory.DataInputDeserializer)> has parameter of type <org.apache.flink.core.memory.DataInputDeserializer> in (TransactionId.java:0)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.serialize()> calls constructor <org.apache.flink.core.memory.DataOutputSerializer.<init>(int)> in (TransactionId.java:183)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.serialize()> calls method <org.apache.flink.core.memory.DataOutputSerializer.getSharedBuffer()> in (TransactionId.java:189)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.serialize()> calls method <org.apache.flink.core.memory.DataOutputSerializer.write([B, int, int)> in (TransactionId.java:184)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.serialize()> calls method <org.apache.flink.core.memory.DataOutputSerializer.writeInt(int)> in (TransactionId.java:185)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.serialize()> calls method <org.apache.flink.core.memory.DataOutputSerializer.writeInt(int)> in (TransactionId.java:186)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.serialize()> calls method <org.apache.flink.core.memory.DataOutputSerializer.writeInt(int)> in (TransactionId.java:188)
+Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.serialize()> calls method <org.apache.flink.core.memory.DataOutputSerializer.writeLong(long)> in (TransactionId.java:187)
+Method <org.apache.flink.connector.jdbc.dialect.AbstractDialect$Range.of(int, int)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (AbstractDialect.java:256)
+Method <org.apache.flink.connector.jdbc.internal.JdbcOutputFormat.getConnection()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcOutputFormat.java:0)
+Method <org.apache.flink.connector.jdbc.internal.JdbcOutputFormat.open(org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer)> calls constructor <org.apache.flink.util.concurrent.ExecutorThreadFactory.<init>(java.lang.String)> in (JdbcOutputFormat.java:103)
+Method <org.apache.flink.connector.jdbc.internal.JdbcOutputFormat.open(org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcOutputFormat.java:94)
+Method <org.apache.flink.connector.jdbc.internal.RowJdbcOutputFormat$Builder.build()> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (RowJdbcOutputFormat.java:132)
+Method <org.apache.flink.connector.jdbc.internal.TableJdbcUpsertOutputFormat.createUpsertRowExecutor(org.apache.flink.connector.jdbc.internal.options.JdbcDmlOptions)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean)> in (TableJdbcUpsertOutputFormat.java:152)
+Method <org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions$Builder.build()> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (InternalJdbcConnectionOptions.java:202)
+Method <org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions$Builder.build()> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (InternalJdbcConnectionOptions.java:203)
+Method <org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions$Builder.setProperty(java.lang.String, java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (InternalJdbcConnectionOptions.java:195)
+Method <org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions$Builder.setProperty(java.lang.String, java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (InternalJdbcConnectionOptions.java:196)
+Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.build(org.apache.flink.connector.base.DeliveryGuarantee, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:111)
+Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.build(org.apache.flink.connector.base.DeliveryGuarantee, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:112)
+Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.build(org.apache.flink.connector.base.DeliveryGuarantee, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:113)
+Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.build(org.apache.flink.connector.base.DeliveryGuarantee, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:114)
+Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.build(org.apache.flink.connector.base.DeliveryGuarantee, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:115)
+Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.buildAtLeastOnce(org.apache.flink.connector.jdbc.JdbcConnectionOptions)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:67)
+Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.buildAtLeastOnce(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:73)
+Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.buildAtLeastOnce(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:78)
+Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.buildExactlyOnce(org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.connections.xa.XaConnectionProvider)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:101)
+Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.buildExactlyOnce(org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.connections.xa.XaConnectionProvider)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:102)
+Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.buildExactlyOnce(org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.util.function.SerializableSupplier)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:85)
+Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.buildExactlyOnce(org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.util.function.SerializableSupplier)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:86)
+Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.withExecutionOptions(org.apache.flink.connector.jdbc.JdbcExecutionOptions)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:51)
+Method <org.apache.flink.connector.jdbc.sink.committer.JdbcCommitableSerializer.deserialize(int, [B)> calls constructor <org.apache.flink.core.memory.DataInputDeserializer.<init>([B)> in (JdbcCommitableSerializer.java:34)
+Method <org.apache.flink.connector.jdbc.sink.committer.JdbcCommitableSerializer.serialize(org.apache.flink.connector.jdbc.sink.committer.JdbcCommitable)> calls constructor <org.apache.flink.core.memory.DataOutputSerializer.<init>(int)> in (JdbcCommitableSerializer.java:27)
+Method <org.apache.flink.connector.jdbc.sink.committer.JdbcCommitableSerializer.serialize(org.apache.flink.connector.jdbc.sink.committer.JdbcCommitable)> calls method <org.apache.flink.core.memory.DataOutputSerializer.getSharedBuffer()> in (JdbcCommitableSerializer.java:29)
+Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriter.snapshotState(long)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.String, [Ljava.lang.Object;)> in (JdbcWriter.java:192)
+Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.deserialize(int, [B)> calls constructor <org.apache.flink.core.memory.DataInputDeserializer.<init>([B)> in (JdbcWriterStateSerializer.java:48)
+Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.deserializeV2(org.apache.flink.core.memory.DataInputDeserializer)> calls method <org.apache.flink.core.memory.DataInputDeserializer.read([B, int, int)> in (JdbcWriterStateSerializer.java:62)
+Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.deserializeV2(org.apache.flink.core.memory.DataInputDeserializer)> calls method <org.apache.flink.core.memory.DataInputDeserializer.read([B, int, int)> in (JdbcWriterStateSerializer.java:70)
+Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.deserializeV2(org.apache.flink.core.memory.DataInputDeserializer)> calls method <org.apache.flink.core.memory.DataInputDeserializer.readByte()> in (JdbcWriterStateSerializer.java:60)
+Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.deserializeV2(org.apache.flink.core.memory.DataInputDeserializer)> calls method <org.apache.flink.core.memory.DataInputDeserializer.readByte()> in (JdbcWriterStateSerializer.java:68)
+Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.deserializeV2(org.apache.flink.core.memory.DataInputDeserializer)> calls method <org.apache.flink.core.memory.DataInputDeserializer.readInt()> in (JdbcWriterStateSerializer.java:57)
+Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.deserializeV2(org.apache.flink.core.memory.DataInputDeserializer)> calls method <org.apache.flink.core.memory.DataInputDeserializer.readInt()> in (JdbcWriterStateSerializer.java:65)
+Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.deserializeV2(org.apache.flink.core.memory.DataInputDeserializer)> has parameter of type <org.apache.flink.core.memory.DataInputDeserializer> in (JdbcWriterStateSerializer.java:0)
+Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.serialize(org.apache.flink.connector.jdbc.sink.writer.JdbcWriterState)> calls constructor <org.apache.flink.core.memory.DataOutputSerializer.<init>(int)> in (JdbcWriterStateSerializer.java:29)
+Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.serialize(org.apache.flink.connector.jdbc.sink.writer.JdbcWriterState)> calls method <org.apache.flink.core.memory.DataOutputSerializer.getSharedBuffer()> in (JdbcWriterStateSerializer.java:42)
+Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.serialize(org.apache.flink.connector.jdbc.sink.writer.JdbcWriterState)> calls method <org.apache.flink.core.memory.DataOutputSerializer.write([B, int, int)> in (JdbcWriterStateSerializer.java:34)
+Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.serialize(org.apache.flink.connector.jdbc.sink.writer.JdbcWriterState)> calls method <org.apache.flink.core.memory.DataOutputSerializer.write([B, int, int)> in (JdbcWriterStateSerializer.java:40)
+Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.serialize(org.apache.flink.connector.jdbc.sink.writer.JdbcWriterState)> calls method <org.apache.flink.core.memory.DataOutputSerializer.writeByte(int)> in (JdbcWriterStateSerializer.java:33)
+Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.serialize(org.apache.flink.connector.jdbc.sink.writer.JdbcWriterState)> calls method <org.apache.flink.core.memory.DataOutputSerializer.writeByte(int)> in (JdbcWriterStateSerializer.java:39)
+Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.serialize(org.apache.flink.connector.jdbc.sink.writer.JdbcWriterState)> calls method <org.apache.flink.core.memory.DataOutputSerializer.writeInt(int)> in (JdbcWriterStateSerializer.java:30)
+Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.serialize(org.apache.flink.connector.jdbc.sink.writer.JdbcWriterState)> calls method <org.apache.flink.core.memory.DataOutputSerializer.writeInt(int)> in (JdbcWriterStateSerializer.java:36)
+Method <org.apache.flink.connector.jdbc.source.JdbcSource.equals(java.lang.Object)> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcSource.java:0)
+Method <org.apache.flink.connector.jdbc.source.JdbcSource.getConfiguration()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcSource.java:0)
+Method <org.apache.flink.connector.jdbc.source.JdbcSource.getResultExtractor()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcSource.java:0)
+Method <org.apache.flink.connector.jdbc.source.JdbcSource.getSqlSplitEnumeratorProvider()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcSource.java:0)
+Method <org.apache.flink.connector.jdbc.source.JdbcSource.getTypeInformation()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcSource.java:0)
+Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.build()> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSourceBuilder.java:250)
+Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.build()> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSourceBuilder.java:251)
+Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.build()> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (JdbcSourceBuilder.java:248)
+Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.setConnectionProperty(java.lang.String, java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSourceBuilder.java:187)
+Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.setConnectionProperty(java.lang.String, java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSourceBuilder.java:188)
+Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.setConnectionProvider(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcSourceBuilder.java:234)
+Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.setDBUrl(java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcSourceBuilder.java:164)
+Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.setDriverName(java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcSourceBuilder.java:156)
+Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.setJdbcParameterValuesProvider(org.apache.flink.connector.jdbc.split.JdbcParameterValuesProvider)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcSourceBuilder.java:195)
+Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.setResultExtractor(org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSourceBuilder.java:140)
+Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.setResultSetFetchSize(int)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.String, [Ljava.lang.Object;)> in (JdbcSourceBuilder.java:224)
+Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.setSplitReaderFetchBatchSize(int)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.String, [Ljava.lang.Object;)> in (JdbcSourceBuilder.java:200)
+Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.setSql(java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcSourceBuilder.java:131)
+Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.setTypeInformation(org.apache.flink.api.common.typeinfo.TypeInformation)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSourceBuilder.java:173)
+Method <org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumStateSerializer.deserialize(int, [B)> calls method <org.apache.flink.util.InstantiationUtil.deserializeObject([B, java.lang.ClassLoader)> in (JdbcSourceEnumStateSerializer.java:110)
+Method <org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumStateSerializer.serialize(org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumeratorState)> calls method <org.apache.flink.util.InstantiationUtil.serializeObject(java.lang.Object)> in (JdbcSourceEnumStateSerializer.java:70)
+Method <org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumStateSerializer.serialize(org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumeratorState)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.String, [Ljava.lang.Object;)> in (JdbcSourceEnumStateSerializer.java:58)
+Method <org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumStateSerializer.serializeJdbcSourceSplits(java.io.DataOutputStream, java.util.List)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcSourceEnumStateSerializer.java:86)
+Method <org.apache.flink.connector.jdbc.source.enumerator.SqlTemplateSplitEnumerator$TemplateSqlSplitEnumeratorProvider.setSqlTemplate(java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (SqlTemplateSplitEnumerator.java:92)
+Method <org.apache.flink.connector.jdbc.source.enumerator.SqlTemplateSplitEnumerator.getParameterValuesProvider()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (SqlTemplateSplitEnumerator.java:0)
+Method <org.apache.flink.connector.jdbc.source.enumerator.SqlTemplateSplitEnumerator.getSqlTemplate()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (SqlTemplateSplitEnumerator.java:0)
+Method <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.fetch()> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (JdbcSourceSplitReader.java:131)
+Method <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.finishSplit()> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (JdbcSourceSplitReader.java:157)
+Method <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.getConnection()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcSourceSplitReader.java:0)
+Method <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.getResultSet()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcSourceSplitReader.java:0)
+Method <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.getSplits()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcSourceSplitReader.java:0)
+Method <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.getStatement()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcSourceSplitReader.java:0)
+Method <org.apache.flink.connector.jdbc.source.reader.extractor.RowResultExtractor.extract(java.sql.ResultSet)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean)> in (RowResultExtractor.java:33)
+Method <org.apache.flink.connector.jdbc.source.split.JdbcSourceSplitSerializer.deserializeJdbcSourceSplit(java.io.DataInputStream)> calls method <org.apache.flink.util.InstantiationUtil.deserializeObject([B, java.lang.ClassLoader)> in (JdbcSourceSplitSerializer.java:100)
+Method <org.apache.flink.connector.jdbc.source.split.JdbcSourceSplitSerializer.deserializeJdbcSourceSplit(java.io.DataInputStream)> calls method <org.apache.flink.util.InstantiationUtil.deserializeObject([B, java.lang.ClassLoader)> in (JdbcSourceSplitSerializer.java:109)
+Method <org.apache.flink.connector.jdbc.source.split.JdbcSourceSplitSerializer.serialize(org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcSourceSplitSerializer.java:46)
+Method <org.apache.flink.connector.jdbc.source.split.JdbcSourceSplitSerializer.serializeJdbcSourceSplit(java.io.DataOutputStream, org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit)> calls method <org.apache.flink.util.InstantiationUtil.serializeObject(java.lang.Object)> in (JdbcSourceSplitSerializer.java:80)
+Method <org.apache.flink.connector.jdbc.source.split.JdbcSourceSplitSerializer.serializeJdbcSourceSplit(java.io.DataOutputStream, org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit)> calls method <org.apache.flink.util.InstantiationUtil.serializeObject(java.lang.Object)> in (JdbcSourceSplitSerializer.java:87)
+Method <org.apache.flink.connector.jdbc.split.JdbcNumericBetweenParametersProvider.getParameterValues()> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (JdbcNumericBetweenParametersProvider.java:100)
+Method <org.apache.flink.connector.jdbc.split.JdbcNumericBetweenParametersProvider.ofBatchNum(int)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcNumericBetweenParametersProvider.java:87)
+Method <org.apache.flink.connector.jdbc.split.JdbcNumericBetweenParametersProvider.ofBatchSize(long)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcNumericBetweenParametersProvider.java:75)
+Method <org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatementImpl.parseNamedStatement(java.lang.String, java.util.Map)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (FieldNamedPreparedStatementImpl.java:247)
+Method <org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatementImpl.prepareStatement(java.sql.Connection, java.lang.String, [Ljava.lang.String;, java.lang.String, int)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (FieldNamedPreparedStatementImpl.java:202)
+Method <org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatementImpl.prepareStatement(java.sql.Connection, java.lang.String, [Ljava.lang.String;, java.lang.String, int)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (FieldNamedPreparedStatementImpl.java:212)
+Method <org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatementImpl.prepareStatement(java.sql.Connection, java.lang.String, [Ljava.lang.String;, java.lang.String, int)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (FieldNamedPreparedStatementImpl.java:187)
+Method <org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatementImpl.prepareStatement(java.sql.Connection, java.lang.String, [Ljava.lang.String;, java.lang.String, int)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (FieldNamedPreparedStatementImpl.java:188)
+Method <org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatementImpl.prepareStatement(java.sql.Connection, java.lang.String, [Ljava.lang.String;, java.lang.String, int)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (FieldNamedPreparedStatementImpl.java:189)
+Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory.checkAllOrNone(org.apache.flink.configuration.ReadableConfig, [Lorg.apache.flink.configuration.ConfigOption;)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcDynamicTableFactory.java:351)
+Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory.checkAllOrNone(org.apache.flink.configuration.ReadableConfig, [Lorg.apache.flink.configuration.ConfigOption;)> has parameter of type <[Lorg.apache.flink.configuration.ConfigOption;> in (JdbcDynamicTableFactory.java:0)
+Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory.createDynamicTableSource(org.apache.flink.table.factories.DynamicTableFactory$Context)> gets field <org.apache.flink.table.connector.source.lookup.LookupOptions.MAX_RETRIES> in (JdbcDynamicTableFactory.java:127)
+Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory.getLookupCache(org.apache.flink.configuration.ReadableConfig)> calls method <org.apache.flink.table.connector.source.lookup.LookupOptions$LookupCacheType.equals(java.lang.Object)> in (JdbcDynamicTableFactory.java:216)
+Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory.getLookupCache(org.apache.flink.configuration.ReadableConfig)> gets field <org.apache.flink.table.connector.source.lookup.LookupOptions$LookupCacheType.PARTIAL> in (JdbcDynamicTableFactory.java:215)
+Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory.getLookupCache(org.apache.flink.configuration.ReadableConfig)> gets field <org.apache.flink.table.connector.source.lookup.LookupOptions.CACHE_TYPE> in (JdbcDynamicTableFactory.java:214)
+Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory.optionalOptions()> gets field <org.apache.flink.table.connector.source.lookup.LookupOptions.CACHE_TYPE> in (JdbcDynamicTableFactory.java:257)
+Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory.optionalOptions()> gets field <org.apache.flink.table.connector.source.lookup.LookupOptions.MAX_RETRIES> in (JdbcDynamicTableFactory.java:262)
+Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory.optionalOptions()> gets field <org.apache.flink.table.connector.source.lookup.LookupOptions.PARTIAL_CACHE_CACHE_MISSING_KEY> in (JdbcDynamicTableFactory.java:261)
+Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory.optionalOptions()> gets field <org.apache.flink.table.connector.source.lookup.LookupOptions.PARTIAL_CACHE_EXPIRE_AFTER_ACCESS> in (JdbcDynamicTableFactory.java:258)
+Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory.optionalOptions()> gets field <org.apache.flink.table.connector.source.lookup.LookupOptions.PARTIAL_CACHE_EXPIRE_AFTER_WRITE> in (JdbcDynamicTableFactory.java:259)
+Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory.optionalOptions()> gets field <org.apache.flink.table.connector.source.lookup.LookupOptions.PARTIAL_CACHE_MAX_ROWS> in (JdbcDynamicTableFactory.java:260)
+Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableSink.validatePrimaryKey(org.apache.flink.table.connector.ChangelogMode)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (JdbcDynamicTableSink.java:69)
+Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableSource.getLookupRuntimeProvider(org.apache.flink.table.connector.source.LookupTableSource$LookupContext)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcDynamicTableSource.java:112)
+Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.build()> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcOutputFormatBuilder.java:81)
+Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.build()> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcOutputFormatBuilder.java:82)
+Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.build()> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcOutputFormatBuilder.java:83)
+Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.createBufferReduceExecutor(org.apache.flink.connector.jdbc.internal.options.JdbcDmlOptions, [Lorg.apache.flink.table.types.logical.LogicalType;)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean)> in (JdbcOutputFormatBuilder.java:116)
+Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.createBufferReduceExecutor(org.apache.flink.connector.jdbc.internal.options.JdbcDmlOptions, [Lorg.apache.flink.table.types.logical.LogicalType;)> has parameter of type <[Lorg.apache.flink.table.types.logical.LogicalType;> in (JdbcOutputFormatBuilder.java:0)
+Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.createDeleteExecutor(org.apache.flink.connector.jdbc.dialect.JdbcDialect, java.lang.String, [Ljava.lang.String;, [Lorg.apache.flink.table.types.logical.LogicalType;)> has parameter of type <[Lorg.apache.flink.table.types.logical.LogicalType;> in (JdbcOutputFormatBuilder.java:0)
+Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.createInsertOrUpdateExecutor(org.apache.flink.connector.jdbc.dialect.JdbcDialect, java.lang.String, [Ljava.lang.String;, [Lorg.apache.flink.table.types.logical.LogicalType;, [I, [Ljava.lang.String;, [Lorg.apache.flink.table.types.logical.LogicalType;)> has parameter of type <[Lorg.apache.flink.table.types.logical.LogicalType;> in (JdbcOutputFormatBuilder.java:0)
+Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.createRowKeyExtractor([Lorg.apache.flink.table.types.logical.LogicalType;, [I)> has parameter of type <[Lorg.apache.flink.table.types.logical.LogicalType;> in (JdbcOutputFormatBuilder.java:0)
+Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.createSimpleBufferedExecutor(org.apache.flink.connector.jdbc.dialect.JdbcDialect, [Ljava.lang.String;, [Lorg.apache.flink.table.types.logical.LogicalType;, java.lang.String)> has parameter of type <[Lorg.apache.flink.table.types.logical.LogicalType;> in (JdbcOutputFormatBuilder.java:0)
+Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.createSimpleRowExecutor(org.apache.flink.connector.jdbc.dialect.JdbcDialect, [Ljava.lang.String;, [Lorg.apache.flink.table.types.logical.LogicalType;, java.lang.String)> has parameter of type <[Lorg.apache.flink.table.types.logical.LogicalType;> in (JdbcOutputFormatBuilder.java:0)
+Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.createUpsertRowExecutor(org.apache.flink.connector.jdbc.dialect.JdbcDialect, java.lang.String, [Ljava.lang.String;, [Lorg.apache.flink.table.types.logical.LogicalType;, [I, [Ljava.lang.String;, [Lorg.apache.flink.table.types.logical.LogicalType;)> has parameter of type <[Lorg.apache.flink.table.types.logical.LogicalType;> in (JdbcOutputFormatBuilder.java:0)
+Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.getPrimaryKey(org.apache.flink.table.data.RowData, [Lorg.apache.flink.table.data.RowData$FieldGetter;)> has parameter of type <[Lorg.apache.flink.table.data.RowData$FieldGetter;> in (JdbcOutputFormatBuilder.java:0)
+Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.setFieldDataTypes([Lorg.apache.flink.table.types.DataType;)> has parameter of type <[Lorg.apache.flink.table.types.DataType;> in (JdbcOutputFormatBuilder.java:0)
+Method <org.apache.flink.connector.jdbc.table.JdbcRowDataInputFormat$Builder.setFetchSize(int)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.String, [Ljava.lang.Object;)> in (JdbcRowDataInputFormat.java:356)
+Method <org.apache.flink.connector.jdbc.table.JdbcRowDataInputFormat.createInputSplits(int)> has return type <[Lorg.apache.flink.core.io.InputSplit;> in (JdbcRowDataInputFormat.java:0)
+Method <org.apache.flink.connector.jdbc.table.JdbcRowDataInputFormat.getInputSplitAssigner([Lorg.apache.flink.core.io.InputSplit;)> calls constructor <org.apache.flink.api.common.io.DefaultInputSplitAssigner.<init>([Lorg.apache.flink.core.io.InputSplit;)> in (JdbcRowDataInputFormat.java:287)
+Method <org.apache.flink.connector.jdbc.table.JdbcRowDataInputFormat.getInputSplitAssigner([Lorg.apache.flink.core.io.InputSplit;)> has parameter of type <[Lorg.apache.flink.core.io.InputSplit;> in (JdbcRowDataInputFormat.java:0)
+Method <org.apache.flink.connector.jdbc.table.JdbcRowDataLookupFunction.getDbConnection()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcRowDataLookupFunction.java:0)
+Method <org.apache.flink.connector.jdbc.utils.JdbcUtils.getConnectionProperties(org.apache.flink.configuration.ReadableConfig)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean)> in (JdbcUtils.java:49)
+Method <org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunction.beginTx(long)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (JdbcXaSinkFunction.java:312)
+Method <org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunction.invoke(java.lang.Object, org.apache.flink.streaming.api.functions.sink.SinkFunction$Context)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (JdbcXaSinkFunction.java:263)
+Method <org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunction.prepareCurrentTx(long)> calls method <org.apache.flink.util.ExceptionUtils.rethrowIOException(java.lang.Throwable)> in (JdbcXaSinkFunction.java:305)
+Method <org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunction.prepareCurrentTx(long)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (JdbcXaSinkFunction.java:290)
+Method <org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunction.prepareCurrentTx(long)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (JdbcXaSinkFunction.java:291)
+Method <org.apache.flink.connector.jdbc.xa.XaFacadeImpl.execute(org.apache.flink.connector.jdbc.xa.XaFacadeImpl$Command)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (XaFacadeImpl.java:270)
+Method <org.apache.flink.connector.jdbc.xa.XaFacadeImpl.fromXaDataSource(javax.sql.XADataSource)> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (XaFacadeImpl.java:0)
+Method <org.apache.flink.connector.jdbc.xa.XaFacadeImpl.getConnection()> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (XaFacadeImpl.java:137)
+Method <org.apache.flink.connector.jdbc.xa.XaFacadeImpl.open()> calls method <org.apache.flink.util.Preconditions.checkState(boolean)> in (XaFacadeImpl.java:110)
+Method <org.apache.flink.connector.jdbc.xa.XaFacadeImpl.open()> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (XaFacadeImpl.java:96)
+Method <org.apache.flink.connector.jdbc.xa.XaFacadeImpl.recover()> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (XaFacadeImpl.java:250)
+Method <org.apache.flink.connector.jdbc.xa.XaFacadePoolingImpl.endAndPrepare(javax.transaction.xa.Xid)> calls method <org.apache.flink.util.Preconditions.checkState(boolean)> in (XaFacadePoolingImpl.java:95)
+Method <org.apache.flink.connector.jdbc.xa.XaFacadePoolingImpl.open()> calls method <org.apache.flink.util.Preconditions.checkState(boolean)> in (XaFacadePoolingImpl.java:65)
+Method <org.apache.flink.connector.jdbc.xa.XaFacadePoolingImpl.peekPooled()> calls method <org.apache.flink.util.ExceptionUtils.rethrow(java.lang.Throwable)> in (XaFacadePoolingImpl.java:187)
+Method <org.apache.flink.connector.jdbc.xa.XaFacadePoolingImpl.start(javax.transaction.xa.Xid)> calls method <org.apache.flink.util.Preconditions.checkState(boolean)> in (XaFacadePoolingImpl.java:77)
\ No newline at end of file
diff --git a/flink-connector-jdbc/archunit-violations/4bca2274-65a9-4a61-81ef-767d58233ea0 b/flink-connector-jdbc-core/archunit-violations/4bca2274-65a9-4a61-81ef-767d58233ea0
similarity index 100%
rename from flink-connector-jdbc/archunit-violations/4bca2274-65a9-4a61-81ef-767d58233ea0
rename to flink-connector-jdbc-core/archunit-violations/4bca2274-65a9-4a61-81ef-767d58233ea0
diff --git a/flink-connector-jdbc/archunit-violations/596bd7eb-1ed5-4963-a56a-941766d61233 b/flink-connector-jdbc-core/archunit-violations/596bd7eb-1ed5-4963-a56a-941766d61233
similarity index 100%
rename from flink-connector-jdbc/archunit-violations/596bd7eb-1ed5-4963-a56a-941766d61233
rename to flink-connector-jdbc-core/archunit-violations/596bd7eb-1ed5-4963-a56a-941766d61233
diff --git a/flink-connector-jdbc/archunit-violations/6b9ab1b0-c14d-4667-bab5-407b81fba98b b/flink-connector-jdbc-core/archunit-violations/6b9ab1b0-c14d-4667-bab5-407b81fba98b
similarity index 100%
rename from flink-connector-jdbc/archunit-violations/6b9ab1b0-c14d-4667-bab5-407b81fba98b
rename to flink-connector-jdbc-core/archunit-violations/6b9ab1b0-c14d-4667-bab5-407b81fba98b
diff --git a/flink-connector-jdbc/archunit-violations/b10c194a-0517-4744-830f-81abfb71ab18 b/flink-connector-jdbc-core/archunit-violations/b10c194a-0517-4744-830f-81abfb71ab18
similarity index 100%
rename from flink-connector-jdbc/archunit-violations/b10c194a-0517-4744-830f-81abfb71ab18
rename to flink-connector-jdbc-core/archunit-violations/b10c194a-0517-4744-830f-81abfb71ab18
diff --git a/flink-connector-jdbc/archunit-violations/d45c3af5-52c6-45fd-9926-75e75e77473a b/flink-connector-jdbc-core/archunit-violations/d45c3af5-52c6-45fd-9926-75e75e77473a
similarity index 100%
rename from flink-connector-jdbc/archunit-violations/d45c3af5-52c6-45fd-9926-75e75e77473a
rename to flink-connector-jdbc-core/archunit-violations/d45c3af5-52c6-45fd-9926-75e75e77473a
diff --git a/flink-connector-jdbc/archunit-violations/f242ee43-a122-4d2f-a291-6439cdb9029f b/flink-connector-jdbc-core/archunit-violations/f242ee43-a122-4d2f-a291-6439cdb9029f
similarity index 100%
rename from flink-connector-jdbc/archunit-violations/f242ee43-a122-4d2f-a291-6439cdb9029f
rename to flink-connector-jdbc-core/archunit-violations/f242ee43-a122-4d2f-a291-6439cdb9029f
diff --git a/flink-connector-jdbc/archunit-violations/stored.rules b/flink-connector-jdbc-core/archunit-violations/stored.rules
similarity index 85%
rename from flink-connector-jdbc/archunit-violations/stored.rules
rename to flink-connector-jdbc-core/archunit-violations/stored.rules
index b471f5b0..1b7a0e39 100644
--- a/flink-connector-jdbc/archunit-violations/stored.rules
+++ b/flink-connector-jdbc-core/archunit-violations/stored.rules
@@ -1,10 +1,11 @@
#
-#Wed Dec 14 13:38:22 CET 2022
-Return\ and\ argument\ types\ of\ methods\ annotated\ with\ @Public\ must\ be\ annotated\ with\ @Public.=596bd7eb-1ed5-4963-a56a-941766d61233
+#Sat May 18 04:39:49 CEST 2024
+Classes\ in\ API\ packages\ should\ have\ at\ least\ one\ API\ visibility\ annotation.=0c7b60d6-a12c-432d-8a72-747cabaeb7ed
+Connector\ production\ code\ must\ depend\ only\ on\ public\ API\ when\ outside\ of\ connector\ packages=2047daea-3713-4298-bdb3-e269f539363f
Connector\ production\ code\ must\ not\ depend\ on\ non-public\ API\ outside\ of\ connector\ packages=f242ee43-a122-4d2f-a291-6439cdb9029f
ITCASE\ tests\ should\ use\ a\ MiniCluster\ resource\ or\ extension=6b9ab1b0-c14d-4667-bab5-407b81fba98b
-Production\ code\ must\ not\ call\ methods\ annotated\ with\ @VisibleForTesting=4bca2274-65a9-4a61-81ef-767d58233ea0
-Tests\ inheriting\ from\ AbstractTestBase\ should\ have\ name\ ending\ with\ ITCase=0f94f11b-9bc8-445a-8be8-e7dfd8a384b0
Options\ for\ connectors\ and\ formats\ should\ reside\ in\ a\ consistent\ package\ and\ be\ public\ API.=b10c194a-0517-4744-830f-81abfb71ab18
+Production\ code\ must\ not\ call\ methods\ annotated\ with\ @VisibleForTesting=4bca2274-65a9-4a61-81ef-767d58233ea0
+Return\ and\ argument\ types\ of\ methods\ annotated\ with\ @Public\ must\ be\ annotated\ with\ @Public.=596bd7eb-1ed5-4963-a56a-941766d61233
Return\ and\ argument\ types\ of\ methods\ annotated\ with\ @PublicEvolving\ must\ be\ annotated\ with\ @Public(Evolving).=d45c3af5-52c6-45fd-9926-75e75e77473a
-Classes\ in\ API\ packages\ should\ have\ at\ least\ one\ API\ visibility\ annotation.=0c7b60d6-a12c-432d-8a72-747cabaeb7ed
+Tests\ inheriting\ from\ AbstractTestBase\ should\ have\ name\ ending\ with\ ITCase=0f94f11b-9bc8-445a-8be8-e7dfd8a384b0
diff --git a/flink-connector-jdbc-core/pom.xml b/flink-connector-jdbc-core/pom.xml
new file mode 100644
index 00000000..990582d8
--- /dev/null
+++ b/flink-connector-jdbc-core/pom.xml
@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-parent</artifactId>
+ <version>3.2-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>flink-connector-jdbc-core</artifactId>
+ <name>Flink : Connectors : JDBC : Core</name>
+
+ <packaging>jar</packaging>
+
+ <properties>
+ <scala.binary.version>2.12</scala.binary.version>
+ <scala-library.version>2.12.7</scala-library.version>
+ <assertj.version>3.23.1</assertj.version>
+ <postgres.version>42.7.3</postgres.version>
+ <oracle.version>21.8.0.0</oracle.version>
+ <trino.version>418</trino.version>
+ <byte-buddy.version>1.12.10</byte-buddy.version>
+ <surefire.module.config> <!-- required by
+ Db2ExactlyOnceSinkE2eTest --> --add-opens=java.base/java.util=ALL-UNNAMED <!--
+ SimpleJdbcConnectionProviderDriverClassConcurrentLoadingITCase--> --add-opens=java.base/java.lang=ALL-UNNAMED
+ </surefire.module.config>
+ </properties>
+
+ <dependencies>
+
+ <!-- Connectors -->
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-base</artifactId>
+ <version>${flink.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Table ecosystem -->
+
+ <!-- Projects depending on this project won't depend on flink-table-*. -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-api-java-bridge</artifactId>
+ <version>${flink.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- Postgres -->
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>${postgres.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Oracle -->
+ <dependency>
+ <groupId>com.oracle.database.jdbc</groupId>
+ <artifactId>ojdbc8</artifactId>
+ <version>${oracle.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Trino -->
+ <dependency>
+ <groupId>io.trino</groupId>
+ <artifactId>trino-jdbc</artifactId>
+ <version>${trino.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- SQL Server -->
+ <dependency>
+ <groupId>com.microsoft.sqlserver</groupId>
+ <artifactId>mssql-jdbc</artifactId>
+ <version>10.2.1.jre8</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- CrateDB -->
+ <dependency>
+ <groupId>io.crate</groupId>
+ <artifactId>crate-jdbc</artifactId>
+ <version>2.7.0</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- Db2 -->
+ <dependency>
+ <groupId>com.ibm.db2.jcc</groupId>
+ <artifactId>db2jcc</artifactId>
+ <version>db2jcc4</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Tests -->
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-test-utils</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-common</artifactId>
+ <version>${flink.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-streaming-java</artifactId>
+ <version>${flink.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-core</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-api-scala-bridge_${scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-base</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-test-utils</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Assertions test dependencies -->
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Postgres tests -->
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>postgresql</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- MySQL tests -->
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>8.0.29</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>mysql</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Derby tests -->
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.14.2.0</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Oracle tests -->
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>oracle-xe</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- MS SQL test -->
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>mssqlserver</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- H2 tests -->
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>2.2.224</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Db2 test -->
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>db2</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Trino test -->
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>trino</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- OceanBase tests -->
+ <dependency>
+ <groupId>com.oceanbase</groupId>
+ <artifactId>oceanbase-client</artifactId>
+ <version>2.4.8</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- ArchUit test dependencies -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-architecture-tests-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- For dependency convergence -->
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>${scala-library.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcConnectionOptions.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/JdbcConnectionOptions.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcConnectionOptions.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/JdbcConnectionOptions.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcExactlyOnceOptions.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/JdbcExactlyOnceOptions.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcExactlyOnceOptions.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/JdbcExactlyOnceOptions.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcExecutionOptions.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/JdbcExecutionOptions.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcExecutionOptions.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/JdbcExecutionOptions.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcInputFormat.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/JdbcInputFormat.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcInputFormat.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/JdbcInputFormat.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcRowOutputFormat.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/JdbcRowOutputFormat.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcRowOutputFormat.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/JdbcRowOutputFormat.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcSink.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/JdbcSink.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcSink.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/JdbcSink.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcStatementBuilder.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/JdbcStatementBuilder.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcStatementBuilder.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/JdbcStatementBuilder.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/AbstractJdbcCatalog.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/AbstractJdbcCatalog.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/AbstractJdbcCatalog.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/AbstractJdbcCatalog.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalog.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalog.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalog.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalog.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtils.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtils.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtils.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtils.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactory.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactory.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactory.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactoryOptions.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactoryOptions.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactoryOptions.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactoryOptions.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractPostgresCompatibleRowConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractPostgresCompatibleRowConverter.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractPostgresCompatibleRowConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractPostgresCompatibleRowConverter.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/JdbcRowConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/converter/JdbcRowConverter.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/JdbcRowConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/converter/JdbcRowConverter.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalog.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalog.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalog.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalog.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTablePath.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTablePath.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTablePath.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTablePath.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTypeMapper.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTypeMapper.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTypeMapper.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTypeMapper.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialect.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialect.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialect.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectFactory.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectFactory.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectFactory.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBRowConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBRowConverter.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBRowConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBRowConverter.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Dialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Dialect.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Dialect.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Dialect.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectFactory.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectFactory.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectFactory.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2RowConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2RowConverter.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2RowConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2RowConverter.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyDialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyDialect.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyDialect.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyDialect.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyDialectFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyDialectFactory.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyDialectFactory.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyDialectFactory.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyRowConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyRowConverter.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyRowConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyRowConverter.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalog.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalog.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalog.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalog.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlTypeMapper.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlTypeMapper.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlTypeMapper.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlTypeMapper.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySQLRowConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySQLRowConverter.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySQLRowConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySQLRowConverter.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialect.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialect.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialect.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectFactory.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectFactory.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectFactory.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialect.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialect.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialect.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectFactory.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectFactory.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectFactory.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseRowConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseRowConverter.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseRowConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseRowConverter.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialect.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialect.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialect.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectFactory.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectFactory.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectFactory.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleRowConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleRowConverter.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleRowConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleRowConverter.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalog.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalog.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalog.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalog.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTablePath.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTablePath.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTablePath.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTablePath.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTypeMapper.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTypeMapper.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTypeMapper.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTypeMapper.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialect.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialect.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialect.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectFactory.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectFactory.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectFactory.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresRowConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresRowConverter.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresRowConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresRowConverter.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialect.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialect.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialect.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialectFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialectFactory.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialectFactory.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialectFactory.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerRowConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerRowConverter.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerRowConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerRowConverter.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialect.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialect.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialect.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectFactory.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectFactory.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectFactory.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoRowConverter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoRowConverter.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoRowConverter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoRowConverter.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/JdbcConnectionProvider.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/JdbcConnectionProvider.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/JdbcConnectionProvider.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/JdbcConnectionProvider.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/SimpleJdbcConnectionProvider.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/SimpleJdbcConnectionProvider.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/SimpleJdbcConnectionProvider.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/SimpleJdbcConnectionProvider.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/xa/PoolingXaConnectionProvider.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/xa/PoolingXaConnectionProvider.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/xa/PoolingXaConnectionProvider.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/xa/PoolingXaConnectionProvider.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/xa/SimpleXaConnectionProvider.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/xa/SimpleXaConnectionProvider.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/xa/SimpleXaConnectionProvider.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/xa/SimpleXaConnectionProvider.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/xa/XaCommand.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/xa/XaCommand.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/xa/XaCommand.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/xa/XaCommand.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/xa/XaConnectionProvider.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/xa/XaConnectionProvider.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/xa/XaConnectionProvider.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/xa/XaConnectionProvider.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/statements/JdbcQueryStatement.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/statements/JdbcQueryStatement.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/statements/JdbcQueryStatement.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/statements/JdbcQueryStatement.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/statements/SimpleJdbcQueryStatement.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/statements/SimpleJdbcQueryStatement.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/statements/SimpleJdbcQueryStatement.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/statements/SimpleJdbcQueryStatement.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/XaTransaction.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/XaTransaction.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/XaTransaction.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/XaTransaction.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/XaTransactionResult.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/XaTransactionResult.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/XaTransactionResult.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/XaTransactionResult.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/domain/TransactionId.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/domain/TransactionId.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/domain/TransactionId.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/domain/TransactionId.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/EmptyTransactionXaException.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/EmptyTransactionXaException.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/EmptyTransactionXaException.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/EmptyTransactionXaException.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/TransientXaException.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/TransientXaException.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/TransientXaException.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/TransientXaException.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/XaError.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/XaError.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/XaError.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/XaError.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractDialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractDialect.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractDialect.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractDialect.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractPostgresCompatibleDialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractPostgresCompatibleDialect.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractPostgresCompatibleDialect.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractPostgresCompatibleDialect.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialect.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialect.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialect.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialect.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectFactory.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectFactory.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectFactory.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectLoader.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectLoader.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectLoader.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectLoader.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/GenericJdbcSinkFunction.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/GenericJdbcSinkFunction.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/GenericJdbcSinkFunction.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/GenericJdbcSinkFunction.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/JdbcOutputFormat.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/JdbcOutputFormat.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/JdbcOutputFormat.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/JdbcOutputFormat.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/JdbcOutputSerializer.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/JdbcOutputSerializer.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/JdbcOutputSerializer.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/JdbcOutputSerializer.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/RowJdbcOutputFormat.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/RowJdbcOutputFormat.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/RowJdbcOutputFormat.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/RowJdbcOutputFormat.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/TableJdbcUpsertOutputFormat.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/TableJdbcUpsertOutputFormat.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/TableJdbcUpsertOutputFormat.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/TableJdbcUpsertOutputFormat.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/executor/InsertOrUpdateJdbcExecutor.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/InsertOrUpdateJdbcExecutor.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/executor/InsertOrUpdateJdbcExecutor.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/InsertOrUpdateJdbcExecutor.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/executor/JdbcBatchStatementExecutor.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/JdbcBatchStatementExecutor.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/executor/JdbcBatchStatementExecutor.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/JdbcBatchStatementExecutor.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/executor/KeyedBatchStatementExecutor.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/KeyedBatchStatementExecutor.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/executor/KeyedBatchStatementExecutor.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/KeyedBatchStatementExecutor.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/executor/SimpleBatchStatementExecutor.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/SimpleBatchStatementExecutor.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/executor/SimpleBatchStatementExecutor.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/SimpleBatchStatementExecutor.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableBufferReducedStatementExecutor.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableBufferReducedStatementExecutor.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableBufferReducedStatementExecutor.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableBufferReducedStatementExecutor.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableBufferedStatementExecutor.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableBufferedStatementExecutor.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableBufferedStatementExecutor.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableBufferedStatementExecutor.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableInsertOrUpdateStatementExecutor.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableInsertOrUpdateStatementExecutor.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableInsertOrUpdateStatementExecutor.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableInsertOrUpdateStatementExecutor.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableSimpleStatementExecutor.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableSimpleStatementExecutor.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableSimpleStatementExecutor.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/executor/TableSimpleStatementExecutor.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/options/InternalJdbcConnectionOptions.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/InternalJdbcConnectionOptions.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/options/InternalJdbcConnectionOptions.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/InternalJdbcConnectionOptions.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcDmlOptions.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcDmlOptions.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcDmlOptions.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcDmlOptions.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcInsertOptions.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcInsertOptions.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcInsertOptions.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcInsertOptions.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcReadOptions.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcReadOptions.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcReadOptions.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcReadOptions.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcTypedQueryOptions.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcTypedQueryOptions.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcTypedQueryOptions.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcTypedQueryOptions.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSink.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSink.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSink.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSink.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSinkBuilder.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSinkBuilder.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSinkBuilder.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSinkBuilder.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/committer/JdbcCommitable.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/committer/JdbcCommitable.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/committer/JdbcCommitable.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/committer/JdbcCommitable.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/committer/JdbcCommitableSerializer.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/committer/JdbcCommitableSerializer.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/committer/JdbcCommitableSerializer.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/committer/JdbcCommitableSerializer.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/committer/JdbcCommitter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/committer/JdbcCommitter.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/committer/JdbcCommitter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/committer/JdbcCommitter.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriter.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriter.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterState.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterState.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterState.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterState.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterStateSerializer.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterStateSerializer.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterStateSerializer.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterStateSerializer.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSource.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSource.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSource.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSource.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceBuilder.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceBuilder.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceBuilder.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceBuilder.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceOptions.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceOptions.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceOptions.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceOptions.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumStateSerializer.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumStateSerializer.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumStateSerializer.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumStateSerializer.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumerator.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumerator.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumerator.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumerator.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumeratorState.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumeratorState.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumeratorState.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumeratorState.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSqlSplitEnumeratorBase.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSqlSplitEnumeratorBase.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSqlSplitEnumeratorBase.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSqlSplitEnumeratorBase.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/SqlTemplateSplitEnumerator.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/SqlTemplateSplitEnumerator.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/SqlTemplateSplitEnumerator.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/SqlTemplateSplitEnumerator.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/JdbcRecordEmitter.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/JdbcRecordEmitter.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/JdbcRecordEmitter.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/JdbcRecordEmitter.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceReader.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceReader.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceReader.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceReader.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceSplitReader.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceSplitReader.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceSplitReader.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceSplitReader.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/RecordAndOffset.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/RecordAndOffset.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/RecordAndOffset.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/RecordAndOffset.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/ResultExtractor.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/ResultExtractor.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/ResultExtractor.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/ResultExtractor.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/RowResultExtractor.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/RowResultExtractor.java
similarity index 100%
copy from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/RowResultExtractor.java
copy to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/RowResultExtractor.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/split/CheckpointedOffset.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/split/CheckpointedOffset.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/split/CheckpointedOffset.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/split/CheckpointedOffset.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplit.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplit.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplit.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplit.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplitSerializer.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplitSerializer.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplitSerializer.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplitSerializer.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplitState.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplitState.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplitState.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplitState.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/split/CompositeJdbcParameterValuesProvider.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/split/CompositeJdbcParameterValuesProvider.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/split/CompositeJdbcParameterValuesProvider.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/split/CompositeJdbcParameterValuesProvider.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/split/JdbcGenericParameterValuesProvider.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/split/JdbcGenericParameterValuesProvider.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/split/JdbcGenericParameterValuesProvider.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/split/JdbcGenericParameterValuesProvider.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/split/JdbcNumericBetweenParametersProvider.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/split/JdbcNumericBetweenParametersProvider.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/split/JdbcNumericBetweenParametersProvider.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/split/JdbcNumericBetweenParametersProvider.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/split/JdbcParameterValuesProvider.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/split/JdbcParameterValuesProvider.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/split/JdbcParameterValuesProvider.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/split/JdbcParameterValuesProvider.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/split/JdbcSlideTimingParameterProvider.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/split/JdbcSlideTimingParameterProvider.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/split/JdbcSlideTimingParameterProvider.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/split/JdbcSlideTimingParameterProvider.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatement.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatement.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatement.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatement.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatementImpl.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatementImpl.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatementImpl.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatementImpl.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/statement/StatementFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/statement/StatementFactory.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/statement/StatementFactory.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/statement/StatementFactory.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcConnectorOptions.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcConnectorOptions.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcConnectorOptions.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcConnectorOptions.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactory.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactory.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactory.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSink.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSink.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSink.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSink.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSource.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSource.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSource.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSource.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcFilterPushdownPreparedStatementVisitor.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcFilterPushdownPreparedStatementVisitor.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcFilterPushdownPreparedStatementVisitor.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcFilterPushdownPreparedStatementVisitor.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatBuilder.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatBuilder.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatBuilder.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatBuilder.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormat.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormat.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormat.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormat.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunction.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunction.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunction.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunction.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/ParameterizedPredicate.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/ParameterizedPredicate.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/ParameterizedPredicate.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/ParameterizedPredicate.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/RowResultExtractor.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/RowDataResultExtractor.java
similarity index 57%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/RowResultExtractor.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/RowDataResultExtractor.java
index 6b0d414e..6a191f5a 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/RowResultExtractor.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/RowDataResultExtractor.java
@@ -16,24 +16,27 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.source.reader.extractor;
+package org.apache.flink.connector.jdbc.table;
-import org.apache.flink.types.Row;
+import org.apache.flink.connector.jdbc.converter.JdbcRowConverter;
+import org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor;
+import org.apache.flink.table.data.RowData;
import org.apache.flink.util.Preconditions;
import java.sql.ResultSet;
import java.sql.SQLException;
-/** The extractor is used to extract the data from {@link ResultSet} into a {@link Row} object. */
-public class RowResultExtractor implements ResultExtractor<Row> {
+/** The result extractor for {@link RowData}. */
+public class RowDataResultExtractor implements ResultExtractor<RowData> {
+
+ private final JdbcRowConverter jdbcRowConverter;
+
+ public RowDataResultExtractor(JdbcRowConverter jdbcRowConverter) {
+ this.jdbcRowConverter = Preconditions.checkNotNull(jdbcRowConverter);
+ }
+
@Override
- public Row extract(ResultSet resultSet) throws SQLException {
- int arity = resultSet.getMetaData().getColumnCount();
- Row row = new Row(arity);
- Preconditions.checkArgument(!resultSet.isClosed());
- for (int index = 0; index < row.getArity(); index++) {
- row.setField(index, resultSet.getObject(index + 1));
- }
- return row;
+ public RowData extract(ResultSet resultSet) throws SQLException {
+ return jdbcRowConverter.toInternal(resultSet);
}
}
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/utils/ContinuousUnBoundingSettings.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/utils/ContinuousUnBoundingSettings.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/utils/ContinuousUnBoundingSettings.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/utils/ContinuousUnBoundingSettings.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/utils/JdbcTypeUtil.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/utils/JdbcTypeUtil.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/utils/JdbcTypeUtil.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/utils/JdbcTypeUtil.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/utils/JdbcUtils.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/utils/JdbcUtils.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/utils/JdbcUtils.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/utils/JdbcUtils.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXid.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXid.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXid.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXid.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializer.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializer.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializer.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializer.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunction.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunction.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunction.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunction.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunctionState.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunctionState.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunctionState.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunctionState.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JobSubtask.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/JobSubtask.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JobSubtask.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/JobSubtask.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/SemanticXidGenerator.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/SemanticXidGenerator.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/SemanticXidGenerator.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/SemanticXidGenerator.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacade.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacade.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacade.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacade.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadeImpl.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadeImpl.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadeImpl.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadeImpl.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadePoolingImpl.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadePoolingImpl.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadePoolingImpl.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadePoolingImpl.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOps.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOps.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOps.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOps.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOpsImpl.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOpsImpl.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOpsImpl.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOpsImpl.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandler.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandler.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandler.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandler.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandlerImpl.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandlerImpl.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandlerImpl.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandlerImpl.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateSerializer.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateSerializer.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateSerializer.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateSerializer.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XidGenerator.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XidGenerator.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XidGenerator.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XidGenerator.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XidImpl.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XidImpl.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XidImpl.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XidImpl.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XidSerializer.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XidSerializer.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XidSerializer.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XidSerializer.java
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/package-info.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/package-info.java
similarity index 100%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/package-info.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/package-info.java
diff --git a/flink-connector-jdbc/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.dialect.JdbcDialectFactory b/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.dialect.JdbcDialectFactory
similarity index 100%
rename from flink-connector-jdbc/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.dialect.JdbcDialectFactory
rename to flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.dialect.JdbcDialectFactory
diff --git a/flink-connector-jdbc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
similarity index 100%
rename from flink-connector-jdbc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
rename to flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/architecture/ProductionCodeArchitectureTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/architecture/ProductionCodeArchitectureTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/architecture/ProductionCodeArchitectureTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/architecture/ProductionCodeArchitectureTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/architecture/TestCodeArchitectureTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/architecture/TestCodeArchitectureTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/architecture/TestCodeArchitectureTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/architecture/TestCodeArchitectureTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/base/source/reader/splitreader/TestingSplitsChange.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/base/source/reader/splitreader/TestingSplitsChange.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/base/source/reader/splitreader/TestingSplitsChange.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/base/source/reader/splitreader/TestingSplitsChange.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcConnectionOptionsTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcConnectionOptionsTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcConnectionOptionsTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcConnectionOptionsTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcDataTestBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcDataTestBase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcDataTestBase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcDataTestBase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcInputFormatTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcInputFormatTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcInputFormatTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcInputFormatTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcRowOutputFormatTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcRowOutputFormatTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcRowOutputFormatTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcRowOutputFormatTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcTestBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcTestBase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcTestBase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcTestBase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcTestCheckpoint.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcTestCheckpoint.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcTestCheckpoint.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcTestCheckpoint.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcTestFixture.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcTestFixture.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcTestFixture.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/JdbcTestFixture.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtilsTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtilsTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtilsTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtilsTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverterTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverterTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverterTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverterTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogTestBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogTestBase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogTestBase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogTestBase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTablePathTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTablePathTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTablePathTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTablePathTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTestBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTestBase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTestBase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTestBase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectTypeTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectTypeTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectTypeTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectTypeTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/db2/Db2TestBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/Db2TestBase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/db2/Db2TestBase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/Db2TestBase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectTypeTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectTypeTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectTypeTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectTypeTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2PreparedStatementTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2PreparedStatementTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2PreparedStatementTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2PreparedStatementTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/db2/table/Db2DynamicTableSinkITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/table/Db2DynamicTableSinkITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/db2/table/Db2DynamicTableSinkITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/table/Db2DynamicTableSinkITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/db2/table/Db2DynamicTableSourceITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/table/Db2DynamicTableSourceITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/db2/table/Db2DynamicTableSourceITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/table/Db2DynamicTableSourceITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/db2/xa/Db2ExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/xa/Db2ExactlyOnceSinkE2eTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/db2/xa/Db2ExactlyOnceSinkE2eTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/xa/Db2ExactlyOnceSinkE2eTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/derby/DerbyTestBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/derby/DerbyTestBase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/derby/DerbyTestBase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/derby/DerbyTestBase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/derby/table/DerbyDynamicTableSinkITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/derby/table/DerbyDynamicTableSinkITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/derby/table/DerbyDynamicTableSinkITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/derby/table/DerbyDynamicTableSinkITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/derby/table/DerbyDynamicTableSourceITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/derby/table/DerbyDynamicTableSourceITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/derby/table/DerbyDynamicTableSourceITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/derby/table/DerbyDynamicTableSourceITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/derby/xa/DerbyExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/derby/xa/DerbyExactlyOnceSinkE2eTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/derby/xa/DerbyExactlyOnceSinkE2eTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/derby/xa/DerbyExactlyOnceSinkE2eTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/h2/H2XaTestBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/h2/H2XaTestBase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/h2/H2XaTestBase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/h2/H2XaTestBase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/MySqlTestBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/MySqlTestBase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/MySqlTestBase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/MySqlTestBase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySql56CatalogITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySql56CatalogITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySql56CatalogITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySql56CatalogITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySql57CatalogITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySql57CatalogITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySql57CatalogITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySql57CatalogITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalogITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalogITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalogITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalogITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalogTestBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalogTestBase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalogTestBase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalogTestBase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectTypeTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectTypeTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectTypeTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectTypeTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/MySqlDynamicTableSinkITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/MySqlDynamicTableSinkITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/MySqlDynamicTableSinkITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/MySqlDynamicTableSinkITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/MySqlDynamicTableSourceITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/MySqlDynamicTableSourceITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/MySqlDynamicTableSourceITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/MySqlDynamicTableSourceITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/UnsignedTypeConversionITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/UnsignedTypeConversionITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/UnsignedTypeConversionITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/UnsignedTypeConversionITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/xa/MySqlExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/xa/MySqlExactlyOnceSinkE2eTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/xa/MySqlExactlyOnceSinkE2eTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/xa/MySqlExactlyOnceSinkE2eTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/OceanBaseMysqlTestBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/OceanBaseMysqlTestBase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/OceanBaseMysqlTestBase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/OceanBaseMysqlTestBase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/OceanBaseOracleTestBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/OceanBaseOracleTestBase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/OceanBaseOracleTestBase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/OceanBaseOracleTestBase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseMysqlDialectTypeTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseMysqlDialectTypeTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseMysqlDialectTypeTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseMysqlDialectTypeTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseOracleDialectTypeTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseOracleDialectTypeTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseOracleDialectTypeTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseOracleDialectTypeTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseMySqlDynamicTableSinkITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseMySqlDynamicTableSinkITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseMySqlDynamicTableSinkITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseMySqlDynamicTableSinkITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseMySqlDynamicTableSourceITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseMySqlDynamicTableSourceITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseMySqlDynamicTableSourceITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseMySqlDynamicTableSourceITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseOracleDynamicTableSinkITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseOracleDynamicTableSinkITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseOracleDynamicTableSinkITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseOracleDynamicTableSinkITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseOracleDynamicTableSourceITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseOracleDynamicTableSourceITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseOracleDynamicTableSourceITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseOracleDynamicTableSourceITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseTableRow.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseTableRow.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseTableRow.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseTableRow.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleTestBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleTestBase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleTestBase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleTestBase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectTypeTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectTypeTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectTypeTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectTypeTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OraclePreparedStatementTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OraclePreparedStatementTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OraclePreparedStatementTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OraclePreparedStatementTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSinkITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSinkITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSinkITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSinkITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSourceITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSourceITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSourceITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSourceITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleTableSourceITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleTableSourceITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleTableSourceITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleTableSourceITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/xa/OracleExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/xa/OracleExactlyOnceSinkE2eTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/xa/OracleExactlyOnceSinkE2eTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/xa/OracleExactlyOnceSinkE2eTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/PostgresTestBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/PostgresTestBase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/PostgresTestBase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/PostgresTestBase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTestBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTestBase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTestBase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTestBase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTablePathTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTablePathTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTablePathTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTablePathTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/factory/JdbcCatalogFactoryTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/factory/JdbcCatalogFactoryTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/factory/JdbcCatalogFactoryTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/factory/JdbcCatalogFactoryTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectTypeTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectTypeTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectTypeTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectTypeTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/table/PostgresDynamicTableSinkITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/table/PostgresDynamicTableSinkITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/table/PostgresDynamicTableSinkITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/table/PostgresDynamicTableSinkITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/table/PostgresDynamicTableSourceITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/table/PostgresDynamicTableSourceITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/table/PostgresDynamicTableSourceITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/table/PostgresDynamicTableSourceITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/xa/PostgresExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/xa/PostgresExactlyOnceSinkE2eTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/xa/PostgresExactlyOnceSinkE2eTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/xa/PostgresExactlyOnceSinkE2eTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/SqlServerTestBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/SqlServerTestBase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/SqlServerTestBase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/SqlServerTestBase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerPreparedStatementTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerPreparedStatementTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerPreparedStatementTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerPreparedStatementTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerDynamicTableSinkITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerDynamicTableSinkITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerDynamicTableSinkITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerDynamicTableSinkITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerDynamicTableSourceITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerDynamicTableSourceITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerDynamicTableSourceITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerDynamicTableSourceITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerTableSourceITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerTableSourceITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerTableSourceITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerTableSourceITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/xa/SqlServerExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/xa/SqlServerExactlyOnceSinkE2eTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/xa/SqlServerExactlyOnceSinkE2eTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/xa/SqlServerExactlyOnceSinkE2eTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/trino/TrinoTestBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/TrinoTestBase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/trino/TrinoTestBase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/TrinoTestBase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectTypeTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectTypeTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectTypeTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectTypeTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoPreparedStatementTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoPreparedStatementTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoPreparedStatementTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoPreparedStatementTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/trino/table/TrinoDynamicTableSinkITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/table/TrinoDynamicTableSinkITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/trino/table/TrinoDynamicTableSinkITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/table/TrinoDynamicTableSinkITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/trino/table/TrinoDynamicTableSourceITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/table/TrinoDynamicTableSourceITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/trino/table/TrinoDynamicTableSourceITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/table/TrinoDynamicTableSourceITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/datasource/connections/xa/SimpleXaConnectionProviderTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/connections/xa/SimpleXaConnectionProviderTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/datasource/connections/xa/SimpleXaConnectionProviderTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/connections/xa/SimpleXaConnectionProviderTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/datasource/connections/xa/TransactionIdConnectionTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/connections/xa/TransactionIdConnectionTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/datasource/connections/xa/TransactionIdConnectionTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/connections/xa/TransactionIdConnectionTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/domain/TransactionIdTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/domain/TransactionIdTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/domain/TransactionIdTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/domain/TransactionIdTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/fakedb/FakeDBUtils.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/fakedb/FakeDBUtils.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/fakedb/FakeDBUtils.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/fakedb/FakeDBUtils.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeConnection.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeConnection.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeConnection.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeConnection.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeConnection1.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeConnection1.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeConnection1.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeConnection1.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeConnection2.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeConnection2.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeConnection2.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeConnection2.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeConnection3.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeConnection3.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeConnection3.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeConnection3.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeDriver1.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeDriver1.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeDriver1.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeDriver1.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeDriver2.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeDriver2.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeDriver2.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeDriver2.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeDriver3.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeDriver3.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeDriver3.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/fakedb/driver/FakeDriver3.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcFullTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcFullTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcFullTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcFullTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcOutputSerializerTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcOutputSerializerTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcOutputSerializerTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcOutputSerializerTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcTableOutputFormatTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcTableOutputFormatTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcTableOutputFormatTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcTableOutputFormatTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/connection/SimpleJdbcConnectionProviderDriverClassConcurrentLoadingITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/internal/connection/SimpleJdbcConnectionProviderDriverClassConcurrentLoadingITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/connection/SimpleJdbcConnectionProviderDriverClassConcurrentLoadingITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/internal/connection/SimpleJdbcConnectionProviderDriverClassConcurrentLoadingITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/connection/SimpleJdbcConnectionProviderTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/internal/connection/SimpleJdbcConnectionProviderTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/connection/SimpleJdbcConnectionProviderTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/internal/connection/SimpleJdbcConnectionProviderTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/sink/AtLeastOnceJdbcSinkTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/AtLeastOnceJdbcSinkTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/sink/AtLeastOnceJdbcSinkTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/AtLeastOnceJdbcSinkTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/sink/BaseJdbcSinkTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/BaseJdbcSinkTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/sink/BaseJdbcSinkTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/BaseJdbcSinkTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/sink/ExactlyOnceJdbcSinkTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/ExactlyOnceJdbcSinkTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/sink/ExactlyOnceJdbcSinkTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/ExactlyOnceJdbcSinkTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/sink/writer/AlLeastOnceJdbcWriterTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/AlLeastOnceJdbcWriterTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/sink/writer/AlLeastOnceJdbcWriterTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/AlLeastOnceJdbcWriterTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/sink/writer/BaseJdbcWriterTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/BaseJdbcWriterTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/sink/writer/BaseJdbcWriterTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/BaseJdbcWriterTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/sink/writer/ExactlyOnceJdbcWriterTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/ExactlyOnceJdbcWriterTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/sink/writer/ExactlyOnceJdbcWriterTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/ExactlyOnceJdbcWriterTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterStateSerializerTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterStateSerializerTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterStateSerializerTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterStateSerializerTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterStateTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterStateTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterStateTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/sink/writer/JdbcWriterStateTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceBuilderTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceBuilderTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceBuilderTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceBuilderTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceStreamRelatedITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceStreamRelatedITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceStreamRelatedITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceStreamRelatedITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumStateSerializerTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumStateSerializerTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumStateSerializerTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumStateSerializerTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumeratorTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumeratorTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumeratorTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumeratorTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceReaderTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceReaderTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceReaderTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceReaderTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceSplitReaderTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceSplitReaderTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceSplitReaderTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceSplitReaderTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplitSerializerTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplitSerializerTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplitSerializerTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplitSerializerTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/split/NumericBetweenParametersProviderTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/split/NumericBetweenParametersProviderTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/split/NumericBetweenParametersProviderTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/split/NumericBetweenParametersProviderTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatementImplTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatementImplTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatementImplTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatementImplTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcAppendOnlyWriterTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcAppendOnlyWriterTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcAppendOnlyWriterTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcAppendOnlyWriterTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactoryTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactoryTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactoryTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactoryTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSinkITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSinkITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSinkITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSinkITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSourceITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSourceITCase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSourceITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSourceITCase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcFilterPushdownPreparedStatementVisitorTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcFilterPushdownPreparedStatementVisitorTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcFilterPushdownPreparedStatementVisitorTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcFilterPushdownPreparedStatementVisitorTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcLookupTestBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcLookupTestBase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcLookupTestBase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcLookupTestBase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormatTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormatTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormatTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormatTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunctionTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunctionTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunctionTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunctionTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcTablePlanTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcTablePlanTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcTablePlanTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcTablePlanTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseExtension.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseExtension.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseExtension.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseExtension.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseMetadata.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseMetadata.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseMetadata.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseMetadata.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/JdbcITCaseBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/JdbcITCaseBase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/JdbcITCaseBase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/JdbcITCaseBase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/TableManaged.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/TableManaged.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/TableManaged.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/TableManaged.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/cratedb/CrateDBDatabase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/cratedb/CrateDBDatabase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/cratedb/CrateDBDatabase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/cratedb/CrateDBDatabase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/cratedb/CrateDBMetadata.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/cratedb/CrateDBMetadata.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/cratedb/CrateDBMetadata.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/cratedb/CrateDBMetadata.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/db2/Db2Database.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/db2/Db2Database.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/db2/Db2Database.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/db2/Db2Database.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/db2/Db2Metadata.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/db2/Db2Metadata.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/db2/Db2Metadata.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/db2/Db2Metadata.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/derby/DerbyDatabase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/derby/DerbyDatabase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/derby/DerbyDatabase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/derby/DerbyDatabase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/derby/DerbyMetadata.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/derby/DerbyMetadata.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/derby/DerbyMetadata.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/derby/DerbyMetadata.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/H2Metadata.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/H2Metadata.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/H2Metadata.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/H2Metadata.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/H2XaDatabase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/H2XaDatabase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/H2XaDatabase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/H2XaDatabase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/H2XaConnectionWrapper.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/H2XaConnectionWrapper.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/H2XaConnectionWrapper.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/H2XaConnectionWrapper.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/H2XaDsWrapper.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/H2XaDsWrapper.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/H2XaDsWrapper.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/H2XaDsWrapper.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/H2XaResourceWrapper.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/H2XaResourceWrapper.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/H2XaResourceWrapper.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/H2XaResourceWrapper.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/package-info.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/package-info.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/package-info.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/h2/xa/package-info.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySql56Database.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySql56Database.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySql56Database.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySql56Database.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySql57Database.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySql57Database.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySql57Database.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySql57Database.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlContainer.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlContainer.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlContainer.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlContainer.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlDatabase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlDatabase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlDatabase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlDatabase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlImages.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlImages.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlImages.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlImages.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlMetadata.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlMetadata.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlMetadata.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlMetadata.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseContainer.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseContainer.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseContainer.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseContainer.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseDatabase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseDatabase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseDatabase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseDatabase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseImages.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseImages.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseImages.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseImages.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseMetadata.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseMetadata.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseMetadata.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseMetadata.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseTestDatabase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseTestDatabase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseTestDatabase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseTestDatabase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleDatabase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleDatabase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleDatabase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleDatabase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleImages.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleImages.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleImages.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleImages.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleMetadata.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleMetadata.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleMetadata.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleMetadata.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresDatabase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresDatabase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresDatabase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresDatabase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresImages.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresImages.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresImages.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresImages.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresMetadata.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresMetadata.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresMetadata.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresMetadata.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerDatabase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerDatabase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerDatabase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerDatabase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerImages.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerImages.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerImages.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerImages.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerMetadata.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerMetadata.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerMetadata.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerMetadata.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoDatabase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoDatabase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoDatabase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoDatabase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoImages.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoImages.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoImages.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoImages.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoMetadata.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoMetadata.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoMetadata.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoMetadata.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/functions/JdbcResultSetBuilder.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/functions/JdbcResultSetBuilder.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/functions/JdbcResultSetBuilder.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/functions/JdbcResultSetBuilder.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/TableBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/TableBase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/TableBase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/TableBase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/TableBuilder.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/TableBuilder.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/TableBuilder.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/TableBuilder.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/TableBuilderTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/TableBuilderTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/TableBuilderTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/TableBuilderTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/TableField.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/TableField.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/TableField.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/TableField.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/TableRow.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/TableRow.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/TableRow.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/TableRow.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/templates/BooksTable.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/templates/BooksTable.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/templates/BooksTable.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/tables/templates/BooksTable.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/utils/JdbcTypeUtilTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/utils/JdbcTypeUtilTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/utils/JdbcTypeUtilTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/utils/JdbcTypeUtilTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializersTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializersTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializersTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializersTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcExactlyOnceSinkE2eTest.java
similarity index 99%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcExactlyOnceSinkE2eTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcExactlyOnceSinkE2eTest.java
index e4065369..85db5e37 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcExactlyOnceSinkE2eTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcExactlyOnceSinkE2eTest.java
@@ -75,6 +75,7 @@ public abstract class JdbcExactlyOnceSinkE2eTest implements DatabaseTest {
private static final BooksTable OUTPUT_TABLE = new BooksTable("XaTable");
protected static final int PARALLELISM = 4;
protected static final long CHECKPOINT_TIMEOUT_MS = 5_000L;
+ protected static final String TASK_CANCELLATION_TIMEOUT_MS = "10000";
@RegisterExtension static final MiniClusterExtension MINI_CLUSTER = createCluster();
@@ -89,7 +90,7 @@ public abstract class JdbcExactlyOnceSinkE2eTest implements DatabaseTest {
// item correctly.
// API calling lines will be adapted after the appropriate series versions
// that the oldest flink version in the CI can process the config options.
- configuration.setString(TASK_CANCELLATION_TIMEOUT.key(), "10000");
+ configuration.setString(TASK_CANCELLATION_TIMEOUT.key(), TASK_CANCELLATION_TIMEOUT_MS);
configuration.set(CHECKPOINTING_TIMEOUT, Duration.ofMillis(CHECKPOINT_TIMEOUT_MS));
return new MiniClusterExtension(
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeImplTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeImplTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeImplTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeImplTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeTestHelper.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeTestHelper.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeTestHelper.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeTestHelper.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkDerbyTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkDerbyTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkDerbyTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkDerbyTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkH2Test.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkH2Test.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkH2Test.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkH2Test.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkMigrationTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkMigrationTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkMigrationTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkMigrationTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkNoInsertionTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkNoInsertionTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkNoInsertionTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkNoInsertionTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestBase.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestBase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestBase.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestHelper.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestHelper.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestHelper.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestHelper.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/SemanticXidGeneratorTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/SemanticXidGeneratorTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/SemanticXidGeneratorTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/SemanticXidGeneratorTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/XaXidTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/XaXidTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/XaXidTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/XaXidTest.java
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/XidSerializersTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/XidSerializersTest.java
similarity index 100%
rename from flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/XidSerializersTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/XidSerializersTest.java
diff --git a/flink-connector-jdbc/src/test/resources/META-INF/services/java.sql.Driver b/flink-connector-jdbc-core/src/test/resources/META-INF/services/java.sql.Driver
similarity index 100%
rename from flink-connector-jdbc/src/test/resources/META-INF/services/java.sql.Driver
rename to flink-connector-jdbc-core/src/test/resources/META-INF/services/java.sql.Driver
diff --git a/flink-connector-jdbc/src/test/resources/archunit.properties b/flink-connector-jdbc-core/src/test/resources/archunit.properties
similarity index 100%
rename from flink-connector-jdbc/src/test/resources/archunit.properties
rename to flink-connector-jdbc-core/src/test/resources/archunit.properties
diff --git a/flink-connector-jdbc/src/test/resources/log4j2-test.properties b/flink-connector-jdbc-core/src/test/resources/log4j2-test.properties
similarity index 100%
rename from flink-connector-jdbc/src/test/resources/log4j2-test.properties
rename to flink-connector-jdbc-core/src/test/resources/log4j2-test.properties
diff --git a/flink-connector-jdbc/src/test/resources/org/apache/flink/connector/jdbc/table/JdbcTablePlanTest.xml b/flink-connector-jdbc-core/src/test/resources/org/apache/flink/connector/jdbc/table/JdbcTablePlanTest.xml
similarity index 100%
rename from flink-connector-jdbc/src/test/resources/org/apache/flink/connector/jdbc/table/JdbcTablePlanTest.xml
rename to flink-connector-jdbc-core/src/test/resources/org/apache/flink/connector/jdbc/table/JdbcTablePlanTest.xml
diff --git a/flink-connector-jdbc/pom.xml b/flink-connector-jdbc/pom.xml
index 0a42dbe6..68d05f08 100644
--- a/flink-connector-jdbc/pom.xml
+++ b/flink-connector-jdbc/pom.xml
@@ -34,269 +34,51 @@ under the License.
<packaging>jar</packaging>
- <properties>
- <scala.binary.version>2.12</scala.binary.version>
- <scala-library.version>2.12.7</scala-library.version>
- <assertj.version>3.23.1</assertj.version>
- <postgres.version>42.7.3</postgres.version>
- <oracle.version>21.8.0.0</oracle.version>
- <trino.version>418</trino.version>
- <byte-buddy.version>1.12.10</byte-buddy.version>
- <surefire.module.config> <!-- required by
- Db2ExactlyOnceSinkE2eTest --> --add-opens=java.base/java.util=ALL-UNNAMED <!--
- SimpleJdbcConnectionProviderDriverClassConcurrentLoadingITCase--> --add-opens=java.base/java.lang=ALL-UNNAMED
- </surefire.module.config>
- </properties>
-
<dependencies>
- <!-- Connectors -->
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-base</artifactId>
- <version>${flink.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Table ecosystem -->
-
- <!-- Projects depending on this project won't depend on flink-table-*. -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table-api-java-bridge</artifactId>
- <version>${flink.version}</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
-
- <!-- Postgres -->
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>${postgres.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Oracle -->
- <dependency>
- <groupId>com.oracle.database.jdbc</groupId>
- <artifactId>ojdbc8</artifactId>
- <version>${oracle.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Trino -->
- <dependency>
- <groupId>io.trino</groupId>
- <artifactId>trino-jdbc</artifactId>
- <version>${trino.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- SQL Server -->
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>mssql-jdbc</artifactId>
- <version>10.2.1.jre8</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- CrateDB -->
- <dependency>
- <groupId>io.crate</groupId>
- <artifactId>crate-jdbc</artifactId>
- <version>2.7.0</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- Db2 -->
- <dependency>
- <groupId>com.ibm.db2.jcc</groupId>
- <artifactId>db2jcc</artifactId>
- <version>db2jcc4</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Tests -->
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils</artifactId>
- <version>${flink.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-table-common</artifactId>
- <version>${flink.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java</artifactId>
- <version>${flink.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-core</artifactId>
- <version>${flink.version}</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
- <version>${flink.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
- <version>${flink.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-table-api-scala-bridge_${scala.binary.version}</artifactId>
- <version>${flink.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-base</artifactId>
- <version>${flink.version}</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-test-utils</artifactId>
- <version>${flink.version}</version>
- <scope>test</scope>
- </dependency>
-
- <!-- Assertions test dependencies -->
-
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>${assertj.version}</version>
- <scope>test</scope>
- </dependency>
-
- <!-- Postgres tests -->
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>postgresql</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- MySQL tests -->
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>8.0.29</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>mysql</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- Derby tests -->
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.14.2.0</version>
- <scope>test</scope>
- </dependency>
-
- <!-- Oracle tests -->
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>oracle-xe</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- MS SQL test -->
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>mssqlserver</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- H2 tests -->
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>2.2.224</version>
- <scope>test</scope>
- </dependency>
-
- <!-- Db2 test -->
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>db2</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- Trino test -->
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>trino</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- OceanBase tests -->
- <dependency>
- <groupId>com.oceanbase</groupId>
- <artifactId>oceanbase-client</artifactId>
- <version>2.4.8</version>
- <scope>test</scope>
- </dependency>
-
- <!-- ArchUit test dependencies -->
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-architecture-tests-test</artifactId>
- <scope>test</scope>
+ <artifactId>flink-connector-jdbc-core</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
- <dependencyManagement>
- <dependencies>
- <!-- For dependency convergence -->
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>${scala-library.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
+ <shadeTestJar>true</shadeTestJar>
+ <artifactSet>
+ <excludes>
+ <exclude>org.apache.flink:flink-connector-base</exclude>
+ </excludes>
+ </artifactSet>
+ <filters combine.children="append">
+ <filter combine.children="append">
+ <!-- Do not copy the signatures in the META-INF folder. -->
+ <!-- Otherwise, this might cause SecurityExceptions when using the JAR. -->
+ <artifact>*:*</artifact>
+ <excludes combine.children="append">
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index ae0c47d2..2f41ad2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,7 @@ under the License.
<modules>
<module>flink-connector-jdbc</module>
+ <module>flink-connector-jdbc-core</module>
</modules>
<properties>
(flink-connector-jdbc) 11/14: [FLINK-35788] Deprecate JdbcXaSinkFunction
Posted by fa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git
commit e9d7c321fb8097d7f61b0451a0cbbe7a941c9072
Author: Joao Boto <bo...@boto.pro>
AuthorDate: Mon Jul 8 18:49:34 2024 +0200
[FLINK-35788] Deprecate JdbcXaSinkFunction
---
.../sink/committer/JdbcCommitableSerializer.java | 2 +-
.../xa/exceptions/EmptyTransactionXaException.java | 9 ++++---
.../transactions/xa/xid}/XidImpl.java | 6 ++---
.../transactions/xa/xid}/XidSerializer.java | 2 +-
.../transactions/xa/xid}/XaXidTest.java | 7 +++---
.../transactions/xa/xid}/XidSerializersTest.java | 2 +-
.../jdbc/derby/xa/DerbyExactlyOnceSinkE2eTest.java | 28 ---------------------
.../jdbc/db2/xa/Db2ExactlyOnceSinkE2eTest.java | 25 -------------------
.../jdbc/mysql/xa/MySqlExactlyOnceSinkE2eTest.java | 28 ---------------------
.../oracle/xa/OracleExactlyOnceSinkE2eTest.java | 25 -------------------
.../xa/PostgresExactlyOnceSinkE2eTest.java | 29 ----------------------
.../xa/SqlServerExactlyOnceSinkE2eTest.java | 29 ----------------------
.../flink/connector/jdbc/xa/CheckpointAndXid.java | 1 +
.../jdbc/xa/CheckpointAndXidSerializer.java | 2 ++
.../connector/jdbc/xa/JdbcXaSinkFunction.java | 1 +
.../connector/jdbc/xa/JdbcXaSinkFunctionState.java | 1 +
.../apache/flink/connector/jdbc/xa/JobSubtask.java | 1 +
.../connector/jdbc/xa/SemanticXidGenerator.java | 2 ++
.../apache/flink/connector/jdbc/xa/XaFacade.java | 1 +
.../flink/connector/jdbc/xa/XaFacadeImpl.java | 1 +
.../connector/jdbc/xa/XaFacadePoolingImpl.java | 1 +
.../apache/flink/connector/jdbc/xa/XaGroupOps.java | 1 +
.../flink/connector/jdbc/xa/XaGroupOpsImpl.java | 1 +
.../connector/jdbc/xa/XaSinkStateHandler.java | 1 +
.../connector/jdbc/xa/XaSinkStateHandlerImpl.java | 1 +
.../connector/jdbc/xa/XaSinkStateSerializer.java | 2 ++
.../flink/connector/jdbc/xa/XidGenerator.java | 1 +
.../flink/connector/jdbc/xa/package-info.java | 1 +
.../jdbc/xa/CheckpointAndXidSerializersTest.java | 1 +
.../jdbc/xa/JdbcExactlyOnceSinkE2eTest.java | 0
.../connector/jdbc/xa/JdbcXaFacadeImplTest.java | 0
.../connector/jdbc/xa/JdbcXaFacadeTestHelper.java | 0
.../connector/jdbc/xa/JdbcXaSinkDerbyTest.java | 0
.../flink/connector/jdbc/xa/JdbcXaSinkH2Test.java | 0
.../connector/jdbc/xa/JdbcXaSinkMigrationTest.java | 0
.../jdbc/xa/JdbcXaSinkNoInsertionTest.java | 0
.../connector/jdbc/xa/JdbcXaSinkTestBase.java | 0
.../connector/jdbc/xa/JdbcXaSinkTestHelper.java | 0
.../jdbc/xa/SemanticXidGeneratorTest.java | 1 +
39 files changed, 36 insertions(+), 177 deletions(-)
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/committer/JdbcCommitableSerializer.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/committer/JdbcCommitableSerializer.java
index 56a4a21f..a26eea8d 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/committer/JdbcCommitableSerializer.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/sink/committer/JdbcCommitableSerializer.java
@@ -2,7 +2,7 @@ package org.apache.flink.connector.jdbc.core.datastream.sink.committer;
import org.apache.flink.annotation.Internal;
import org.apache.flink.api.common.typeutils.TypeSerializer;
-import org.apache.flink.connector.jdbc.xa.XidSerializer;
+import org.apache.flink.connector.jdbc.datasource.transactions.xa.xid.XidSerializer;
import org.apache.flink.core.io.SimpleVersionedSerializer;
import org.apache.flink.core.memory.DataInputDeserializer;
import org.apache.flink.core.memory.DataOutputSerializer;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/EmptyTransactionXaException.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/EmptyTransactionXaException.java
index ae3374a3..52e36abe 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/EmptyTransactionXaException.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/EmptyTransactionXaException.java
@@ -1,16 +1,17 @@
package org.apache.flink.connector.jdbc.datasource.transactions.xa.exceptions;
import org.apache.flink.annotation.PublicEvolving;
-import org.apache.flink.connector.jdbc.xa.XaFacade;
+import org.apache.flink.connector.jdbc.datasource.transactions.xa.XaTransaction;
import org.apache.flink.util.FlinkRuntimeException;
import javax.transaction.xa.XAException;
import javax.transaction.xa.Xid;
/**
- * Thrown by {@link XaFacade} when RM responds with {@link javax.transaction.xa.XAResource#XA_RDONLY
- * XA_RDONLY} indicating that the transaction doesn't include any changes. When such a transaction
- * is committed RM may return an error (usually, {@link XAException#XAER_NOTA XAER_NOTA}).
+ * Thrown by {@link XaTransaction} when RM responds with {@link
+ * javax.transaction.xa.XAResource#XA_RDONLY XA_RDONLY} indicating that the transaction doesn't
+ * include any changes. When such a transaction is committed RM may return an error (usually, {@link
+ * XAException#XAER_NOTA XAER_NOTA}).
*/
@PublicEvolving
public class EmptyTransactionXaException extends FlinkRuntimeException {
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XidImpl.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid/XidImpl.java
similarity index 93%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XidImpl.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid/XidImpl.java
index 4135f1bc..1e5b26b2 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XidImpl.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid/XidImpl.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.xa;
+package org.apache.flink.connector.jdbc.datasource.transactions.xa.xid;
import org.apache.flink.annotation.Internal;
import org.apache.flink.util.Preconditions;
@@ -34,7 +34,7 @@ import static org.apache.flink.util.StringUtils.byteToHexString;
* arrays.
*/
@Internal
-final class XidImpl implements Xid, Serializable {
+public final class XidImpl implements Xid, Serializable {
private static final long serialVersionUID = 1L;
@@ -42,7 +42,7 @@ final class XidImpl implements Xid, Serializable {
@Nonnull private final byte[] globalTransactionId;
@Nonnull private final byte[] branchQualifier;
- XidImpl(int formatId, byte[] globalTransactionId, byte[] branchQualifier) {
+ public XidImpl(int formatId, byte[] globalTransactionId, byte[] branchQualifier) {
Preconditions.checkArgument(globalTransactionId.length <= Xid.MAXGTRIDSIZE);
Preconditions.checkArgument(branchQualifier.length <= Xid.MAXBQUALSIZE);
this.formatId = formatId;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XidSerializer.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid/XidSerializer.java
similarity index 98%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XidSerializer.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid/XidSerializer.java
index 9f4d6d31..8082a809 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XidSerializer.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid/XidSerializer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.xa;
+package org.apache.flink.connector.jdbc.datasource.transactions.xa.xid;
import org.apache.flink.annotation.Internal;
import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/XaXidTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid/XaXidTest.java
similarity index 91%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/XaXidTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid/XaXidTest.java
index 332aa06b..decd06d4 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/XaXidTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid/XaXidTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.xa;
+package org.apache.flink.connector.jdbc.datasource.transactions.xa.xid;
import org.junit.jupiter.api.Test;
@@ -26,8 +26,9 @@ import static javax.transaction.xa.Xid.MAXGTRIDSIZE;
import static org.assertj.core.api.Assertions.assertThat;
/** Test for {@link XidImpl}. */
-class XaXidTest {
- static final XidImpl XID = new XidImpl(1, randomBytes(MAXGTRIDSIZE), randomBytes(MAXBQUALSIZE));
+public class XaXidTest {
+ public static final XidImpl XID =
+ new XidImpl(1, randomBytes(MAXGTRIDSIZE), randomBytes(MAXBQUALSIZE));
@Test
void testXidsEqual() {
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/XidSerializersTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid/XidSerializersTest.java
similarity index 95%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/XidSerializersTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid/XidSerializersTest.java
index 55118fea..c35793ad 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/XidSerializersTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/xid/XidSerializersTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.xa;
+package org.apache.flink.connector.jdbc.datasource.transactions.xa.xid;
import org.apache.flink.api.common.typeutils.SerializerTestBase;
import org.apache.flink.api.common.typeutils.TypeSerializer;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/xa/DerbyExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/xa/DerbyExactlyOnceSinkE2eTest.java
deleted file mode 100644
index 2cf93981..00000000
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/xa/DerbyExactlyOnceSinkE2eTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.connector.jdbc.derby.xa;
-
-import org.apache.flink.connector.jdbc.derby.DerbyTestBase;
-import org.apache.flink.connector.jdbc.xa.JdbcExactlyOnceSinkE2eTest;
-
-/**
- * A simple end-to-end test for {@link JdbcExactlyOnceSinkE2eTest}. Check for issues with errors on
- * closing connections.
- */
-class DerbyExactlyOnceSinkE2eTest extends JdbcExactlyOnceSinkE2eTest implements DerbyTestBase {}
diff --git a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/xa/Db2ExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/xa/Db2ExactlyOnceSinkE2eTest.java
deleted file mode 100644
index bfce4eb2..00000000
--- a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/xa/Db2ExactlyOnceSinkE2eTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.connector.jdbc.db2.xa;
-
-import org.apache.flink.connector.jdbc.db2.Db2TestBase;
-import org.apache.flink.connector.jdbc.xa.JdbcExactlyOnceSinkE2eTest;
-
-/** A simple end-to-end test for {@link JdbcExactlyOnceSinkE2eTest}. */
-class Db2ExactlyOnceSinkE2eTest extends JdbcExactlyOnceSinkE2eTest implements Db2TestBase {}
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/xa/MySqlExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/xa/MySqlExactlyOnceSinkE2eTest.java
deleted file mode 100644
index 56010465..00000000
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/xa/MySqlExactlyOnceSinkE2eTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.connector.jdbc.mysql.xa;
-
-import org.apache.flink.connector.jdbc.mysql.MySqlTestBase;
-import org.apache.flink.connector.jdbc.xa.JdbcExactlyOnceSinkE2eTest;
-
-/**
- * A simple end-to-end test for {@link JdbcExactlyOnceSinkE2eTest}. Check for issues with errors on
- * closing connections.
- */
-class MySqlExactlyOnceSinkE2eTest extends JdbcExactlyOnceSinkE2eTest implements MySqlTestBase {}
diff --git a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/xa/OracleExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/xa/OracleExactlyOnceSinkE2eTest.java
deleted file mode 100644
index 4d5d4d17..00000000
--- a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/xa/OracleExactlyOnceSinkE2eTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.connector.jdbc.oracle.xa;
-
-import org.apache.flink.connector.jdbc.oracle.OracleTestBase;
-import org.apache.flink.connector.jdbc.xa.JdbcExactlyOnceSinkE2eTest;
-
-/** A simple end-to-end test for {@link JdbcExactlyOnceSinkE2eTest}. */
-class OracleExactlyOnceSinkE2eTest extends JdbcExactlyOnceSinkE2eTest implements OracleTestBase {}
diff --git a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/xa/PostgresExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/xa/PostgresExactlyOnceSinkE2eTest.java
deleted file mode 100644
index 67210a51..00000000
--- a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/xa/PostgresExactlyOnceSinkE2eTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.connector.jdbc.postgres.xa;
-
-import org.apache.flink.connector.jdbc.postgres.PostgresTestBase;
-import org.apache.flink.connector.jdbc.xa.JdbcExactlyOnceSinkE2eTest;
-
-/**
- * A simple end-to-end test for {@link JdbcExactlyOnceSinkE2eTest}. Check for issues with suspending
- * connections (requires pooling) and honoring limits (properly closing connections).
- */
-class PostgresExactlyOnceSinkE2eTest extends JdbcExactlyOnceSinkE2eTest
- implements PostgresTestBase {}
diff --git a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/xa/SqlServerExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/xa/SqlServerExactlyOnceSinkE2eTest.java
deleted file mode 100644
index 8117ea53..00000000
--- a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/xa/SqlServerExactlyOnceSinkE2eTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.connector.jdbc.sqlserver.xa;
-
-import org.apache.flink.connector.jdbc.sqlserver.SqlServerTestBase;
-import org.apache.flink.connector.jdbc.xa.JdbcExactlyOnceSinkE2eTest;
-
-/**
- * A simple end-to-end test for {@link JdbcExactlyOnceSinkE2eTest}. Check for issues with errors on
- * closing connections.
- */
-class SqlServerExactlyOnceSinkE2eTest extends JdbcExactlyOnceSinkE2eTest
- implements SqlServerTestBase {}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXid.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXid.java
similarity index 99%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXid.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXid.java
index da851fb1..6ce59738 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXid.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXid.java
@@ -31,6 +31,7 @@ import java.util.Objects;
*/
@ThreadSafe
@Internal
+@Deprecated
public final class CheckpointAndXid {
final long checkpointId;
final Xid xid;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializer.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializer.java
similarity index 97%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializer.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializer.java
index 18f0130e..a7125750 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializer.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializer.java
@@ -21,6 +21,7 @@ import org.apache.flink.annotation.Internal;
import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot;
import org.apache.flink.api.common.typeutils.TypeSerializer;
import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot;
+import org.apache.flink.connector.jdbc.datasource.transactions.xa.xid.XidSerializer;
import org.apache.flink.core.memory.DataInputView;
import org.apache.flink.core.memory.DataOutputView;
@@ -31,6 +32,7 @@ import java.util.Objects;
/** {@link CheckpointAndXid} serializer. */
@Internal
+@Deprecated
public final class CheckpointAndXidSerializer extends TypeSerializer<CheckpointAndXid> {
private static final long serialVersionUID = 1L;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunction.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunction.java
similarity index 99%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunction.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunction.java
index 417f6328..b88eddb5 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunction.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunction.java
@@ -127,6 +127,7 @@ import static org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunctionState.of;
* @since 1.13
*/
@Internal
+@Deprecated
public class JdbcXaSinkFunction<T> extends AbstractRichFunction
implements CheckpointedFunction,
CheckpointListener,
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunctionState.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunctionState.java
similarity index 99%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunctionState.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunctionState.java
index 8bcde5c5..e859647f 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunctionState.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunctionState.java
@@ -31,6 +31,7 @@ import static java.util.Collections.unmodifiableCollection;
/** Thread-safe (assuming immutable {@link Xid} implementation). */
@ThreadSafe
@Internal
+@Deprecated
class JdbcXaSinkFunctionState {
private final Collection<CheckpointAndXid> prepared;
private final Collection<Xid> hanging;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/JobSubtask.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JobSubtask.java
similarity index 99%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/JobSubtask.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JobSubtask.java
index 92ef029f..ad335b6c 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/JobSubtask.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JobSubtask.java
@@ -8,6 +8,7 @@ import java.io.Serializable;
/** Job identifier. */
@Internal
+@Deprecated
class JobSubtask implements Serializable {
private final byte[] jobId;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/SemanticXidGenerator.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/SemanticXidGenerator.java
similarity index 97%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/SemanticXidGenerator.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/SemanticXidGenerator.java
index f134b325..5acd7af5 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/SemanticXidGenerator.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/SemanticXidGenerator.java
@@ -19,6 +19,7 @@ package org.apache.flink.connector.jdbc.xa;
import org.apache.flink.annotation.Internal;
import org.apache.flink.api.common.JobID;
+import org.apache.flink.connector.jdbc.datasource.transactions.xa.xid.XidImpl;
import javax.transaction.xa.Xid;
@@ -41,6 +42,7 @@ import java.util.Arrays;
* collide).
*/
@Internal
+@Deprecated
class SemanticXidGenerator implements XidGenerator {
private static final long serialVersionUID = 1L;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacade.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacade.java
similarity index 99%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacade.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacade.java
index b6d1e995..b7616600 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacade.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacade.java
@@ -47,6 +47,7 @@ import java.util.function.Supplier;
* {@link #recover} can be used to get abandoned prepared transactions for cleanup.
*/
@Internal
+@Deprecated
public interface XaFacade extends JdbcConnectionProvider, Serializable, AutoCloseable {
/** @return a non-serializable instance. */
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadeImpl.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadeImpl.java
similarity index 99%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadeImpl.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadeImpl.java
index 24dc127b..606f6c2f 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadeImpl.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadeImpl.java
@@ -64,6 +64,7 @@ import static javax.transaction.xa.XAResource.TMSTARTRSCAN;
/** Default {@link XaFacade} implementation. */
@NotThreadSafe
@Internal
+@Deprecated
class XaFacadeImpl implements XaFacade {
private static final long serialVersionUID = 1L;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadePoolingImpl.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadePoolingImpl.java
similarity index 99%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadePoolingImpl.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadePoolingImpl.java
index 04d4855e..2dbb6936 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadePoolingImpl.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaFacadePoolingImpl.java
@@ -45,6 +45,7 @@ import static org.apache.flink.util.Preconditions.checkState;
* XA resource after each xa_start call is made (and associates it with the xid to commit later).
*/
@Internal
+@Deprecated
class XaFacadePoolingImpl implements XaFacade {
private static final long serialVersionUID = 1L;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOps.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOps.java
similarity index 99%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOps.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOps.java
index 455f5574..b355f11a 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOps.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOps.java
@@ -29,6 +29,7 @@ import java.util.List;
import java.util.Optional;
@Internal
+@Deprecated
interface XaGroupOps extends Serializable {
GroupXaOperationResult<CheckpointAndXid> commit(
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOpsImpl.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOpsImpl.java
similarity index 99%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOpsImpl.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOpsImpl.java
index 16a6816c..b1ace009 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOpsImpl.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaGroupOpsImpl.java
@@ -31,6 +31,7 @@ import java.util.Iterator;
import java.util.List;
@Internal
+@Deprecated
class XaGroupOpsImpl implements XaGroupOps {
private static final long serialVersionUID = 1L;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandler.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandler.java
similarity index 99%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandler.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandler.java
index 90c6e6e8..8c2df29b 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandler.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandler.java
@@ -23,6 +23,7 @@ import org.apache.flink.runtime.state.FunctionInitializationContext;
import java.io.Serializable;
@Internal
+@Deprecated
interface XaSinkStateHandler extends Serializable {
JdbcXaSinkFunctionState load(FunctionInitializationContext context) throws Exception;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandlerImpl.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandlerImpl.java
similarity index 99%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandlerImpl.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandlerImpl.java
index 148abf4d..c293162d 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandlerImpl.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandlerImpl.java
@@ -34,6 +34,7 @@ import java.util.Collections;
import java.util.List;
@Internal
+@Deprecated
class XaSinkStateHandlerImpl implements XaSinkStateHandler {
private static final long serialVersionUID = 1L;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateSerializer.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateSerializer.java
similarity index 98%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateSerializer.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateSerializer.java
index d6687f3b..0111e105 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateSerializer.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateSerializer.java
@@ -21,6 +21,7 @@ import org.apache.flink.annotation.Internal;
import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot;
import org.apache.flink.api.common.typeutils.TypeSerializer;
import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot;
+import org.apache.flink.connector.jdbc.datasource.transactions.xa.xid.XidSerializer;
import org.apache.flink.core.memory.DataInputView;
import org.apache.flink.core.memory.DataOutputView;
@@ -32,6 +33,7 @@ import java.util.List;
/** XaSinkStateSerializer. */
@Internal
+@Deprecated
public final class XaSinkStateSerializer extends TypeSerializer<JdbcXaSinkFunctionState> {
private static final TypeSerializerSnapshot<JdbcXaSinkFunctionState> SNAPSHOT =
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XidGenerator.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XidGenerator.java
similarity index 99%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XidGenerator.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XidGenerator.java
index 3a15fab4..e3920235 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/XidGenerator.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XidGenerator.java
@@ -26,6 +26,7 @@ import java.security.SecureRandom;
/** {@link Xid} generator. */
@Internal
+@Deprecated
public interface XidGenerator extends Serializable, AutoCloseable {
/**
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/package-info.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/package-info.java
similarity index 98%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/package-info.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/package-info.java
index fb12c036..41ae010b 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/xa/package-info.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/package-info.java
@@ -20,4 +20,5 @@
*
* @see org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunction JdbcXaExactlyOnceSinkFunction
*/
+@Deprecated
package org.apache.flink.connector.jdbc.xa;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializersTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializersTest.java
similarity index 95%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializersTest.java
rename to flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializersTest.java
index 940e8df3..b736dddb 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializersTest.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializersTest.java
@@ -19,6 +19,7 @@ package org.apache.flink.connector.jdbc.xa;
import org.apache.flink.api.common.typeutils.SerializerTestBase;
import org.apache.flink.api.common.typeutils.TypeSerializer;
+import org.apache.flink.connector.jdbc.datasource.transactions.xa.xid.XaXidTest;
/** XaSerializersTest. */
class CheckpointAndXidSerializersTest extends SerializerTestBase<CheckpointAndXid> {
diff --git a/flink-connector-jdbc-core/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
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcExactlyOnceSinkE2eTest.java
rename to flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcExactlyOnceSinkE2eTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeImplTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeImplTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeImplTest.java
rename to flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeImplTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeTestHelper.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeTestHelper.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeTestHelper.java
rename to flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeTestHelper.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkDerbyTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkDerbyTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkDerbyTest.java
rename to flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkDerbyTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkH2Test.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkH2Test.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkH2Test.java
rename to flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkH2Test.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkMigrationTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkMigrationTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkMigrationTest.java
rename to flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkMigrationTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkNoInsertionTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkNoInsertionTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkNoInsertionTest.java
rename to flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkNoInsertionTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestBase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestBase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestBase.java
rename to flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestBase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestHelper.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestHelper.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestHelper.java
rename to flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestHelper.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/SemanticXidGeneratorTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/SemanticXidGeneratorTest.java
similarity index 97%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/SemanticXidGeneratorTest.java
rename to flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/SemanticXidGeneratorTest.java
index e82ffdac..03b9f8dd 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/xa/SemanticXidGeneratorTest.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/SemanticXidGeneratorTest.java
@@ -19,6 +19,7 @@ package org.apache.flink.connector.jdbc.xa;
import org.apache.flink.api.common.JobID;
import org.apache.flink.api.common.functions.RuntimeContext;
+import org.apache.flink.connector.jdbc.datasource.transactions.xa.xid.XidImpl;
import org.junit.jupiter.api.Test;
(flink-connector-jdbc) 08/14: [FLINK-35366] Fix version from release
Posted by fa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git
commit 0dfaf06797987f6b3b4f7b19885650617cc049c3
Author: Joao Boto <bo...@boto.pro>
AuthorDate: Mon Jun 24 16:15:24 2024 +0200
[FLINK-35366] Fix version from release
---
flink-connector-jdbc-backward-compatibility/pom.xml | 4 ++--
flink-connector-jdbc-core/pom.xml | 2 +-
.../flink/connector/jdbc/source/JdbcSourceStreamRelatedITCase.java | 2 +-
flink-connector-jdbc-cratedb/pom.xml | 2 +-
flink-connector-jdbc-db2/pom.xml | 2 +-
flink-connector-jdbc-mysql/pom.xml | 2 +-
flink-connector-jdbc-oceanbase/pom.xml | 2 +-
flink-connector-jdbc-oracle/pom.xml | 2 +-
flink-connector-jdbc-postgres/pom.xml | 2 +-
flink-connector-jdbc-sqlserver/pom.xml | 2 +-
flink-connector-jdbc-trino/pom.xml | 2 +-
11 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/flink-connector-jdbc-backward-compatibility/pom.xml b/flink-connector-jdbc-backward-compatibility/pom.xml
index ac8c9874..2b14ecfb 100644
--- a/flink-connector-jdbc-backward-compatibility/pom.xml
+++ b/flink-connector-jdbc-backward-compatibility/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-jdbc-parent</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-jdbc-backward-compatibility</artifactId>
- <version>3.2-SNAPSHOT</version>
+
<name>Flink : Connectors : JDBC : Backward Compatibility</name>
<packaging>jar</packaging>
diff --git a/flink-connector-jdbc-core/pom.xml b/flink-connector-jdbc-core/pom.xml
index 8125e3d7..a7579845 100644
--- a/flink-connector-jdbc-core/pom.xml
+++ b/flink-connector-jdbc-core/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-jdbc-parent</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</parent>
<artifactId>flink-connector-jdbc-core</artifactId>
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceStreamRelatedITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceStreamRelatedITCase.java
index 8e9f61cf..2be8b404 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceStreamRelatedITCase.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/source/JdbcSourceStreamRelatedITCase.java
@@ -27,7 +27,7 @@ import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.client.program.ClusterClient;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.connector.base.DeliveryGuarantee;
-import org.apache.flink.connector.jdbc.databases.derby.DerbyTestBase;
+import org.apache.flink.connector.jdbc.derby.DerbyTestBase;
import org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor;
import org.apache.flink.connector.jdbc.split.JdbcSlideTimingParameterProvider;
import org.apache.flink.connector.jdbc.testutils.JdbcITCaseBase;
diff --git a/flink-connector-jdbc-cratedb/pom.xml b/flink-connector-jdbc-cratedb/pom.xml
index d7b208da..f7915a55 100644
--- a/flink-connector-jdbc-cratedb/pom.xml
+++ b/flink-connector-jdbc-cratedb/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-jdbc-parent</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</parent>
<artifactId>flink-connector-jdbc-cratedb</artifactId>
diff --git a/flink-connector-jdbc-db2/pom.xml b/flink-connector-jdbc-db2/pom.xml
index a847d32d..28d8ef1a 100644
--- a/flink-connector-jdbc-db2/pom.xml
+++ b/flink-connector-jdbc-db2/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-jdbc-parent</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</parent>
<artifactId>flink-connector-jdbc-db2</artifactId>
diff --git a/flink-connector-jdbc-mysql/pom.xml b/flink-connector-jdbc-mysql/pom.xml
index 7f496f7c..a567366e 100644
--- a/flink-connector-jdbc-mysql/pom.xml
+++ b/flink-connector-jdbc-mysql/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-jdbc-parent</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</parent>
<artifactId>flink-connector-jdbc-mysql</artifactId>
diff --git a/flink-connector-jdbc-oceanbase/pom.xml b/flink-connector-jdbc-oceanbase/pom.xml
index 63d61a21..933635ff 100644
--- a/flink-connector-jdbc-oceanbase/pom.xml
+++ b/flink-connector-jdbc-oceanbase/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-jdbc-parent</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</parent>
<artifactId>flink-connector-jdbc-oceanbase</artifactId>
diff --git a/flink-connector-jdbc-oracle/pom.xml b/flink-connector-jdbc-oracle/pom.xml
index 8b88a1a1..a5a5067d 100644
--- a/flink-connector-jdbc-oracle/pom.xml
+++ b/flink-connector-jdbc-oracle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-jdbc-parent</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</parent>
<artifactId>flink-connector-jdbc-oracle</artifactId>
diff --git a/flink-connector-jdbc-postgres/pom.xml b/flink-connector-jdbc-postgres/pom.xml
index 6447ff6b..b68440b6 100644
--- a/flink-connector-jdbc-postgres/pom.xml
+++ b/flink-connector-jdbc-postgres/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-jdbc-parent</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</parent>
<artifactId>flink-connector-jdbc-postgres</artifactId>
diff --git a/flink-connector-jdbc-sqlserver/pom.xml b/flink-connector-jdbc-sqlserver/pom.xml
index 379eebaa..29103af5 100644
--- a/flink-connector-jdbc-sqlserver/pom.xml
+++ b/flink-connector-jdbc-sqlserver/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-jdbc-parent</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</parent>
<artifactId>flink-connector-jdbc-sqlserver</artifactId>
diff --git a/flink-connector-jdbc-trino/pom.xml b/flink-connector-jdbc-trino/pom.xml
index 78444971..24bc8b5f 100644
--- a/flink-connector-jdbc-trino/pom.xml
+++ b/flink-connector-jdbc-trino/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-jdbc-parent</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</parent>
<artifactId>flink-connector-jdbc-trino</artifactId>
(flink-connector-jdbc) 05/14: [FLINK-35366] Create all database modules
Posted by fa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git
commit e07ec5f4d68a31145f0d54242420ac2f4edf989b
Author: Joao Boto <bo...@boto.pro>
AuthorDate: Wed May 29 17:24:58 2024 +0200
[FLINK-35366] Create all database modules
---
flink-connector-jdbc-core/pom.xml | 122 --------------------
...che.flink.connector.jdbc.core.table.JdbcFactory | 8 --
.../jdbc/testutils/DatabaseExtension.java | 22 +++-
flink-connector-jdbc-cratedb/pom.xml | 118 ++++++++++++++++++++
.../databases/cratedb/catalog/CrateDBCatalog.java | 0
.../cratedb/catalog/CrateDBTablePath.java | 2 +
.../cratedb/catalog/CrateDBTypeMapper.java | 0
.../databases/cratedb/dialect/CrateDBDialect.java | 12 +-
.../cratedb/dialect/CrateDBDialectConverter.java | 10 +-
.../databases/cratedb/dialect/CrateDBFactory.java | 0
...che.flink.connector.jdbc.core.table.JdbcFactory | 8 --
.../cratedb/catalog/CrateDBCatalogITCase.java | 0
.../cratedb/catalog/CrateDBCatalogTest.java | 17 +--
.../cratedb/catalog/CrateDBCatalogTestBase.java | 0
.../cratedb/catalog/CrateDBTablePathTest.java | 0
.../databases/cratedb/catalog/CrateDBTestBase.java | 0
.../cratedb/dialect/CrateDBDialectTest.java | 0
.../databases/cratedb/CrateDBDatabase.java | 0
.../databases/cratedb/CrateDBMetadata.java | 0
.../src/test/resources/log4j2-test.properties | 28 +++++
flink-connector-jdbc-db2/pom.xml | 103 +++++++++++++++++
.../jdbc/databases/db2/dialect/Db2Dialect.java | 2 +
.../databases/db2/dialect/Db2DialectConverter.java | 2 +
.../jdbc/databases/db2/dialect/Db2Factory.java | 0
...che.flink.connector.jdbc.core.table.JdbcFactory | 8 --
.../connector/jdbc/databases/db2/Db2TestBase.java | 0
.../jdbc/databases/db2/dialect/Db2DialectTest.java | 0
.../db2/dialect/Db2PreparedStatementTest.java | 0
.../db2/table/Db2DynamicTableSinkITCase.java | 0
.../db2/table/Db2DynamicTableSourceITCase.java | 0
.../db2/xa/Db2ExactlyOnceSinkE2eTest.java | 0
.../jdbc/testutils/databases/db2/Db2Database.java | 0
.../jdbc/testutils/databases/db2/Db2Metadata.java | 0
.../src/test/resources/log4j2-test.properties | 28 +++++
flink-connector-jdbc-mysql/pom.xml | 108 ++++++++++++++++++
.../jdbc/databases/mysql/catalog/MySqlCatalog.java | 0
.../databases/mysql/catalog/MySqlTypeMapper.java | 0
.../mysql/dialect/MySQLDialectConverter.java | 0
.../jdbc/databases/mysql/dialect/MySqlDialect.java | 0
.../jdbc/databases/mysql/dialect/MySqlFactory.java | 0
...che.flink.connector.jdbc.core.table.JdbcFactory | 10 +-
.../jdbc/databases/mysql/MySqlTestBase.java | 0
.../mysql/catalog/MySql56CatalogITCase.java | 0
.../mysql/catalog/MySql57CatalogITCase.java | 0
.../mysql/catalog/MySqlCatalogITCase.java | 0
.../mysql/catalog/MySqlCatalogTestBase.java | 0
.../databases/mysql/dialect/MySqlDialectTest.java | 0
.../mysql/table/MySqlDynamicTableSinkITCase.java | 0
.../mysql/table/MySqlDynamicTableSourceITCase.java | 0
.../mysql/table/UnsignedTypeConversionITCase.java | 0
.../mysql/xa/MySqlExactlyOnceSinkE2eTest.java | 0
.../FieldNamedPreparedStatementImplTest.java | 0
.../testutils/databases/mysql/MySql56Database.java | 0
.../testutils/databases/mysql/MySql57Database.java | 0
.../testutils/databases/mysql/MySqlContainer.java | 0
.../testutils/databases/mysql/MySqlDatabase.java | 0
.../testutils/databases/mysql/MySqlImages.java | 0
.../testutils/databases/mysql/MySqlMetadata.java | 0
.../src/test/resources/log4j2-test.properties | 28 +++++
flink-connector-jdbc-oceanbase/pom.xml | 111 +++++++++++++++++++
.../oceanbase/dialect/OceanBaseDialect.java | 0
.../dialect/OceanBaseDialectConverter.java | 0
.../oceanbase/dialect/OceanBaseFactory.java | 0
...che.flink.connector.jdbc.core.table.JdbcFactory | 8 --
.../oceanbase/OceanBaseMysqlTestBase.java | 0
.../oceanbase/OceanBaseOracleTestBase.java | 0
.../oceanbase/dialect/OceanBaseDialectTest.java | 0
.../dialect/OceanBaseMysqlDialectTest.java | 0
.../dialect/OceanBaseOracleDialectTest.java | 0
.../OceanBaseMySqlDynamicTableSinkITCase.java | 0
.../OceanBaseMySqlDynamicTableSourceITCase.java | 0
.../OceanBaseOracleDynamicTableSinkITCase.java | 0
.../OceanBaseOracleDynamicTableSourceITCase.java | 0
.../oceanbase/table/OceanBaseTableRow.java | 0
.../databases/oceanbase/OceanBaseContainer.java | 0
.../databases/oceanbase/OceanBaseDatabase.java | 0
.../databases/oceanbase/OceanBaseImages.java | 0
.../databases/oceanbase/OceanBaseMetadata.java | 0
.../databases/oceanbase/OceanBaseTestDatabase.java | 0
.../src/test/resources/log4j2-test.properties | 28 +++++
flink-connector-jdbc-oracle/pom.xml | 101 +++++++++++++++++
.../databases/oracle/dialect/OracleDialect.java | 0
.../oracle/dialect/OracleDialectConverter.java | 0
.../databases/oracle/dialect/OracleFactory.java | 0
...che.flink.connector.jdbc.core.table.JdbcFactory | 8 --
.../jdbc/databases/oracle/OracleTestBase.java | 0
.../oracle/dialect/OracleDialectTest.java | 0
.../dialect/OraclePreparedStatementTest.java | 0
.../oracle/table/OracleDynamicTableSinkITCase.java | 44 ++++----
.../table/OracleDynamicTableSourceITCase.java | 45 +++++---
.../oracle/table/OracleTableSourceITCase.java | 60 ++++++----
.../oracle/xa/OracleExactlyOnceSinkE2eTest.java | 0
.../testutils/databases/oracle/OracleDatabase.java | 0
.../testutils/databases/oracle/OracleImages.java | 0
.../testutils/databases/oracle/OracleMetadata.java | 0
.../src/test/resources/log4j2-test.properties | 28 +++++
flink-connector-jdbc-postgres/pom.xml | 123 +++++++++++++++++++++
.../postgres/catalog/PostgresCatalog.java | 0
.../postgres/catalog/PostgresTablePath.java | 0
.../postgres/catalog/PostgresTypeMapper.java | 0
.../dialect/CompatiblePostgresDialect.java | 27 +++--
.../CompatiblePostgresDialectConverter.java | 18 ++-
.../postgres/dialect/PostgresDialect.java | 24 +++-
.../postgres/dialect/PostgresDialectConverter.java | 19 ++--
.../postgres/dialect/PostgresFactory.java | 0
...che.flink.connector.jdbc.core.table.JdbcFactory | 8 --
.../jdbc/databases/postgres/PostgresTestBase.java | 0
.../postgres/catalog/PostgresCatalogITCase.java | 0
.../postgres/catalog/PostgresCatalogTest.java | 16 +--
.../postgres/catalog/PostgresCatalogTestBase.java | 0
.../postgres/catalog/PostgresTablePathTest.java | 0
.../catalog/factory/JdbcCatalogFactoryTest.java | 0
.../postgres/dialect/PostgresDialectTest.java | 0
.../table/PostgresDynamicTableSinkITCase.java | 0
.../table/PostgresDynamicTableSourceITCase.java | 0
.../xa/PostgresExactlyOnceSinkE2eTest.java | 0
.../databases/postgres/PostgresDatabase.java | 0
.../databases/postgres/PostgresImages.java | 0
.../databases/postgres/PostgresMetadata.java | 0
.../src/test/resources/log4j2-test.properties | 28 +++++
flink-connector-jdbc-sqlserver/pom.xml | 100 +++++++++++++++++
.../sqlserver/dialect/SqlServerDialect.java | 0
.../dialect/SqlServerDialectConverter.java | 0
.../sqlserver/dialect/SqlServerFactory.java | 0
...che.flink.connector.jdbc.core.table.JdbcFactory | 8 --
.../databases/sqlserver/SqlServerTestBase.java | 0
.../dialect/SqlServerPreparedStatementTest.java | 0
.../table/SqlServerDynamicTableSinkITCase.java | 0
.../table/SqlServerDynamicTableSourceITCase.java | 0
.../table/SqlServerTableSourceITCase.java | 0
.../xa/SqlServerExactlyOnceSinkE2eTest.java | 0
.../databases/sqlserver/SqlServerDatabase.java | 0
.../databases/sqlserver/SqlServerImages.java | 0
.../databases/sqlserver/SqlServerMetadata.java | 0
.../src/test/resources/log4j2-test.properties | 28 +++++
flink-connector-jdbc-trino/pom.xml | 112 +++++++++++++++++++
.../jdbc/databases/trino/dialect/TrinoDialect.java | 0
.../trino/dialect/TrinoDialectConverter.java | 0
.../jdbc/databases/trino/dialect/TrinoFactory.java | 0
...che.flink.connector.jdbc.core.table.JdbcFactory | 8 --
.../jdbc/databases/trino/TrinoTestBase.java | 0
.../databases/trino/dialect/TrinoDialectTest.java | 0
.../trino/dialect/TrinoPreparedStatementTest.java | 0
.../trino/table/TrinoDynamicTableSinkITCase.java | 0
.../trino/table/TrinoDynamicTableSourceITCase.java | 0
.../testutils/databases/trino/TrinoDatabase.java | 0
.../testutils/databases/trino/TrinoImages.java | 0
.../testutils/databases/trino/TrinoMetadata.java | 0
.../src/test/resources/log4j2-test.properties | 28 +++++
flink-connector-jdbc/pom.xml | 41 +++++++
pom.xml | 21 +++-
151 files changed, 1361 insertions(+), 317 deletions(-)
diff --git a/flink-connector-jdbc-core/pom.xml b/flink-connector-jdbc-core/pom.xml
index c7e767df..8125e3d7 100644
--- a/flink-connector-jdbc-core/pom.xml
+++ b/flink-connector-jdbc-core/pom.xml
@@ -34,18 +34,6 @@ under the License.
<packaging>jar</packaging>
- <properties>
-
- <postgres.version>42.7.3</postgres.version>
- <oracle.version>21.8.0.0</oracle.version>
- <trino.version>418</trino.version>
- <byte-buddy.version>1.12.10</byte-buddy.version>
- <surefire.module.config> <!-- required by
- Db2ExactlyOnceSinkE2eTest --> --add-opens=java.base/java.util=ALL-UNNAMED <!--
- SimpleJdbcConnectionProviderDriverClassConcurrentLoadingITCase--> --add-opens=java.base/java.lang=ALL-UNNAMED
- </surefire.module.config>
- </properties>
-
<dependencies>
<!-- Connectors -->
@@ -68,60 +56,6 @@ under the License.
<optional>true</optional>
</dependency>
- <!-- Postgres -->
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>${postgres.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Oracle -->
- <dependency>
- <groupId>com.oracle.database.jdbc</groupId>
- <artifactId>ojdbc8</artifactId>
- <version>${oracle.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Trino -->
- <dependency>
- <groupId>io.trino</groupId>
- <artifactId>trino-jdbc</artifactId>
- <version>${trino.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- SQL Server -->
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>mssql-jdbc</artifactId>
- <version>10.2.1.jre8</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- CrateDB -->
- <dependency>
- <groupId>io.crate</groupId>
- <artifactId>crate-jdbc</artifactId>
- <version>2.7.0</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- Db2 -->
- <dependency>
- <groupId>com.ibm.db2.jcc</groupId>
- <artifactId>db2jcc</artifactId>
- <version>db2jcc4</version>
- <scope>provided</scope>
- </dependency>
-
<!-- Tests -->
<dependency>
@@ -201,26 +135,6 @@ under the License.
<scope>test</scope>
</dependency>
- <!-- Postgres tests -->
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>postgresql</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- MySQL tests -->
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>8.0.29</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>mysql</artifactId>
- <scope>test</scope>
- </dependency>
-
<!-- Derby tests -->
<dependency>
<groupId>org.apache.derby</groupId>
@@ -229,20 +143,6 @@ under the License.
<scope>test</scope>
</dependency>
- <!-- Oracle tests -->
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>oracle-xe</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- MS SQL test -->
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>mssqlserver</artifactId>
- <scope>test</scope>
- </dependency>
-
<!-- H2 tests -->
<dependency>
<groupId>com.h2database</groupId>
@@ -251,28 +151,6 @@ under the License.
<scope>test</scope>
</dependency>
- <!-- Db2 test -->
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>db2</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- Trino test -->
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>trino</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- OceanBase tests -->
- <dependency>
- <groupId>com.oceanbase</groupId>
- <artifactId>oceanbase-client</artifactId>
- <version>2.4.8</version>
- <scope>test</scope>
- </dependency>
-
<!-- ArchUit test dependencies -->
<dependency>
<groupId>org.apache.flink</groupId>
diff --git a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory b/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
index 13eecd1a..b129ed3e 100644
--- a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
+++ b/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
@@ -14,11 +14,3 @@
# limitations under the License.
org.apache.flink.connector.jdbc.databases.derby.dialect.DerbyFactory
-org.apache.flink.connector.jdbc.databases.mysql.dialect.MySqlFactory
-org.apache.flink.connector.jdbc.databases.oceanbase.dialect.OceanBaseFactory
-org.apache.flink.connector.jdbc.databases.postgres.dialect.PostgresFactory
-org.apache.flink.connector.jdbc.databases.oracle.dialect.OracleFactory
-org.apache.flink.connector.jdbc.databases.sqlserver.dialect.SqlServerFactory
-org.apache.flink.connector.jdbc.databases.cratedb.dialect.CrateDBFactory
-org.apache.flink.connector.jdbc.databases.db2.dialect.Db2Factory
-org.apache.flink.connector.jdbc.databases.trino.dialect.TrinoFactory
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseExtension.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseExtension.java
index a9a6453f..3cc73559 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseExtension.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/DatabaseExtension.java
@@ -84,6 +84,13 @@ public abstract class DatabaseExtension
private void getManagedTables(
ExtensionContext context,
BiConsumerWithException<TableManaged, Connection, SQLException> execute) {
+ getManagedTables(context, execute, 0);
+ }
+
+ private void getManagedTables(
+ ExtensionContext context,
+ BiConsumerWithException<TableManaged, Connection, SQLException> execute,
+ int attempt) {
context.getTestClass()
.filter(DatabaseTest.class::isAssignableFrom)
.ifPresent(
@@ -97,12 +104,25 @@ public abstract class DatabaseExtension
execute.accept(table, conn);
}
} catch (Exception e) {
- throw new RuntimeException(e);
+ if (attempt <= 1) {
+ waitToDB();
+ getManagedTables(context, execute, attempt + 1);
+ } else {
+ throw new RuntimeException(e);
+ }
}
}
});
}
+ private void waitToDB() {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
private boolean ignoreTestDatabase(ExtensionContext context) {
Set<String> dbExtensions = retrieveDatabaseExtensions(context);
diff --git a/flink-connector-jdbc-cratedb/pom.xml b/flink-connector-jdbc-cratedb/pom.xml
new file mode 100644
index 00000000..d7b208da
--- /dev/null
+++ b/flink-connector-jdbc-cratedb/pom.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-parent</artifactId>
+ <version>3.2-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>flink-connector-jdbc-cratedb</artifactId>
+ <name>Flink : Connectors : JDBC : CrateDB</name>
+
+ <packaging>jar</packaging>
+
+ <properties>
+ <cratedb.version>2.7.0</cratedb.version>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-postgres</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-postgres</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-api-java-bridge</artifactId>
+ <version>${flink.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-test-utils</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+
+ <!-- CrateDB -->
+ <dependency>
+ <groupId>io.crate</groupId>
+ <artifactId>crate-jdbc</artifactId>
+ <version>${cratedb.version}</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- Assertions test dependencies -->
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- CrateDB tests -->
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>mysql</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- ArchUit test dependencies -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-architecture-tests-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalog.java b/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalog.java
similarity index 100%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalog.java
rename to flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalog.java
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTablePath.java b/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTablePath.java
similarity index 97%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTablePath.java
rename to flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTablePath.java
index db6a995f..de7d57cd 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTablePath.java
+++ b/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTablePath.java
@@ -18,6 +18,7 @@
package org.apache.flink.connector.jdbc.databases.cratedb.catalog;
+import org.apache.flink.annotation.Internal;
import org.apache.flink.connector.jdbc.databases.postgres.catalog.PostgresTablePath;
import static org.apache.flink.util.Preconditions.checkArgument;
@@ -26,6 +27,7 @@ import static org.apache.flink.util.Preconditions.checkArgument;
* Table path of CrateDB in Flink. Can be of formats "table_name" or "schema_name.table_name". When
* it's "table_name", the schema name defaults to "doc".
*/
+@Internal
public class CrateDBTablePath extends PostgresTablePath {
private static final String DEFAULT_CRATE_SCHEMA_NAME = "doc";
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTypeMapper.java b/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTypeMapper.java
similarity index 100%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTypeMapper.java
rename to flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTypeMapper.java
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialect.java b/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialect.java
similarity index 76%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialect.java
rename to flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialect.java
index c290917b..03869f82 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialect.java
+++ b/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialect.java
@@ -18,28 +18,30 @@
package org.apache.flink.connector.jdbc.databases.cratedb.dialect;
-import org.apache.flink.connector.jdbc.dialect.AbstractPostgresCompatibleDialect;
+import org.apache.flink.annotation.Internal;
+import org.apache.flink.connector.jdbc.databases.postgres.dialect.CompatiblePostgresDialect;
import org.apache.flink.table.types.logical.RowType;
import java.util.Optional;
/** JDBC dialect for CrateDB. */
-public class CrateDBDialect extends AbstractPostgresCompatibleDialect {
+@Internal
+public class CrateDBDialect extends CompatiblePostgresDialect {
private static final long serialVersionUID = 1L;
@Override
- public String dialectName() {
+ public String compatibleDialectName() {
return "CrateDB";
}
@Override
- public CrateDBDialectConverter getRowConverter(RowType rowType) {
+ public CrateDBDialectConverter compatibleRowConverter(RowType rowType) {
return new CrateDBDialectConverter(rowType);
}
@Override
- public Optional<String> defaultDriverName() {
+ public Optional<String> compatibleDriverName() {
return Optional.of("io.crate.client.jdbc.CrateDriver");
}
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectConverter.java b/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectConverter.java
similarity index 81%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectConverter.java
rename to flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectConverter.java
index 80f9db25..e88c7881 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectConverter.java
+++ b/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectConverter.java
@@ -18,16 +18,16 @@
package org.apache.flink.connector.jdbc.databases.cratedb.dialect;
-import org.apache.flink.connector.jdbc.converter.AbstractPostgresCompatibleDialectConverter;
+import org.apache.flink.annotation.Internal;
+import org.apache.flink.connector.jdbc.databases.postgres.dialect.CompatiblePostgresDialectConverter;
import org.apache.flink.table.types.logical.RowType;
-import io.crate.shade.org.postgresql.jdbc.PgArray;
-
/**
* Runtime converter that responsible to convert between JDBC object and Flink internal object for
* CrateDB.
*/
-public class CrateDBDialectConverter extends AbstractPostgresCompatibleDialectConverter<PgArray> {
+@Internal
+public class CrateDBDialectConverter extends CompatiblePostgresDialectConverter {
private static final long serialVersionUID = 1L;
@@ -36,7 +36,7 @@ public class CrateDBDialectConverter extends AbstractPostgresCompatibleDialectCo
}
@Override
- public String converterName() {
+ public String compatibleConverterName() {
return "CrateDB";
}
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBFactory.java b/flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBFactory.java
similarity index 100%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBFactory.java
rename to flink-connector-jdbc-cratedb/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBFactory.java
diff --git a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory b/flink-connector-jdbc-cratedb/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
similarity index 59%
copy from flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
copy to flink-connector-jdbc-cratedb/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
index 13eecd1a..0a32851c 100644
--- a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
+++ b/flink-connector-jdbc-cratedb/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
@@ -13,12 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.flink.connector.jdbc.databases.derby.dialect.DerbyFactory
-org.apache.flink.connector.jdbc.databases.mysql.dialect.MySqlFactory
-org.apache.flink.connector.jdbc.databases.oceanbase.dialect.OceanBaseFactory
-org.apache.flink.connector.jdbc.databases.postgres.dialect.PostgresFactory
-org.apache.flink.connector.jdbc.databases.oracle.dialect.OracleFactory
-org.apache.flink.connector.jdbc.databases.sqlserver.dialect.SqlServerFactory
org.apache.flink.connector.jdbc.databases.cratedb.dialect.CrateDBFactory
-org.apache.flink.connector.jdbc.databases.db2.dialect.Db2Factory
-org.apache.flink.connector.jdbc.databases.trino.dialect.TrinoFactory
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogITCase.java b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogITCase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogITCase.java
rename to flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogITCase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogTest.java b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogTest.java
similarity index 90%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogTest.java
rename to flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogTest.java
index fbf5916a..f65446b1 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogTest.java
+++ b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogTest.java
@@ -24,7 +24,6 @@ import org.apache.flink.table.catalog.ObjectPath;
import org.apache.flink.table.catalog.exceptions.DatabaseNotExistException;
import org.apache.flink.table.catalog.exceptions.TableNotExistException;
-import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import java.util.List;
@@ -46,13 +45,13 @@ class CrateDBCatalogTest extends CrateDBCatalogTestBase {
@Test
void testListDatabases() {
- Assertions.assertThat(catalog.listDatabases()).containsExactly("crate");
+ assertThat(catalog.listDatabases()).containsExactly("crate");
}
@Test
void testDbExists() {
- Assertions.assertThat(catalog.databaseExists("nonexistent")).isFalse();
- Assertions.assertThat(catalog.databaseExists(CrateDBCatalog.DEFAULT_DATABASE)).isTrue();
+ assertThat(catalog.databaseExists("nonexistent")).isFalse();
+ assertThat(catalog.databaseExists(CrateDBCatalog.DEFAULT_DATABASE)).isTrue();
}
// ------ tables ------
@@ -79,16 +78,12 @@ class CrateDBCatalogTest extends CrateDBCatalogTestBase {
@Test
void testTableExists() {
- Assertions.assertThat(
- catalog.tableExists(
- new ObjectPath(CrateDBCatalog.DEFAULT_DATABASE, "nonexist")))
+ assertThat(catalog.tableExists(new ObjectPath(CrateDBCatalog.DEFAULT_DATABASE, "nonexist")))
.isFalse();
- Assertions.assertThat(
- catalog.tableExists(
- new ObjectPath(CrateDBCatalog.DEFAULT_DATABASE, TABLE1)))
+ assertThat(catalog.tableExists(new ObjectPath(CrateDBCatalog.DEFAULT_DATABASE, TABLE1)))
.isTrue();
- Assertions.assertThat(
+ assertThat(
catalog.tableExists(
new ObjectPath(CrateDBCatalog.DEFAULT_DATABASE, "test_schema.t3")))
.isTrue();
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogTestBase.java b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogTestBase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogTestBase.java
rename to flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalogTestBase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTablePathTest.java b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTablePathTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTablePathTest.java
rename to flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTablePathTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTestBase.java b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTestBase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTestBase.java
rename to flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBTestBase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectTest.java b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectTest.java
rename to flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/cratedb/CrateDBDatabase.java b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/cratedb/CrateDBDatabase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/cratedb/CrateDBDatabase.java
rename to flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/cratedb/CrateDBDatabase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/cratedb/CrateDBMetadata.java b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/cratedb/CrateDBMetadata.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/cratedb/CrateDBMetadata.java
rename to flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/cratedb/CrateDBMetadata.java
diff --git a/flink-connector-jdbc-cratedb/src/test/resources/log4j2-test.properties b/flink-connector-jdbc-cratedb/src/test/resources/log4j2-test.properties
new file mode 100644
index 00000000..835c2ec9
--- /dev/null
+++ b/flink-connector-jdbc-cratedb/src/test/resources/log4j2-test.properties
@@ -0,0 +1,28 @@
+################################################################################
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+################################################################################
+
+# Set root logger level to OFF to not flood build logs
+# set manually to INFO for debugging purposes
+rootLogger.level = OFF
+rootLogger.appenderRef.test.ref = TestLogger
+
+appender.testlogger.name = TestLogger
+appender.testlogger.type = CONSOLE
+appender.testlogger.target = SYSTEM_ERR
+appender.testlogger.layout.type = PatternLayout
+appender.testlogger.layout.pattern = %-4r [%t] %-5p %c %x - %m%n
diff --git a/flink-connector-jdbc-db2/pom.xml b/flink-connector-jdbc-db2/pom.xml
new file mode 100644
index 00000000..a847d32d
--- /dev/null
+++ b/flink-connector-jdbc-db2/pom.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-parent</artifactId>
+ <version>3.2-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>flink-connector-jdbc-db2</artifactId>
+ <name>Flink : Connectors : JDBC : DB2</name>
+
+ <packaging>jar</packaging>
+
+ <properties>
+ <surefire.module.config>
+ <!-- required by Db2ExactlyOnceSinkE2eTest -->
+ --add-opens=java.base/java.util=ALL-UNNAMED
+ </surefire.module.config>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-api-java-bridge</artifactId>
+ <version>${flink.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-test-utils</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+
+ <!-- Db2 -->
+ <dependency>
+ <groupId>com.ibm.db2.jcc</groupId>
+ <artifactId>db2jcc</artifactId>
+ <version>db2jcc4</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Assertions test dependencies -->
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Db2 test -->
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>db2</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- ArchUit test dependencies -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-architecture-tests-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Dialect.java b/flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Dialect.java
similarity index 99%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Dialect.java
rename to flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Dialect.java
index 49f71c5b..3e2931ef 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Dialect.java
+++ b/flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Dialect.java
@@ -18,6 +18,7 @@
package org.apache.flink.connector.jdbc.databases.db2.dialect;
+import org.apache.flink.annotation.Internal;
import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialect;
import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
import org.apache.flink.table.types.logical.LogicalTypeRoot;
@@ -31,6 +32,7 @@ import java.util.Set;
import java.util.stream.Collectors;
/** JDBC dialect for IBM Db2. */
+@Internal
public class Db2Dialect extends AbstractDialect {
private static final long serialVersionUID = 1L;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectConverter.java b/flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectConverter.java
similarity index 96%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectConverter.java
rename to flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectConverter.java
index 4ad3fc49..1e06dcd7 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectConverter.java
+++ b/flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectConverter.java
@@ -18,6 +18,7 @@
package org.apache.flink.connector.jdbc.databases.db2.dialect;
+import org.apache.flink.annotation.Internal;
import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialectConverter;
import org.apache.flink.table.types.logical.LogicalType;
import org.apache.flink.table.types.logical.RowType;
@@ -26,6 +27,7 @@ import org.apache.flink.table.types.logical.RowType;
* Runtime converter that responsible to convert between JDBC object and Flink internal object for
* Db2.
*/
+@Internal
public class Db2DialectConverter extends AbstractDialectConverter {
private static final long serialVersionUID = 1L;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Factory.java b/flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Factory.java
similarity index 100%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Factory.java
rename to flink-connector-jdbc-db2/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Factory.java
diff --git a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory b/flink-connector-jdbc-db2/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
similarity index 59%
copy from flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
copy to flink-connector-jdbc-db2/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
index 13eecd1a..762b3ce1 100644
--- a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
+++ b/flink-connector-jdbc-db2/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
@@ -13,12 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.flink.connector.jdbc.databases.derby.dialect.DerbyFactory
-org.apache.flink.connector.jdbc.databases.mysql.dialect.MySqlFactory
-org.apache.flink.connector.jdbc.databases.oceanbase.dialect.OceanBaseFactory
-org.apache.flink.connector.jdbc.databases.postgres.dialect.PostgresFactory
-org.apache.flink.connector.jdbc.databases.oracle.dialect.OracleFactory
-org.apache.flink.connector.jdbc.databases.sqlserver.dialect.SqlServerFactory
-org.apache.flink.connector.jdbc.databases.cratedb.dialect.CrateDBFactory
org.apache.flink.connector.jdbc.databases.db2.dialect.Db2Factory
-org.apache.flink.connector.jdbc.databases.trino.dialect.TrinoFactory
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/Db2TestBase.java b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/Db2TestBase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/Db2TestBase.java
rename to flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/Db2TestBase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectTest.java b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectTest.java
rename to flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2PreparedStatementTest.java b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2PreparedStatementTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2PreparedStatementTest.java
rename to flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2PreparedStatementTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/table/Db2DynamicTableSinkITCase.java b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/table/Db2DynamicTableSinkITCase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/table/Db2DynamicTableSinkITCase.java
rename to flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/table/Db2DynamicTableSinkITCase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/table/Db2DynamicTableSourceITCase.java b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/table/Db2DynamicTableSourceITCase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/table/Db2DynamicTableSourceITCase.java
rename to flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/table/Db2DynamicTableSourceITCase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/xa/Db2ExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/xa/Db2ExactlyOnceSinkE2eTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/xa/Db2ExactlyOnceSinkE2eTest.java
rename to flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/databases/db2/xa/Db2ExactlyOnceSinkE2eTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/db2/Db2Database.java b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/db2/Db2Database.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/db2/Db2Database.java
rename to flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/db2/Db2Database.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/db2/Db2Metadata.java b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/db2/Db2Metadata.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/db2/Db2Metadata.java
rename to flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/db2/Db2Metadata.java
diff --git a/flink-connector-jdbc-db2/src/test/resources/log4j2-test.properties b/flink-connector-jdbc-db2/src/test/resources/log4j2-test.properties
new file mode 100644
index 00000000..835c2ec9
--- /dev/null
+++ b/flink-connector-jdbc-db2/src/test/resources/log4j2-test.properties
@@ -0,0 +1,28 @@
+################################################################################
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+################################################################################
+
+# Set root logger level to OFF to not flood build logs
+# set manually to INFO for debugging purposes
+rootLogger.level = OFF
+rootLogger.appenderRef.test.ref = TestLogger
+
+appender.testlogger.name = TestLogger
+appender.testlogger.type = CONSOLE
+appender.testlogger.target = SYSTEM_ERR
+appender.testlogger.layout.type = PatternLayout
+appender.testlogger.layout.pattern = %-4r [%t] %-5p %c %x - %m%n
diff --git a/flink-connector-jdbc-mysql/pom.xml b/flink-connector-jdbc-mysql/pom.xml
new file mode 100644
index 00000000..7f496f7c
--- /dev/null
+++ b/flink-connector-jdbc-mysql/pom.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-parent</artifactId>
+ <version>3.2-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>flink-connector-jdbc-mysql</artifactId>
+ <name>Flink : Connectors : JDBC : MySql</name>
+
+ <packaging>jar</packaging>
+
+ <properties>
+ <mysql.version>8.0.29</mysql.version>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-common</artifactId>
+ <version>${flink.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-api-java-bridge</artifactId>
+ <version>${flink.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-test-utils</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+
+ <!-- MySql -->
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>${mysql.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Assertions test dependencies -->
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- MySQL tests -->
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>mysql</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- ArchUit test dependencies -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-architecture-tests-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalog.java b/flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalog.java
similarity index 100%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalog.java
rename to flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalog.java
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlTypeMapper.java b/flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlTypeMapper.java
similarity index 100%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlTypeMapper.java
rename to flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlTypeMapper.java
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySQLDialectConverter.java b/flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySQLDialectConverter.java
similarity index 100%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySQLDialectConverter.java
rename to flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySQLDialectConverter.java
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialect.java b/flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialect.java
similarity index 100%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialect.java
rename to flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialect.java
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlFactory.java b/flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlFactory.java
similarity index 100%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlFactory.java
rename to flink-connector-jdbc-mysql/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlFactory.java
diff --git a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory b/flink-connector-jdbc-mysql/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
similarity index 59%
copy from flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
copy to flink-connector-jdbc-mysql/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
index 13eecd1a..2d13e8fa 100644
--- a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
+++ b/flink-connector-jdbc-mysql/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
@@ -13,12 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.flink.connector.jdbc.databases.derby.dialect.DerbyFactory
-org.apache.flink.connector.jdbc.databases.mysql.dialect.MySqlFactory
-org.apache.flink.connector.jdbc.databases.oceanbase.dialect.OceanBaseFactory
-org.apache.flink.connector.jdbc.databases.postgres.dialect.PostgresFactory
-org.apache.flink.connector.jdbc.databases.oracle.dialect.OracleFactory
-org.apache.flink.connector.jdbc.databases.sqlserver.dialect.SqlServerFactory
-org.apache.flink.connector.jdbc.databases.cratedb.dialect.CrateDBFactory
-org.apache.flink.connector.jdbc.databases.db2.dialect.Db2Factory
-org.apache.flink.connector.jdbc.databases.trino.dialect.TrinoFactory
+org.apache.flink.connector.jdbc.databases.mysql.dialect.MySqlFactory
\ No newline at end of file
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/MySqlTestBase.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/MySqlTestBase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/MySqlTestBase.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/MySqlTestBase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySql56CatalogITCase.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySql56CatalogITCase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySql56CatalogITCase.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySql56CatalogITCase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySql57CatalogITCase.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySql57CatalogITCase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySql57CatalogITCase.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySql57CatalogITCase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalogITCase.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalogITCase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalogITCase.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalogITCase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalogTestBase.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalogTestBase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalogTestBase.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalogTestBase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectTest.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectTest.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/MySqlDynamicTableSinkITCase.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/MySqlDynamicTableSinkITCase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/MySqlDynamicTableSinkITCase.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/MySqlDynamicTableSinkITCase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/MySqlDynamicTableSourceITCase.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/MySqlDynamicTableSourceITCase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/MySqlDynamicTableSourceITCase.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/MySqlDynamicTableSourceITCase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/UnsignedTypeConversionITCase.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/UnsignedTypeConversionITCase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/UnsignedTypeConversionITCase.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/table/UnsignedTypeConversionITCase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/xa/MySqlExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/xa/MySqlExactlyOnceSinkE2eTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/xa/MySqlExactlyOnceSinkE2eTest.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/xa/MySqlExactlyOnceSinkE2eTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatementImplTest.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatementImplTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatementImplTest.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/statement/FieldNamedPreparedStatementImplTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySql56Database.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySql56Database.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySql56Database.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySql56Database.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySql57Database.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySql57Database.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySql57Database.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySql57Database.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlContainer.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlContainer.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlContainer.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlContainer.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlDatabase.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlDatabase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlDatabase.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlDatabase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlImages.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlImages.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlImages.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlImages.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlMetadata.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlMetadata.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlMetadata.java
rename to flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/mysql/MySqlMetadata.java
diff --git a/flink-connector-jdbc-mysql/src/test/resources/log4j2-test.properties b/flink-connector-jdbc-mysql/src/test/resources/log4j2-test.properties
new file mode 100644
index 00000000..835c2ec9
--- /dev/null
+++ b/flink-connector-jdbc-mysql/src/test/resources/log4j2-test.properties
@@ -0,0 +1,28 @@
+################################################################################
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+################################################################################
+
+# Set root logger level to OFF to not flood build logs
+# set manually to INFO for debugging purposes
+rootLogger.level = OFF
+rootLogger.appenderRef.test.ref = TestLogger
+
+appender.testlogger.name = TestLogger
+appender.testlogger.type = CONSOLE
+appender.testlogger.target = SYSTEM_ERR
+appender.testlogger.layout.type = PatternLayout
+appender.testlogger.layout.pattern = %-4r [%t] %-5p %c %x - %m%n
diff --git a/flink-connector-jdbc-oceanbase/pom.xml b/flink-connector-jdbc-oceanbase/pom.xml
new file mode 100644
index 00000000..5045e027
--- /dev/null
+++ b/flink-connector-jdbc-oceanbase/pom.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-parent</artifactId>
+ <version>3.2-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>flink-connector-jdbc-oceanbase</artifactId>
+ <name>Flink : Connectors : JDBC : OceanBase</name>
+
+ <packaging>jar</packaging>
+
+ <properties>
+ <oceanbase.version>2.4.8</oceanbase.version>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-oracle</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-mysql</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-api-java-bridge</artifactId>
+ <version>${flink.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-test-utils</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- OceanBase tests -->
+ <dependency>
+ <groupId>com.oceanbase</groupId>
+ <artifactId>oceanbase-client</artifactId>
+ <version>${oceanbase.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Assertions test dependencies -->
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- OceanBase tests -->
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>jdbc</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+
+ <!-- ArchUit test dependencies -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-architecture-tests-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialect.java b/flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialect.java
similarity index 100%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialect.java
rename to flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialect.java
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectConverter.java b/flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectConverter.java
similarity index 100%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectConverter.java
rename to flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectConverter.java
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseFactory.java b/flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseFactory.java
similarity index 100%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseFactory.java
rename to flink-connector-jdbc-oceanbase/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseFactory.java
diff --git a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory b/flink-connector-jdbc-oceanbase/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
similarity index 60%
copy from flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
copy to flink-connector-jdbc-oceanbase/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
index 13eecd1a..3015f7d9 100644
--- a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
+++ b/flink-connector-jdbc-oceanbase/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
@@ -13,12 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.flink.connector.jdbc.databases.derby.dialect.DerbyFactory
-org.apache.flink.connector.jdbc.databases.mysql.dialect.MySqlFactory
org.apache.flink.connector.jdbc.databases.oceanbase.dialect.OceanBaseFactory
-org.apache.flink.connector.jdbc.databases.postgres.dialect.PostgresFactory
-org.apache.flink.connector.jdbc.databases.oracle.dialect.OracleFactory
-org.apache.flink.connector.jdbc.databases.sqlserver.dialect.SqlServerFactory
-org.apache.flink.connector.jdbc.databases.cratedb.dialect.CrateDBFactory
-org.apache.flink.connector.jdbc.databases.db2.dialect.Db2Factory
-org.apache.flink.connector.jdbc.databases.trino.dialect.TrinoFactory
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/OceanBaseMysqlTestBase.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/OceanBaseMysqlTestBase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/OceanBaseMysqlTestBase.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/OceanBaseMysqlTestBase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/OceanBaseOracleTestBase.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/OceanBaseOracleTestBase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/OceanBaseOracleTestBase.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/OceanBaseOracleTestBase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectTest.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectTest.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseDialectTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseMysqlDialectTest.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseMysqlDialectTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseMysqlDialectTest.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseMysqlDialectTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseOracleDialectTest.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseOracleDialectTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseOracleDialectTest.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseOracleDialectTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseMySqlDynamicTableSinkITCase.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseMySqlDynamicTableSinkITCase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseMySqlDynamicTableSinkITCase.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseMySqlDynamicTableSinkITCase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseMySqlDynamicTableSourceITCase.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseMySqlDynamicTableSourceITCase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseMySqlDynamicTableSourceITCase.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseMySqlDynamicTableSourceITCase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseOracleDynamicTableSinkITCase.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseOracleDynamicTableSinkITCase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseOracleDynamicTableSinkITCase.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseOracleDynamicTableSinkITCase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseOracleDynamicTableSourceITCase.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseOracleDynamicTableSourceITCase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseOracleDynamicTableSourceITCase.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseOracleDynamicTableSourceITCase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseTableRow.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseTableRow.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseTableRow.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/table/OceanBaseTableRow.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseContainer.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseContainer.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseContainer.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseContainer.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseDatabase.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseDatabase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseDatabase.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseDatabase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseImages.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseImages.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseImages.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseImages.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseMetadata.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseMetadata.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseMetadata.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseMetadata.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseTestDatabase.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseTestDatabase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseTestDatabase.java
rename to flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oceanbase/OceanBaseTestDatabase.java
diff --git a/flink-connector-jdbc-oceanbase/src/test/resources/log4j2-test.properties b/flink-connector-jdbc-oceanbase/src/test/resources/log4j2-test.properties
new file mode 100644
index 00000000..835c2ec9
--- /dev/null
+++ b/flink-connector-jdbc-oceanbase/src/test/resources/log4j2-test.properties
@@ -0,0 +1,28 @@
+################################################################################
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+################################################################################
+
+# Set root logger level to OFF to not flood build logs
+# set manually to INFO for debugging purposes
+rootLogger.level = OFF
+rootLogger.appenderRef.test.ref = TestLogger
+
+appender.testlogger.name = TestLogger
+appender.testlogger.type = CONSOLE
+appender.testlogger.target = SYSTEM_ERR
+appender.testlogger.layout.type = PatternLayout
+appender.testlogger.layout.pattern = %-4r [%t] %-5p %c %x - %m%n
diff --git a/flink-connector-jdbc-oracle/pom.xml b/flink-connector-jdbc-oracle/pom.xml
new file mode 100644
index 00000000..8b88a1a1
--- /dev/null
+++ b/flink-connector-jdbc-oracle/pom.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-parent</artifactId>
+ <version>3.2-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>flink-connector-jdbc-oracle</artifactId>
+ <name>Flink : Connectors : JDBC : Oracle</name>
+
+ <packaging>jar</packaging>
+
+ <properties>
+ <oracle.version>21.8.0.0</oracle.version>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-api-java-bridge</artifactId>
+ <version>${flink.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-test-utils</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+
+ <!-- Oracle -->
+ <dependency>
+ <groupId>com.oracle.database.jdbc</groupId>
+ <artifactId>ojdbc8</artifactId>
+ <version>${oracle.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Assertions test dependencies -->
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Oracle tests -->
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>oracle-xe</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- ArchUit test dependencies -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-architecture-tests-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialect.java b/flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialect.java
similarity index 100%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialect.java
rename to flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialect.java
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectConverter.java b/flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectConverter.java
similarity index 100%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectConverter.java
rename to flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectConverter.java
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleFactory.java b/flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleFactory.java
similarity index 100%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleFactory.java
rename to flink-connector-jdbc-oracle/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleFactory.java
diff --git a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory b/flink-connector-jdbc-oracle/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
similarity index 59%
copy from flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
copy to flink-connector-jdbc-oracle/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
index 13eecd1a..81ed614f 100644
--- a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
+++ b/flink-connector-jdbc-oracle/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
@@ -13,12 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.flink.connector.jdbc.databases.derby.dialect.DerbyFactory
-org.apache.flink.connector.jdbc.databases.mysql.dialect.MySqlFactory
-org.apache.flink.connector.jdbc.databases.oceanbase.dialect.OceanBaseFactory
-org.apache.flink.connector.jdbc.databases.postgres.dialect.PostgresFactory
org.apache.flink.connector.jdbc.databases.oracle.dialect.OracleFactory
-org.apache.flink.connector.jdbc.databases.sqlserver.dialect.SqlServerFactory
-org.apache.flink.connector.jdbc.databases.cratedb.dialect.CrateDBFactory
-org.apache.flink.connector.jdbc.databases.db2.dialect.Db2Factory
-org.apache.flink.connector.jdbc.databases.trino.dialect.TrinoFactory
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleTestBase.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleTestBase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleTestBase.java
rename to flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleTestBase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectTest.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectTest.java
rename to flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OraclePreparedStatementTest.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OraclePreparedStatementTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OraclePreparedStatementTest.java
rename to flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OraclePreparedStatementTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSinkITCase.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSinkITCase.java
similarity index 64%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSinkITCase.java
rename to flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSinkITCase.java
index a98c5ec1..39e7ce21 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSinkITCase.java
+++ b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSinkITCase.java
@@ -21,6 +21,7 @@ package org.apache.flink.connector.jdbc.databases.oracle.table;
import org.apache.flink.connector.jdbc.databases.oracle.OracleTestBase;
import org.apache.flink.connector.jdbc.databases.oracle.dialect.OracleDialect;
import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSinkITCase;
+import org.apache.flink.connector.jdbc.testutils.tables.TableBuilder;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.types.Row;
@@ -29,50 +30,53 @@ import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
-import static org.apache.flink.connector.jdbc.testutils.tables.TableBuilder.dbType;
-import static org.apache.flink.connector.jdbc.testutils.tables.TableBuilder.field;
-import static org.apache.flink.connector.jdbc.testutils.tables.TableBuilder.pkField;
-import static org.apache.flink.connector.jdbc.testutils.tables.TableBuilder.tableRow;
-
/** The Table Sink ITCase for {@link OracleDialect}. */
class OracleDynamicTableSinkITCase extends JdbcDynamicTableSinkITCase implements OracleTestBase {
@Override
protected TableRow createUpsertOutputTable() {
- return tableRow(
+ return TableBuilder.tableRow(
"dynamicSinkForUpsert",
- pkField("cnt", dbType("NUMBER"), DataTypes.BIGINT().notNull()),
- field("lencnt", dbType("NUMBER"), DataTypes.BIGINT().notNull()),
- pkField("cTag", DataTypes.INT().notNull()),
- field("ts", dbType("TIMESTAMP"), DataTypes.TIMESTAMP()));
+ TableBuilder.pkField(
+ "cnt", TableBuilder.dbType("NUMBER"), DataTypes.BIGINT().notNull()),
+ TableBuilder.field(
+ "lencnt", TableBuilder.dbType("NUMBER"), DataTypes.BIGINT().notNull()),
+ TableBuilder.pkField("cTag", DataTypes.INT().notNull()),
+ TableBuilder.field("ts", TableBuilder.dbType("TIMESTAMP"), DataTypes.TIMESTAMP()));
}
@Override
protected TableRow createAppendOutputTable() {
- return tableRow(
+ return TableBuilder.tableRow(
"dynamicSinkForAppend",
- field("id", DataTypes.INT().notNull()),
- field("num", dbType("NUMBER"), DataTypes.BIGINT().notNull()),
- field("ts", dbType("TIMESTAMP"), DataTypes.TIMESTAMP()));
+ TableBuilder.field("id", DataTypes.INT().notNull()),
+ TableBuilder.field(
+ "num", TableBuilder.dbType("NUMBER"), DataTypes.BIGINT().notNull()),
+ TableBuilder.field("ts", TableBuilder.dbType("TIMESTAMP"), DataTypes.TIMESTAMP()));
}
@Override
protected TableRow createBatchOutputTable() {
- return tableRow(
+ return TableBuilder.tableRow(
"dynamicSinkForBatch",
- field("NAME", DataTypes.VARCHAR(20).notNull()),
- field("SCORE", dbType("NUMBER"), DataTypes.BIGINT().notNull()));
+ TableBuilder.field("NAME", DataTypes.VARCHAR(20).notNull()),
+ TableBuilder.field(
+ "SCORE", TableBuilder.dbType("NUMBER"), DataTypes.BIGINT().notNull()));
}
@Override
protected TableRow createRealOutputTable() {
- return tableRow("REAL_TABLE", field("real_data", dbType("REAL"), DataTypes.FLOAT()));
+ return TableBuilder.tableRow(
+ "REAL_TABLE",
+ TableBuilder.field("real_data", TableBuilder.dbType("REAL"), DataTypes.FLOAT()));
}
@Override
protected TableRow createCheckpointOutputTable() {
- return tableRow(
- "checkpointTable", field("id", dbType("NUMBER"), DataTypes.BIGINT().notNull()));
+ return TableBuilder.tableRow(
+ "checkpointTable",
+ TableBuilder.field(
+ "id", TableBuilder.dbType("NUMBER"), DataTypes.BIGINT().notNull()));
}
@Override
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSourceITCase.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSourceITCase.java
similarity index 62%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSourceITCase.java
rename to flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSourceITCase.java
index ff7e0254..9376ecdd 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSourceITCase.java
+++ b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleDynamicTableSourceITCase.java
@@ -21,6 +21,7 @@ package org.apache.flink.connector.jdbc.databases.oracle.table;
import org.apache.flink.connector.jdbc.databases.oracle.OracleTestBase;
import org.apache.flink.connector.jdbc.databases.oracle.dialect.OracleDialect;
import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSourceITCase;
+import org.apache.flink.connector.jdbc.testutils.tables.TableBuilder;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.types.Row;
@@ -31,32 +32,40 @@ import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;
-import static org.apache.flink.connector.jdbc.testutils.tables.TableBuilder.dbType;
-import static org.apache.flink.connector.jdbc.testutils.tables.TableBuilder.field;
-import static org.apache.flink.connector.jdbc.testutils.tables.TableBuilder.tableRow;
-
/** The Table Source ITCase for {@link OracleDialect}. */
class OracleDynamicTableSourceITCase extends JdbcDynamicTableSourceITCase
implements OracleTestBase {
@Override
protected TableRow createInputTable() {
- return tableRow(
+ return TableBuilder.tableRow(
"jdbDynamicTableSource",
- field("id", dbType("INTEGER"), DataTypes.BIGINT().notNull()),
- field("decimal_col", DataTypes.DECIMAL(10, 4)),
- field("timestamp6_col", dbType("TIMESTAMP"), DataTypes.TIMESTAMP(6)),
+ TableBuilder.field(
+ "id", TableBuilder.dbType("INTEGER"), DataTypes.BIGINT().notNull()),
+ TableBuilder.field("decimal_col", DataTypes.DECIMAL(10, 4)),
+ TableBuilder.field(
+ "timestamp6_col", TableBuilder.dbType("TIMESTAMP"), DataTypes.TIMESTAMP(6)),
// other fields
- field("float_col", dbType("FLOAT"), DataTypes.FLOAT()),
- field("double_col", dbType("DOUBLE PRECISION"), DataTypes.DOUBLE()),
- field("binary_float_col", dbType("BINARY_FLOAT"), DataTypes.FLOAT()),
- field("binary_double_col", dbType("BINARY_DOUBLE"), DataTypes.DOUBLE()),
- field("char_col", dbType("CHAR"), DataTypes.CHAR(1)),
- field("nchar_col", dbType("NCHAR(3)"), DataTypes.VARCHAR(3)),
- field("varchar2_col", dbType("VARCHAR2(30)"), DataTypes.VARCHAR(30)),
- field("date_col", dbType("DATE"), DataTypes.DATE()),
- field("timestamp9_col", dbType("TIMESTAMP(9)"), DataTypes.TIMESTAMP(9)),
- field("clob_col", dbType("CLOB"), DataTypes.STRING()));
+ TableBuilder.field("float_col", TableBuilder.dbType("FLOAT"), DataTypes.FLOAT()),
+ TableBuilder.field(
+ "double_col", TableBuilder.dbType("DOUBLE PRECISION"), DataTypes.DOUBLE()),
+ TableBuilder.field(
+ "binary_float_col", TableBuilder.dbType("BINARY_FLOAT"), DataTypes.FLOAT()),
+ TableBuilder.field(
+ "binary_double_col",
+ TableBuilder.dbType("BINARY_DOUBLE"),
+ DataTypes.DOUBLE()),
+ TableBuilder.field("char_col", TableBuilder.dbType("CHAR"), DataTypes.CHAR(1)),
+ TableBuilder.field(
+ "nchar_col", TableBuilder.dbType("NCHAR(3)"), DataTypes.VARCHAR(3)),
+ TableBuilder.field(
+ "varchar2_col", TableBuilder.dbType("VARCHAR2(30)"), DataTypes.VARCHAR(30)),
+ TableBuilder.field("date_col", TableBuilder.dbType("DATE"), DataTypes.DATE()),
+ TableBuilder.field(
+ "timestamp9_col",
+ TableBuilder.dbType("TIMESTAMP(9)"),
+ DataTypes.TIMESTAMP(9)),
+ TableBuilder.field("clob_col", TableBuilder.dbType("CLOB"), DataTypes.STRING()));
}
protected List<Row> getTestData() {
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleTableSourceITCase.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleTableSourceITCase.java
similarity index 77%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleTableSourceITCase.java
rename to flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleTableSourceITCase.java
index 4634b6b3..7667c3a1 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleTableSourceITCase.java
+++ b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/table/OracleTableSourceITCase.java
@@ -21,6 +21,7 @@ package org.apache.flink.connector.jdbc.databases.oracle.table;
import org.apache.flink.connector.jdbc.databases.oracle.OracleTestBase;
import org.apache.flink.connector.jdbc.databases.oracle.dialect.OracleDialect;
import org.apache.flink.connector.jdbc.testutils.TableManaged;
+import org.apache.flink.connector.jdbc.testutils.tables.TableBuilder;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.table.api.DataTypes;
@@ -43,37 +44,56 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import static org.apache.flink.connector.jdbc.testutils.tables.TableBuilder.dbType;
-import static org.apache.flink.connector.jdbc.testutils.tables.TableBuilder.field;
-import static org.apache.flink.connector.jdbc.testutils.tables.TableBuilder.tableRow;
import static org.assertj.core.api.Assertions.assertThat;
/** The Table Source ITCase for {@link OracleDialect}. */
class OracleTableSourceITCase extends AbstractTestBase implements OracleTestBase {
private static final TableRow INPUT_TABLE =
- tableRow(
+ TableBuilder.tableRow(
"oracle_test_table",
- field("id", dbType("INTEGER"), DataTypes.INT().notNull()),
- field("float_col", dbType("FLOAT"), DataTypes.FLOAT()),
- field("double_col", dbType("DOUBLE PRECISION"), DataTypes.DOUBLE()),
- field(
+ TableBuilder.field(
+ "id", TableBuilder.dbType("INTEGER"), DataTypes.INT().notNull()),
+ TableBuilder.field(
+ "float_col", TableBuilder.dbType("FLOAT"), DataTypes.FLOAT()),
+ TableBuilder.field(
+ "double_col",
+ TableBuilder.dbType("DOUBLE PRECISION"),
+ DataTypes.DOUBLE()),
+ TableBuilder.field(
"decimal_col",
- dbType("NUMBER(10,4) NOT NULL"),
+ TableBuilder.dbType("NUMBER(10,4) NOT NULL"),
DataTypes.DECIMAL(10, 4).notNull()),
- field("binary_float_col", dbType("BINARY_FLOAT NOT NULL"), DataTypes.FLOAT()),
- field(
+ TableBuilder.field(
+ "binary_float_col",
+ TableBuilder.dbType("BINARY_FLOAT NOT NULL"),
+ DataTypes.FLOAT()),
+ TableBuilder.field(
"binary_double_col",
- dbType("BINARY_DOUBLE NOT NULL"),
+ TableBuilder.dbType("BINARY_DOUBLE NOT NULL"),
DataTypes.DOUBLE()),
- field("char_col", dbType("CHAR NOT NULL"), DataTypes.CHAR(1)),
- field("nchar_col", dbType("NCHAR(3) NOT NULL"), DataTypes.VARCHAR(3)),
- field("varchar2_col", dbType("VARCHAR2(30) NOT NULL"), DataTypes.VARCHAR(30)),
- field("date_col", dbType("DATE NOT NULL"), DataTypes.DATE()),
- field("timestamp6_col", dbType("TIMESTAMP(6)"), DataTypes.TIMESTAMP(6)),
- field("timestamp9_col", dbType("TIMESTAMP(9)"), DataTypes.TIMESTAMP(9)),
- field("clob_col", dbType("CLOB"), DataTypes.STRING()),
- field("blob_col", dbType("BLOB"), DataTypes.BYTES()));
+ TableBuilder.field(
+ "char_col", TableBuilder.dbType("CHAR NOT NULL"), DataTypes.CHAR(1)),
+ TableBuilder.field(
+ "nchar_col",
+ TableBuilder.dbType("NCHAR(3) NOT NULL"),
+ DataTypes.VARCHAR(3)),
+ TableBuilder.field(
+ "varchar2_col",
+ TableBuilder.dbType("VARCHAR2(30) NOT NULL"),
+ DataTypes.VARCHAR(30)),
+ TableBuilder.field(
+ "date_col", TableBuilder.dbType("DATE NOT NULL"), DataTypes.DATE()),
+ TableBuilder.field(
+ "timestamp6_col",
+ TableBuilder.dbType("TIMESTAMP(6)"),
+ DataTypes.TIMESTAMP(6)),
+ TableBuilder.field(
+ "timestamp9_col",
+ TableBuilder.dbType("TIMESTAMP(9)"),
+ DataTypes.TIMESTAMP(9)),
+ TableBuilder.field("clob_col", TableBuilder.dbType("CLOB"), DataTypes.STRING()),
+ TableBuilder.field("blob_col", TableBuilder.dbType("BLOB"), DataTypes.BYTES()));
private static final String INPUT_TABLE_NAME = INPUT_TABLE.getTableName();
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/xa/OracleExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/xa/OracleExactlyOnceSinkE2eTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/xa/OracleExactlyOnceSinkE2eTest.java
rename to flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/xa/OracleExactlyOnceSinkE2eTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleDatabase.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleDatabase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleDatabase.java
rename to flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleDatabase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleImages.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleImages.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleImages.java
rename to flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleImages.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleMetadata.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleMetadata.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleMetadata.java
rename to flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/oracle/OracleMetadata.java
diff --git a/flink-connector-jdbc-oracle/src/test/resources/log4j2-test.properties b/flink-connector-jdbc-oracle/src/test/resources/log4j2-test.properties
new file mode 100644
index 00000000..835c2ec9
--- /dev/null
+++ b/flink-connector-jdbc-oracle/src/test/resources/log4j2-test.properties
@@ -0,0 +1,28 @@
+################################################################################
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+################################################################################
+
+# Set root logger level to OFF to not flood build logs
+# set manually to INFO for debugging purposes
+rootLogger.level = OFF
+rootLogger.appenderRef.test.ref = TestLogger
+
+appender.testlogger.name = TestLogger
+appender.testlogger.type = CONSOLE
+appender.testlogger.target = SYSTEM_ERR
+appender.testlogger.layout.type = PatternLayout
+appender.testlogger.layout.pattern = %-4r [%t] %-5p %c %x - %m%n
diff --git a/flink-connector-jdbc-postgres/pom.xml b/flink-connector-jdbc-postgres/pom.xml
new file mode 100644
index 00000000..6447ff6b
--- /dev/null
+++ b/flink-connector-jdbc-postgres/pom.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-parent</artifactId>
+ <version>3.2-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>flink-connector-jdbc-postgres</artifactId>
+ <name>Flink : Connectors : JDBC : Postgres</name>
+
+ <packaging>jar</packaging>
+
+ <properties>
+ <postgres.version>42.7.3</postgres.version>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-common</artifactId>
+ <version>${flink.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-api-java-bridge</artifactId>
+ <version>${flink.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-test-utils</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Postgres -->
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>${postgres.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Assertions test dependencies -->
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Postgres tests -->
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>postgresql</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- ArchUit test dependencies -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-architecture-tests-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalog.java b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalog.java
similarity index 100%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalog.java
rename to flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalog.java
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTablePath.java b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTablePath.java
similarity index 100%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTablePath.java
rename to flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTablePath.java
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTypeMapper.java b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTypeMapper.java
similarity index 100%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTypeMapper.java
rename to flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTypeMapper.java
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialect.java b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/CompatiblePostgresDialect.java
similarity index 64%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialect.java
rename to flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/CompatiblePostgresDialect.java
index 6973e597..b50cdbcf 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialect.java
+++ b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/CompatiblePostgresDialect.java
@@ -18,30 +18,35 @@
package org.apache.flink.connector.jdbc.databases.postgres.dialect;
-import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.dialect.AbstractPostgresCompatibleDialect;
+import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.table.types.logical.RowType;
import java.util.Optional;
-/** JDBC dialect for PostgreSQL. */
-@Internal
-public class PostgresDialect extends AbstractPostgresCompatibleDialect {
+/** JDBC dialect for PostgreSQL compatible databases. */
+@PublicEvolving
+public abstract class CompatiblePostgresDialect extends PostgresDialect {
private static final long serialVersionUID = 1L;
+ protected abstract String compatibleDialectName();
+
+ protected abstract CompatiblePostgresDialectConverter compatibleRowConverter(RowType rowType);
+
+ protected abstract Optional<String> compatibleDriverName();
+
@Override
- public PostgresDialectConverter getRowConverter(RowType rowType) {
- return new PostgresDialectConverter(rowType);
+ public String dialectName() {
+ return compatibleDialectName();
}
@Override
- public Optional<String> defaultDriverName() {
- return Optional.of("org.postgresql.Driver");
+ public CompatiblePostgresDialectConverter getRowConverter(RowType rowType) {
+ return compatibleRowConverter(rowType);
}
@Override
- public String dialectName() {
- return "PostgreSQL";
+ public Optional<String> defaultDriverName() {
+ return compatibleDriverName();
}
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectConverter.java b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/CompatiblePostgresDialectConverter.java
similarity index 71%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectConverter.java
rename to flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/CompatiblePostgresDialectConverter.java
index 7ac579a0..fc79df3f 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectConverter.java
+++ b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/CompatiblePostgresDialectConverter.java
@@ -18,25 +18,23 @@
package org.apache.flink.connector.jdbc.databases.postgres.dialect;
-import org.apache.flink.connector.jdbc.converter.AbstractPostgresCompatibleDialectConverter;
+import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.table.types.logical.RowType;
-import org.postgresql.jdbc.PgArray;
-
-/**
- * Runtime converter that responsible to convert between JDBC object and Flink internal object for
- * PostgreSQL.
- */
-public class PostgresDialectConverter extends AbstractPostgresCompatibleDialectConverter<PgArray> {
+/** JDBC converter for PostgreSQL compatible databases. */
+@PublicEvolving
+public abstract class CompatiblePostgresDialectConverter extends PostgresDialectConverter {
private static final long serialVersionUID = 1L;
- public PostgresDialectConverter(RowType rowType) {
+ protected CompatiblePostgresDialectConverter(RowType rowType) {
super(rowType);
}
+ protected abstract String compatibleConverterName();
+
@Override
public String converterName() {
- return "PostgreSQL";
+ return compatibleConverterName();
}
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractPostgresCompatibleDialect.java b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialect.java
similarity index 87%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractPostgresCompatibleDialect.java
rename to flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialect.java
index 2845c75b..026f8b0d 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractPostgresCompatibleDialect.java
+++ b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialect.java
@@ -16,10 +16,12 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.dialect;
+package org.apache.flink.connector.jdbc.databases.postgres.dialect;
+import org.apache.flink.annotation.Internal;
import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialect;
import org.apache.flink.table.types.logical.LogicalTypeRoot;
+import org.apache.flink.table.types.logical.RowType;
import java.util.Arrays;
import java.util.EnumSet;
@@ -27,8 +29,9 @@ import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
-/** JDBC dialect for PostgreSQL compatible databases. */
-public abstract class AbstractPostgresCompatibleDialect extends AbstractDialect {
+/** JDBC dialect for PostgreSQL. */
+@Internal
+public class PostgresDialect extends AbstractDialect {
private static final long serialVersionUID = 1L;
@@ -42,6 +45,21 @@ public abstract class AbstractPostgresCompatibleDialect extends AbstractDialect
private static final int MAX_DECIMAL_PRECISION = 1000;
private static final int MIN_DECIMAL_PRECISION = 1;
+ @Override
+ public PostgresDialectConverter getRowConverter(RowType rowType) {
+ return new PostgresDialectConverter(rowType);
+ }
+
+ @Override
+ public Optional<String> defaultDriverName() {
+ return Optional.of("org.postgresql.Driver");
+ }
+
+ @Override
+ public String dialectName() {
+ return "PostgreSQL";
+ }
+
@Override
public String getLimitClause(long limit) {
return "LIMIT " + limit;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractPostgresCompatibleDialectConverter.java b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectConverter.java
similarity index 89%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractPostgresCompatibleDialectConverter.java
rename to flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectConverter.java
index 85417814..45a272e0 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractPostgresCompatibleDialectConverter.java
+++ b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectConverter.java
@@ -16,8 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.converter;
+package org.apache.flink.connector.jdbc.databases.postgres.dialect;
+import org.apache.flink.annotation.Internal;
import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialectConverter;
import org.apache.flink.table.data.GenericArrayData;
import org.apache.flink.table.types.logical.ArrayType;
@@ -30,14 +31,14 @@ import java.lang.reflect.Array;
/**
* Runtime converter that responsible to convert between JDBC object and Flink internal object for
- * PostgreSQL compatible databases.
+ * PostgreSQL.
*/
-public abstract class AbstractPostgresCompatibleDialectConverter<T extends java.sql.Array>
- extends AbstractDialectConverter {
+@Internal
+public class PostgresDialectConverter extends AbstractDialectConverter {
private static final long serialVersionUID = 1L;
- protected AbstractPostgresCompatibleDialectConverter(RowType rowType) {
+ protected PostgresDialectConverter(RowType rowType) {
super(rowType);
}
@@ -77,8 +78,7 @@ public abstract class AbstractPostgresCompatibleDialectConverter<T extends java.
final JdbcDeserializationConverter elementConverter =
createNullableInternalConverter(arrayType.getElementType());
return val -> {
- @SuppressWarnings("unchecked")
- T pgArray = (T) val;
+ java.sql.Array pgArray = (java.sql.Array) val;
Object[] in = (Object[]) pgArray.getArray();
final Object[] array = (Object[]) Array.newInstance(elementClass, in.length);
for (int i = 0; i < in.length; i++) {
@@ -93,4 +93,9 @@ public abstract class AbstractPostgresCompatibleDialectConverter<T extends java.
private JdbcDeserializationConverter createPrimitiveConverter(LogicalType type) {
return super.createInternalConverter(type);
}
+
+ @Override
+ public String converterName() {
+ return "PostgreSQL";
+ }
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresFactory.java b/flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresFactory.java
similarity index 100%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresFactory.java
rename to flink-connector-jdbc-postgres/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresFactory.java
diff --git a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory b/flink-connector-jdbc-postgres/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
similarity index 60%
copy from flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
copy to flink-connector-jdbc-postgres/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
index 13eecd1a..58a60ede 100644
--- a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
+++ b/flink-connector-jdbc-postgres/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
@@ -13,12 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.flink.connector.jdbc.databases.derby.dialect.DerbyFactory
-org.apache.flink.connector.jdbc.databases.mysql.dialect.MySqlFactory
-org.apache.flink.connector.jdbc.databases.oceanbase.dialect.OceanBaseFactory
org.apache.flink.connector.jdbc.databases.postgres.dialect.PostgresFactory
-org.apache.flink.connector.jdbc.databases.oracle.dialect.OracleFactory
-org.apache.flink.connector.jdbc.databases.sqlserver.dialect.SqlServerFactory
-org.apache.flink.connector.jdbc.databases.cratedb.dialect.CrateDBFactory
-org.apache.flink.connector.jdbc.databases.db2.dialect.Db2Factory
-org.apache.flink.connector.jdbc.databases.trino.dialect.TrinoFactory
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/PostgresTestBase.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/PostgresTestBase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/PostgresTestBase.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/PostgresTestBase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogITCase.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogITCase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogITCase.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogITCase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTest.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTest.java
similarity index 90%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTest.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTest.java
index 46ba695c..4e5d78b3 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTest.java
+++ b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTest.java
@@ -24,7 +24,6 @@ import org.apache.flink.table.catalog.ObjectPath;
import org.apache.flink.table.catalog.exceptions.DatabaseNotExistException;
import org.apache.flink.table.catalog.exceptions.TableNotExistException;
-import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
@@ -54,9 +53,9 @@ class PostgresCatalogTest extends PostgresCatalogTestBase {
@Test
void testDbExists() {
- Assertions.assertThat(catalog.databaseExists("nonexistent")).isFalse();
+ assertThat(catalog.databaseExists("nonexistent")).isFalse();
- Assertions.assertThat(catalog.databaseExists(PostgresCatalog.DEFAULT_DATABASE)).isTrue();
+ assertThat(catalog.databaseExists(PostgresCatalog.DEFAULT_DATABASE)).isTrue();
}
// ------ tables ------
@@ -89,15 +88,12 @@ class PostgresCatalogTest extends PostgresCatalogTestBase {
@Test
void testTableExists() {
- Assertions.assertThat(catalog.tableExists(new ObjectPath(TEST_DB, "nonexist"))).isFalse();
+ assertThat(catalog.tableExists(new ObjectPath(TEST_DB, "nonexist"))).isFalse();
- Assertions.assertThat(
- catalog.tableExists(
- new ObjectPath(PostgresCatalog.DEFAULT_DATABASE, TABLE1)))
- .isTrue();
- Assertions.assertThat(catalog.tableExists(new ObjectPath(TEST_DB, TABLE2))).isTrue();
- Assertions.assertThat(catalog.tableExists(new ObjectPath(TEST_DB, "test_schema.t3")))
+ assertThat(catalog.tableExists(new ObjectPath(PostgresCatalog.DEFAULT_DATABASE, TABLE1)))
.isTrue();
+ assertThat(catalog.tableExists(new ObjectPath(TEST_DB, TABLE2))).isTrue();
+ assertThat(catalog.tableExists(new ObjectPath(TEST_DB, "test_schema.t3"))).isTrue();
}
@Test
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTestBase.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTestBase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTestBase.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalogTestBase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTablePathTest.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTablePathTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTablePathTest.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTablePathTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/factory/JdbcCatalogFactoryTest.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/factory/JdbcCatalogFactoryTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/factory/JdbcCatalogFactoryTest.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/factory/JdbcCatalogFactoryTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectTest.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectTest.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/table/PostgresDynamicTableSinkITCase.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/table/PostgresDynamicTableSinkITCase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/table/PostgresDynamicTableSinkITCase.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/table/PostgresDynamicTableSinkITCase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/table/PostgresDynamicTableSourceITCase.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/table/PostgresDynamicTableSourceITCase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/table/PostgresDynamicTableSourceITCase.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/table/PostgresDynamicTableSourceITCase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/xa/PostgresExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/xa/PostgresExactlyOnceSinkE2eTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/xa/PostgresExactlyOnceSinkE2eTest.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/xa/PostgresExactlyOnceSinkE2eTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresDatabase.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresDatabase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresDatabase.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresDatabase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresImages.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresImages.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresImages.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresImages.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresMetadata.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresMetadata.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresMetadata.java
rename to flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/postgres/PostgresMetadata.java
diff --git a/flink-connector-jdbc-postgres/src/test/resources/log4j2-test.properties b/flink-connector-jdbc-postgres/src/test/resources/log4j2-test.properties
new file mode 100644
index 00000000..835c2ec9
--- /dev/null
+++ b/flink-connector-jdbc-postgres/src/test/resources/log4j2-test.properties
@@ -0,0 +1,28 @@
+################################################################################
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+################################################################################
+
+# Set root logger level to OFF to not flood build logs
+# set manually to INFO for debugging purposes
+rootLogger.level = OFF
+rootLogger.appenderRef.test.ref = TestLogger
+
+appender.testlogger.name = TestLogger
+appender.testlogger.type = CONSOLE
+appender.testlogger.target = SYSTEM_ERR
+appender.testlogger.layout.type = PatternLayout
+appender.testlogger.layout.pattern = %-4r [%t] %-5p %c %x - %m%n
diff --git a/flink-connector-jdbc-sqlserver/pom.xml b/flink-connector-jdbc-sqlserver/pom.xml
new file mode 100644
index 00000000..ea49e4c8
--- /dev/null
+++ b/flink-connector-jdbc-sqlserver/pom.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-parent</artifactId>
+ <version>3.2-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>flink-connector-jdbc-sqlserver</artifactId>
+ <name>Flink : Connectors : JDBC : SqlServer</name>
+
+ <packaging>jar</packaging>
+
+ <properties>
+ <sqlserver.version>10.2.1.jre8</sqlserver.version>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-api-java-bridge</artifactId>
+ <version>${flink.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-test-utils</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+
+ <!-- SQL Server -->
+ <dependency>
+ <groupId>com.microsoft.sqlserver</groupId>
+ <artifactId>mssql-jdbc</artifactId>
+ <version>${sqlserver.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Assertions test dependencies -->
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- MS SQL test -->
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>mssqlserver</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- ArchUit test dependencies -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-architecture-tests-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialect.java b/flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialect.java
similarity index 100%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialect.java
rename to flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialect.java
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialectConverter.java b/flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialectConverter.java
similarity index 100%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialectConverter.java
rename to flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerDialectConverter.java
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerFactory.java b/flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerFactory.java
similarity index 100%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerFactory.java
rename to flink-connector-jdbc-sqlserver/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerFactory.java
diff --git a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory b/flink-connector-jdbc-sqlserver/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
similarity index 60%
copy from flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
copy to flink-connector-jdbc-sqlserver/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
index 13eecd1a..d646ad1a 100644
--- a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
+++ b/flink-connector-jdbc-sqlserver/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
@@ -13,12 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.flink.connector.jdbc.databases.derby.dialect.DerbyFactory
-org.apache.flink.connector.jdbc.databases.mysql.dialect.MySqlFactory
-org.apache.flink.connector.jdbc.databases.oceanbase.dialect.OceanBaseFactory
-org.apache.flink.connector.jdbc.databases.postgres.dialect.PostgresFactory
-org.apache.flink.connector.jdbc.databases.oracle.dialect.OracleFactory
org.apache.flink.connector.jdbc.databases.sqlserver.dialect.SqlServerFactory
-org.apache.flink.connector.jdbc.databases.cratedb.dialect.CrateDBFactory
-org.apache.flink.connector.jdbc.databases.db2.dialect.Db2Factory
-org.apache.flink.connector.jdbc.databases.trino.dialect.TrinoFactory
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/SqlServerTestBase.java b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/SqlServerTestBase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/SqlServerTestBase.java
rename to flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/SqlServerTestBase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerPreparedStatementTest.java b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerPreparedStatementTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerPreparedStatementTest.java
rename to flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerPreparedStatementTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerDynamicTableSinkITCase.java b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerDynamicTableSinkITCase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerDynamicTableSinkITCase.java
rename to flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerDynamicTableSinkITCase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerDynamicTableSourceITCase.java b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerDynamicTableSourceITCase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerDynamicTableSourceITCase.java
rename to flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerDynamicTableSourceITCase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerTableSourceITCase.java b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerTableSourceITCase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerTableSourceITCase.java
rename to flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/table/SqlServerTableSourceITCase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/xa/SqlServerExactlyOnceSinkE2eTest.java b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/xa/SqlServerExactlyOnceSinkE2eTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/xa/SqlServerExactlyOnceSinkE2eTest.java
rename to flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/xa/SqlServerExactlyOnceSinkE2eTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerDatabase.java b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerDatabase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerDatabase.java
rename to flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerDatabase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerImages.java b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerImages.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerImages.java
rename to flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerImages.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerMetadata.java b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerMetadata.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerMetadata.java
rename to flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/sqlserver/SqlServerMetadata.java
diff --git a/flink-connector-jdbc-sqlserver/src/test/resources/log4j2-test.properties b/flink-connector-jdbc-sqlserver/src/test/resources/log4j2-test.properties
new file mode 100644
index 00000000..835c2ec9
--- /dev/null
+++ b/flink-connector-jdbc-sqlserver/src/test/resources/log4j2-test.properties
@@ -0,0 +1,28 @@
+################################################################################
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+################################################################################
+
+# Set root logger level to OFF to not flood build logs
+# set manually to INFO for debugging purposes
+rootLogger.level = OFF
+rootLogger.appenderRef.test.ref = TestLogger
+
+appender.testlogger.name = TestLogger
+appender.testlogger.type = CONSOLE
+appender.testlogger.target = SYSTEM_ERR
+appender.testlogger.layout.type = PatternLayout
+appender.testlogger.layout.pattern = %-4r [%t] %-5p %c %x - %m%n
diff --git a/flink-connector-jdbc-trino/pom.xml b/flink-connector-jdbc-trino/pom.xml
new file mode 100644
index 00000000..78444971
--- /dev/null
+++ b/flink-connector-jdbc-trino/pom.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-parent</artifactId>
+ <version>3.2-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>flink-connector-jdbc-trino</artifactId>
+ <name>Flink : Connectors : JDBC : Trino</name>
+
+ <packaging>jar</packaging>
+
+ <properties>
+ <trino.version>418</trino.version>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-postgres</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-api-java-bridge</artifactId>
+ <version>${flink.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-test-utils</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+
+ <!-- Trino -->
+ <dependency>
+ <groupId>io.trino</groupId>
+ <artifactId>trino-jdbc</artifactId>
+ <version>${trino.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Assertions test dependencies -->
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Trino test -->
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>trino</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>postgresql</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- ArchUit test dependencies -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-architecture-tests-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialect.java b/flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialect.java
similarity index 100%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialect.java
rename to flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialect.java
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectConverter.java b/flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectConverter.java
similarity index 100%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectConverter.java
rename to flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectConverter.java
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoFactory.java b/flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoFactory.java
similarity index 100%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoFactory.java
rename to flink-connector-jdbc-trino/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoFactory.java
diff --git a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory b/flink-connector-jdbc-trino/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
similarity index 59%
copy from flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
copy to flink-connector-jdbc-trino/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
index 13eecd1a..3ca0824d 100644
--- a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
+++ b/flink-connector-jdbc-trino/src/main/resources/META-INF/services/org.apache.flink.connector.jdbc.core.table.JdbcFactory
@@ -13,12 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.flink.connector.jdbc.databases.derby.dialect.DerbyFactory
-org.apache.flink.connector.jdbc.databases.mysql.dialect.MySqlFactory
-org.apache.flink.connector.jdbc.databases.oceanbase.dialect.OceanBaseFactory
-org.apache.flink.connector.jdbc.databases.postgres.dialect.PostgresFactory
-org.apache.flink.connector.jdbc.databases.oracle.dialect.OracleFactory
-org.apache.flink.connector.jdbc.databases.sqlserver.dialect.SqlServerFactory
-org.apache.flink.connector.jdbc.databases.cratedb.dialect.CrateDBFactory
-org.apache.flink.connector.jdbc.databases.db2.dialect.Db2Factory
org.apache.flink.connector.jdbc.databases.trino.dialect.TrinoFactory
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/TrinoTestBase.java b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/databases/trino/TrinoTestBase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/TrinoTestBase.java
rename to flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/databases/trino/TrinoTestBase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectTest.java b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectTest.java
rename to flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoPreparedStatementTest.java b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoPreparedStatementTest.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoPreparedStatementTest.java
rename to flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoPreparedStatementTest.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/table/TrinoDynamicTableSinkITCase.java b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/databases/trino/table/TrinoDynamicTableSinkITCase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/table/TrinoDynamicTableSinkITCase.java
rename to flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/databases/trino/table/TrinoDynamicTableSinkITCase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/table/TrinoDynamicTableSourceITCase.java b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/databases/trino/table/TrinoDynamicTableSourceITCase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/table/TrinoDynamicTableSourceITCase.java
rename to flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/databases/trino/table/TrinoDynamicTableSourceITCase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoDatabase.java b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoDatabase.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoDatabase.java
rename to flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoDatabase.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoImages.java b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoImages.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoImages.java
rename to flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoImages.java
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoMetadata.java b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoMetadata.java
similarity index 100%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoMetadata.java
rename to flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/testutils/databases/trino/TrinoMetadata.java
diff --git a/flink-connector-jdbc-trino/src/test/resources/log4j2-test.properties b/flink-connector-jdbc-trino/src/test/resources/log4j2-test.properties
new file mode 100644
index 00000000..835c2ec9
--- /dev/null
+++ b/flink-connector-jdbc-trino/src/test/resources/log4j2-test.properties
@@ -0,0 +1,28 @@
+################################################################################
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+################################################################################
+
+# Set root logger level to OFF to not flood build logs
+# set manually to INFO for debugging purposes
+rootLogger.level = OFF
+rootLogger.appenderRef.test.ref = TestLogger
+
+appender.testlogger.name = TestLogger
+appender.testlogger.type = CONSOLE
+appender.testlogger.target = SYSTEM_ERR
+appender.testlogger.layout.type = PatternLayout
+appender.testlogger.layout.pattern = %-4r [%t] %-5p %c %x - %m%n
diff --git a/flink-connector-jdbc/pom.xml b/flink-connector-jdbc/pom.xml
index 60211302..fe18432d 100644
--- a/flink-connector-jdbc/pom.xml
+++ b/flink-connector-jdbc/pom.xml
@@ -42,6 +42,47 @@ under the License.
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-cratedb</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-db2</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-mysql</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-oceanbase</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-oracle</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-postgres</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-sqlserver</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-trino</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-jdbc-core</artifactId>
diff --git a/pom.xml b/pom.xml
index 107ac34c..32bd0ffa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,14 @@ under the License.
<modules>
<module>flink-connector-jdbc</module>
<module>flink-connector-jdbc-core</module>
+ <module>flink-connector-jdbc-cratedb</module>
+ <module>flink-connector-jdbc-db2</module>
+ <module>flink-connector-jdbc-mysql</module>
+ <module>flink-connector-jdbc-oceanbase</module>
+ <module>flink-connector-jdbc-oracle</module>
+ <module>flink-connector-jdbc-postgres</module>
+ <module>flink-connector-jdbc-sqlserver</module>
+ <module>flink-connector-jdbc-trino</module>
</modules>
<properties>
@@ -64,11 +72,15 @@ under the License.
<slf4j.version>1.7.36</slf4j.version>
<log4j.version>2.17.2</log4j.version>
+
<flink.parent.artifactId>flink-connector-jdbc-parent</flink.parent.artifactId>
<flink.forkCountITCase>1</flink.forkCountITCase>
<!-- These 2 properties should be removed together with upgrade of flink-connector-parent to 1.1.x -->
<flink.surefire.baseArgLine>-XX:+UseG1GC -Xms256m -XX:+IgnoreUnrecognizedVMOptions ${surefire.module.config}</flink.surefire.baseArgLine>
- <surefire.module.config/>
+ <surefire.module.config>
+ <!-- required by JdbcExactlyOnceSinkE2eTest --> --add-opens=java.base/java.util=ALL-UNNAMED
+ <!-- SimpleJdbcConnectionProviderDriverClassConcurrentLoadingITCase--> --add-opens=java.base/java.lang=ALL-UNNAMED
+ </surefire.module.config>
<spotless.skip>false</spotless.skip>
</properties>
@@ -80,6 +92,13 @@ under the License.
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-base</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-common</artifactId>
+ <version>${flink.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<!-- Logging API -->
<dependency>
(flink-connector-jdbc) 07/14: [FLINK-35366] Bump containers and fix forkCountItCase
Posted by fa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git
commit 488423348818c034fd09320f8654373ea51dcd0a
Author: Joao Boto <bo...@boto.pro>
AuthorDate: Tue Jul 9 10:28:48 2024 +0200
[FLINK-35366] Bump containers and fix forkCountItCase
---
.../src/test/resources/log4j2-test.properties | 2 +-
.../database/catalog/CrateDBCatalogTestBase.java | 22 ++++++-
.../jdbc/cratedb/testutils/CrateDBDatabase.java | 5 +-
.../jdbc/cratedb/testutils/CrateDBImages.java | 6 +-
.../connector/jdbc/db2/testutils/Db2Database.java | 4 +-
.../connector/jdbc/db2/testutils/Db2Images.java | 6 ++
.../database/catalog/MySql56CatalogITCase.java | 35 ----------
.../database/catalog/MySql57CatalogITCase.java | 34 ----------
.../jdbc/mysql/testutils/MySql56Database.java | 57 -----------------
.../jdbc/mysql/testutils/MySql57Database.java | 57 -----------------
.../jdbc/mysql/testutils/MySqlDatabase.java | 2 +-
.../jdbc/mysql/testutils/MySqlImages.java | 4 +-
flink-connector-jdbc-oceanbase/pom.xml | 6 ++
.../jdbc/oceanbase/OceanBaseOracleTestBase.java | 8 +--
.../oceanbase/testutils/OceanBaseContainer.java | 74 ----------------------
.../oceanbase/testutils/OceanBaseDatabase.java | 5 +-
.../jdbc/oceanbase/testutils/OceanBaseImages.java | 5 +-
.../oceanbase/testutils/OceanBaseMetadata.java | 4 +-
.../oceanbase/testutils/OceanBaseTestDatabase.java | 25 --------
.../jdbc/oracle/testutils/OracleImages.java | 1 -
.../jdbc/postgres/testutils/PostgresDatabase.java | 2 +-
.../jdbc/postgres/testutils/PostgresImages.java | 4 +-
flink-connector-jdbc-sqlserver/pom.xml | 2 +
.../flink/connector/jdbc/trino/TrinoTestBase.java | 2 +-
.../trino/database/dialect/TrinoDialectTest.java | 3 +
.../jdbc/trino/testutils/TrinoDatabase.java | 2 +-
.../jdbc/trino/testutils/TrinoImages.java | 2 +-
flink-connector-jdbc/pom.xml | 8 +++
pom.xml | 3 +-
29 files changed, 72 insertions(+), 318 deletions(-)
diff --git a/flink-connector-jdbc-backward-compatibility/src/test/resources/log4j2-test.properties b/flink-connector-jdbc-backward-compatibility/src/test/resources/log4j2-test.properties
index 5a383778..835c2ec9 100644
--- a/flink-connector-jdbc-backward-compatibility/src/test/resources/log4j2-test.properties
+++ b/flink-connector-jdbc-backward-compatibility/src/test/resources/log4j2-test.properties
@@ -18,7 +18,7 @@
# Set root logger level to OFF to not flood build logs
# set manually to INFO for debugging purposes
-rootLogger.level = WARN
+rootLogger.level = OFF
rootLogger.appenderRef.test.ref = TestLogger
appender.testlogger.name = TestLogger
diff --git a/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/database/catalog/CrateDBCatalogTestBase.java b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/database/catalog/CrateDBCatalogTestBase.java
index b180ef01..73a49b92 100644
--- a/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/database/catalog/CrateDBCatalogTestBase.java
+++ b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/database/catalog/CrateDBCatalogTestBase.java
@@ -23,6 +23,7 @@ import org.apache.flink.connector.jdbc.testutils.JdbcITCaseBase;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.table.api.Schema;
+import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,6 +32,8 @@ import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
+import java.util.Arrays;
+import java.util.List;
import java.util.TimeZone;
import static org.apache.flink.connector.jdbc.cratedb.testutils.CrateDBDatabase.CONTAINER;
@@ -103,6 +106,21 @@ class CrateDBCatalogTestBase implements JdbcITCaseBase, CrateDBTestBase {
TABLE_ARRAY_TYPE, getArrayTable().values));
}
+ @AfterAll
+ static void clean() throws SQLException {
+ List<String> tables =
+ Arrays.asList(
+ CrateDBTablePath.fromFlinkTableName(TABLE1).getFullPath(),
+ CrateDBTablePath.fromFlinkTableName(TABLE2).getFullPath(),
+ new CrateDBTablePath(TEST_SCHEMA, TABLE3).getFullPath(),
+ CrateDBTablePath.fromFlinkTableName(TABLE_PRIMITIVE_TYPE).getFullPath(),
+ CrateDBTablePath.fromFlinkTableName(TABLE_TARGET_PRIMITIVE).getFullPath(),
+ CrateDBTablePath.fromFlinkTableName(TABLE_ARRAY_TYPE).getFullPath());
+ for (String table : tables) {
+ executeSQL(String.format("DROP TABLE %s", table));
+ }
+ }
+
public static void createTable(CrateDBTablePath tablePath, String tableSchemaSql)
throws SQLException {
executeSQL(String.format("CREATE TABLE %s(%s);", tablePath.getFullPath(), tableSchemaSql));
@@ -165,7 +183,7 @@ class CrateDBCatalogTestBase implements JdbcITCaseBase, CrateDBTestBase {
.column("ip", DataTypes.STRING())
.column("timestamp", DataTypes.TIMESTAMP(6))
// .column("timestamptz", DataTypes.TIMESTAMP_WITH_TIME_ZONE(6))
- .primaryKeyNamed("primitive_table_pk", "short", "int")
+ .primaryKeyNamed("primitive_table_pk", "int", "short")
.build(),
"int integer, "
+ "short short, "
@@ -185,7 +203,7 @@ class CrateDBCatalogTestBase implements JdbcITCaseBase, CrateDBTestBase {
+ "ip ip, "
+ "timestamp timestamp, "
// + "timestamptz timestamptz, "
- + "PRIMARY KEY (short, int)",
+ + "PRIMARY KEY (int, short)",
// Values
"1,"
+ "3,"
diff --git a/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/testutils/CrateDBDatabase.java b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/testutils/CrateDBDatabase.java
index 34869cbe..50d3ae4c 100644
--- a/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/testutils/CrateDBDatabase.java
+++ b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/testutils/CrateDBDatabase.java
@@ -31,14 +31,13 @@ import java.time.Duration;
import static java.time.temporal.ChronoUnit.SECONDS;
/** A CrateDB database for testing. */
-public class CrateDBDatabase extends DatabaseExtension {
+public class CrateDBDatabase extends DatabaseExtension implements CrateDBImages {
- private static final String CRATEDB = "crate:5.3.1";
private static final int CRATEDB_PG_PORT = 5432;
private static final int CRATEDB_HTTP_PORT = 4200;
private static final DockerImageName CRATEDB_DOCKER_IMAGE =
- DockerImageName.parse(CRATEDB).asCompatibleSubstituteFor("postgres");
+ DockerImageName.parse(CRATEDB_5).asCompatibleSubstituteFor("postgres");
private static final WaitStrategy WAIT_STRATEGY =
Wait.forHttp("/")
.forPort(CRATEDB_HTTP_PORT)
diff --git a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils/TrinoImages.java b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/testutils/CrateDBImages.java
similarity index 86%
copy from flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils/TrinoImages.java
copy to flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/testutils/CrateDBImages.java
index f70b8aba..4269e092 100644
--- a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils/TrinoImages.java
+++ b/flink-connector-jdbc-cratedb/src/test/java/org/apache/flink/connector/jdbc/cratedb/testutils/CrateDBImages.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.trino.testutils;
+package org.apache.flink.connector.jdbc.cratedb.testutils;
/** Postgres docker images. */
-public interface TrinoImages {
- String TRINO_IMAGE = "trinodb/trino:418";
+public interface CrateDBImages {
+ String CRATEDB_5 = "crate:5.7.2";
}
diff --git a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/testutils/Db2Database.java b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/testutils/Db2Database.java
index a6e1f3db..24e75858 100644
--- a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/testutils/Db2Database.java
+++ b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/testutils/Db2Database.java
@@ -29,13 +29,13 @@ import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.junit.jupiter.Container;
/** Db2 database for testing. */
-public class Db2Database extends DatabaseExtension {
+public class Db2Database extends DatabaseExtension implements Db2Images {
private static final Logger LOG = LoggerFactory.getLogger(Db2Database.class);
@Container
protected static final Db2Container CONTAINER =
- new Db2Container()
+ new Db2Container(DB2_11)
.withUsername("db2inst1")
.withPassword("flinkpw")
.withEnv("AUTOCONFIG", "false")
diff --git a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/testutils/Db2Images.java b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/testutils/Db2Images.java
new file mode 100644
index 00000000..e34d99ef
--- /dev/null
+++ b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/testutils/Db2Images.java
@@ -0,0 +1,6 @@
+package org.apache.flink.connector.jdbc.db2.testutils;
+
+/** DB2 docker images. */
+public interface Db2Images {
+ String DB2_11 = "icr.io/db2_community/db2:11.5.8.0";
+}
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/catalog/MySql56CatalogITCase.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/catalog/MySql56CatalogITCase.java
deleted file mode 100644
index f5cd0b99..00000000
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/catalog/MySql56CatalogITCase.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.connector.jdbc.mysql.database.catalog;
-
-import org.apache.flink.connector.jdbc.mysql.testutils.MySql56Database;
-import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
-
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-/** E2E test for {@link MySqlCatalog} with MySql version 5.6. */
-class MySql56CatalogITCase extends MySqlCatalogTestBase {
-
- @RegisterExtension private static final MySql56Database DATABASE = new MySql56Database();
-
- @Override
- public DatabaseMetadata getMetadata() {
- return MySql56Database.getMetadata();
- }
-}
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/catalog/MySql57CatalogITCase.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/catalog/MySql57CatalogITCase.java
deleted file mode 100644
index 894d0cf3..00000000
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/database/catalog/MySql57CatalogITCase.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.connector.jdbc.mysql.database.catalog;
-
-import org.apache.flink.connector.jdbc.mysql.testutils.MySql57Database;
-import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
-
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-/** E2E test for {@link MySqlCatalog} with MySql version 5.7. */
-class MySql57CatalogITCase extends MySqlCatalogTestBase {
- @RegisterExtension private static final MySql57Database DATABASE = new MySql57Database();
-
- @Override
- public DatabaseMetadata getMetadata() {
- return MySql57Database.getMetadata();
- }
-}
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySql56Database.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySql56Database.java
deleted file mode 100644
index 674a85a4..00000000
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySql56Database.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.connector.jdbc.mysql.testutils;
-
-import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
-import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
-import org.apache.flink.util.FlinkRuntimeException;
-
-import org.testcontainers.containers.MySQLContainer;
-
-/** A MySql database for testing. */
-public class MySql56Database extends DatabaseExtension implements MySqlImages {
-
- private static final MySQLContainer<?> CONTAINER =
- new MySqlContainer(MYSQL_5_6)
- .withCommand("--character-set-server=utf8")
- .withEnv("MYSQL_ROOT_HOST", "%");
-
- private static MySqlMetadata metadata;
-
- public static MySqlMetadata getMetadata() {
- if (!CONTAINER.isRunning()) {
- throw new FlinkRuntimeException("Container is stopped.");
- }
- if (metadata == null) {
- metadata = new MySqlMetadata(CONTAINER, true);
- }
- return metadata;
- }
-
- @Override
- protected DatabaseMetadata startDatabase() throws Exception {
- CONTAINER.start();
- return getMetadata();
- }
-
- @Override
- protected void stopDatabase() throws Exception {
- CONTAINER.stop();
- metadata = null;
- }
-}
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySql57Database.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySql57Database.java
deleted file mode 100644
index 64ee1579..00000000
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySql57Database.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.connector.jdbc.mysql.testutils;
-
-import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
-import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
-import org.apache.flink.util.FlinkRuntimeException;
-
-import org.testcontainers.containers.MySQLContainer;
-
-/** A MySql database for testing. */
-public class MySql57Database extends DatabaseExtension implements MySqlImages {
-
- private static final MySQLContainer<?> CONTAINER =
- new MySqlContainer(MYSQL_5_7)
- .withCommand("--character-set-server=utf8")
- .withEnv("MYSQL_ROOT_HOST", "%");
-
- private static MySqlMetadata metadata;
-
- public static MySqlMetadata getMetadata() {
- if (!CONTAINER.isRunning()) {
- throw new FlinkRuntimeException("Container is stopped.");
- }
- if (metadata == null) {
- metadata = new MySqlMetadata(CONTAINER, true);
- }
- return metadata;
- }
-
- @Override
- protected DatabaseMetadata startDatabase() throws Exception {
- CONTAINER.start();
- return getMetadata();
- }
-
- @Override
- protected void stopDatabase() throws Exception {
- CONTAINER.stop();
- metadata = null;
- }
-}
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySqlDatabase.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySqlDatabase.java
index cdcd57ff..99195063 100644
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySqlDatabase.java
+++ b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySqlDatabase.java
@@ -27,7 +27,7 @@ import org.testcontainers.containers.MySQLContainer;
public class MySqlDatabase extends DatabaseExtension implements MySqlImages {
private static final MySQLContainer<?> CONTAINER =
- new MySqlContainer(MYSQL_8_0)
+ new MySqlContainer(MYSQL_8)
.withXa()
.withLockWaitTimeout(50_000L)
.withCommand("--character-set-server=utf8")
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySqlImages.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySqlImages.java
index d4a43693..d1d86139 100644
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySqlImages.java
+++ b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/testutils/MySqlImages.java
@@ -19,7 +19,5 @@ package org.apache.flink.connector.jdbc.mysql.testutils;
/** MySql docker images. */
public interface MySqlImages {
- String MYSQL_5_6 = "mysql:5.6.51";
- String MYSQL_5_7 = "mysql:5.7.41";
- String MYSQL_8_0 = "mysql:8.0.32";
+ String MYSQL_8 = "mysql:9.0.0";
}
diff --git a/flink-connector-jdbc-oceanbase/pom.xml b/flink-connector-jdbc-oceanbase/pom.xml
index 5045e027..63d61a21 100644
--- a/flink-connector-jdbc-oceanbase/pom.xml
+++ b/flink-connector-jdbc-oceanbase/pom.xml
@@ -97,6 +97,12 @@
<artifactId>jdbc</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>oceanbase</artifactId>
+ <version>${testcontainers.version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- ArchUit test dependencies -->
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/OceanBaseOracleTestBase.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/OceanBaseOracleTestBase.java
index ab82655c..7aeb71e0 100644
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/OceanBaseOracleTestBase.java
+++ b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/OceanBaseOracleTestBase.java
@@ -19,7 +19,7 @@
package org.apache.flink.connector.jdbc.oceanbase;
import org.apache.flink.connector.jdbc.oceanbase.table.OceanBaseTableRow;
-import org.apache.flink.connector.jdbc.oceanbase.testutils.OceanBaseTestDatabase;
+import org.apache.flink.connector.jdbc.oceanbase.testutils.OceanBaseDatabase;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
import org.apache.flink.connector.jdbc.testutils.DatabaseTest;
import org.apache.flink.connector.jdbc.testutils.tables.TableField;
@@ -28,7 +28,7 @@ import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.junit.jupiter.api.extension.ExtendWith;
/** Base class for OceanBase Oracle mode testing. */
-@ExtendWith(OceanBaseTestDatabase.class)
+@ExtendWith(OceanBaseDatabase.class)
public interface OceanBaseOracleTestBase extends DatabaseTest {
default TableRow tableRow(String name, TableField... fields) {
@@ -37,8 +37,6 @@ public interface OceanBaseOracleTestBase extends DatabaseTest {
@Override
default DatabaseMetadata getMetadata() {
- // OceanBase Oracle mode is only available in OceanBase Enterprise Edition, which
- // does not provide docker image, so here use OceanBaseTestDatabase to test locally.
- return OceanBaseTestDatabase.getMetadata();
+ return OceanBaseDatabase.getMetadata();
}
}
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseContainer.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseContainer.java
deleted file mode 100644
index a76954a5..00000000
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseContainer.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.connector.jdbc.oceanbase.testutils;
-
-import org.testcontainers.containers.JdbcDatabaseContainer;
-import org.testcontainers.utility.DockerImageName;
-
-/** {@link JdbcDatabaseContainer} for OceanBase. */
-public class OceanBaseContainer extends JdbcDatabaseContainer<OceanBaseContainer> {
-
- public static final Integer SQL_PORT = 2881;
-
- public OceanBaseContainer(String dockerImageName) {
- this(DockerImageName.parse(dockerImageName));
-
- addExposedPort(SQL_PORT);
- }
-
- public OceanBaseContainer(DockerImageName dockerImageName) {
- super(dockerImageName);
- }
-
- @Override
- public String getDriverClassName() {
- return "com.oceanbase.jdbc.Driver";
- }
-
- @Override
- public String getJdbcUrl() {
- return getJdbcUrl("test");
- }
-
- public String getJdbcUrl(String databaseName) {
- String additionalUrlParams = constructUrlParameters("?", "&");
- return "jdbc:oceanbase://"
- + getHost()
- + ":"
- + getMappedPort(SQL_PORT)
- + "/"
- + databaseName
- + additionalUrlParams;
- }
-
- @Override
- public String getUsername() {
- return "root@test";
- }
-
- @Override
- public String getPassword() {
- return "";
- }
-
- @Override
- protected String getTestQueryString() {
- return "SELECT 1";
- }
-}
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseDatabase.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseDatabase.java
index 6db2c728..62279748 100644
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseDatabase.java
+++ b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseDatabase.java
@@ -25,6 +25,7 @@ import org.apache.flink.util.FlinkRuntimeException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.oceanbase.OceanBaseCEContainer;
import java.sql.Connection;
import java.sql.Statement;
@@ -34,8 +35,8 @@ public class OceanBaseDatabase extends DatabaseExtension implements OceanBaseIma
private static final Logger LOG = LoggerFactory.getLogger(OceanBaseDatabase.class);
- private static final OceanBaseContainer CONTAINER =
- new OceanBaseContainer(OCEANBASE_CE_4)
+ private static final OceanBaseCEContainer CONTAINER =
+ new OceanBaseCEContainer(OCEANBASE_CE_4)
.withEnv("MODE", "slim")
.withEnv("FASTBOOT", "true")
.withEnv("OB_DATAFILE_SIZE", "1G")
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseImages.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseImages.java
index b3ebf8b6..e167bad5 100644
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseImages.java
+++ b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseImages.java
@@ -20,8 +20,5 @@ package org.apache.flink.connector.jdbc.oceanbase.testutils;
/** OceanBase docker images. */
public interface OceanBaseImages {
-
- String OCEANBASE_CE_4 = "oceanbase/oceanbase-ce:4.2.1_bp3";
-
- String OCEANBASE_CE_3 = "oceanbase/oceanbase-ce:3.1.4";
+ String OCEANBASE_CE_4 = "oceanbase/oceanbase-ce:4.2.2";
}
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseMetadata.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseMetadata.java
index 9b8b3e4c..f6b16212 100644
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseMetadata.java
+++ b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseMetadata.java
@@ -20,6 +20,8 @@ package org.apache.flink.connector.jdbc.oceanbase.testutils;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
+import org.testcontainers.oceanbase.OceanBaseCEContainer;
+
import javax.sql.XADataSource;
/** OceanBase metadata. */
@@ -31,7 +33,7 @@ public class OceanBaseMetadata implements DatabaseMetadata {
private final String driver;
private final String version;
- public OceanBaseMetadata(OceanBaseContainer container) {
+ public OceanBaseMetadata(OceanBaseCEContainer container) {
this.username = container.getUsername();
this.password = container.getPassword();
this.url = container.getJdbcUrl();
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseTestDatabase.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseTestDatabase.java
deleted file mode 100644
index b3cb6839..00000000
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/testutils/OceanBaseTestDatabase.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.apache.flink.connector.jdbc.oceanbase.testutils;
-
-import org.apache.flink.connector.jdbc.testutils.DatabaseExtension;
-import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
-
-/** OceanBase database for locally testing. */
-public class OceanBaseTestDatabase extends DatabaseExtension {
-
- public static OceanBaseMetadata getMetadata() {
- return new OceanBaseMetadata(
- System.getenv("test.oceanbase.username"),
- System.getenv("test.oceanbase.password"),
- System.getenv("test.oceanbase.url"),
- "com.oceanbase.jdbc.Driver",
- "test");
- }
-
- @Override
- protected DatabaseMetadata startDatabase() throws Exception {
- return getMetadata();
- }
-
- @Override
- protected void stopDatabase() throws Exception {}
-}
diff --git a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/testutils/OracleImages.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/testutils/OracleImages.java
index 0c40e9e3..23f908a8 100644
--- a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/testutils/OracleImages.java
+++ b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/testutils/OracleImages.java
@@ -19,6 +19,5 @@ package org.apache.flink.connector.jdbc.oracle.testutils;
/** 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";
}
diff --git a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils/PostgresDatabase.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils/PostgresDatabase.java
index a4445e22..5b1700bd 100644
--- a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils/PostgresDatabase.java
+++ b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils/PostgresDatabase.java
@@ -30,7 +30,7 @@ import static org.apache.flink.util.Preconditions.checkArgument;
public class PostgresDatabase extends DatabaseExtension implements PostgresImages {
private static final PostgreSQLContainer<?> CONTAINER =
- new PostgresXaContainer(POSTGRES_15).withMaxConnections(10).withMaxTransactions(50);
+ new PostgresXaContainer(POSTGRES_16).withMaxConnections(10).withMaxTransactions(50);
private static PostgresMetadata metadata;
diff --git a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils/PostgresImages.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils/PostgresImages.java
index 9c33b8ef..5d5066f4 100644
--- a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils/PostgresImages.java
+++ b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/testutils/PostgresImages.java
@@ -19,6 +19,6 @@ package org.apache.flink.connector.jdbc.postgres.testutils;
/** Postgres docker images. */
public interface PostgresImages {
- String POSTGRES_9 = "postgres:9.6.24";
- String POSTGRES_15 = "postgres:15.1";
+ String POSTGRES_15 = "postgres:15.7";
+ String POSTGRES_16 = "postgres:16.3";
}
diff --git a/flink-connector-jdbc-sqlserver/pom.xml b/flink-connector-jdbc-sqlserver/pom.xml
index ea49e4c8..379eebaa 100644
--- a/flink-connector-jdbc-sqlserver/pom.xml
+++ b/flink-connector-jdbc-sqlserver/pom.xml
@@ -16,6 +16,8 @@
<properties>
<sqlserver.version>10.2.1.jre8</sqlserver.version>
+
+ <flink.forkCountITCase>1</flink.forkCountITCase>
</properties>
<dependencies>
diff --git a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/TrinoTestBase.java b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/TrinoTestBase.java
index 4b52cbe6..a81da70a 100644
--- a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/TrinoTestBase.java
+++ b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/TrinoTestBase.java
@@ -24,7 +24,7 @@ import org.apache.flink.connector.jdbc.trino.testutils.TrinoDatabase;
import org.junit.jupiter.api.extension.ExtendWith;
-/** Base class for Oracle testing. */
+/** Base class for Trino testing. */
@ExtendWith(TrinoDatabase.class)
public interface TrinoTestBase extends DatabaseTest {
diff --git a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/database/dialect/TrinoDialectTest.java b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/database/dialect/TrinoDialectTest.java
index 95bbca27..336c22c4 100644
--- a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/database/dialect/TrinoDialectTest.java
+++ b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/database/dialect/TrinoDialectTest.java
@@ -21,10 +21,13 @@ package org.apache.flink.connector.jdbc.trino.database.dialect;
import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectTest;
import org.apache.flink.connector.jdbc.trino.TrinoTestBase;
+import org.junit.jupiter.api.Disabled;
+
import java.util.Arrays;
import java.util.List;
/** The Oracle params for {@link JdbcDialectTest}. */
+@Disabled("Not working on jenkins as container not start.")
class TrinoDialectTest extends JdbcDialectTest implements TrinoTestBase {
@Override
diff --git a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils/TrinoDatabase.java b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils/TrinoDatabase.java
index 9e5dbc75..ba65a189 100644
--- a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils/TrinoDatabase.java
+++ b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils/TrinoDatabase.java
@@ -42,7 +42,7 @@ public class TrinoDatabase extends DatabaseExtension implements TrinoImages, Pos
private static final Integer CONTAINER_DB_PORT = 5432;
private static final PostgreSQLContainer<?> CONTAINER_DB =
- new PostgresDatabase.PostgresXaContainer(POSTGRES_15)
+ new PostgresDatabase.PostgresXaContainer(POSTGRES_16)
.withMaxConnections(10)
.withMaxTransactions(50)
.withExposedPorts(CONTAINER_DB_PORT)
diff --git a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils/TrinoImages.java b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils/TrinoImages.java
index f70b8aba..2cc965ba 100644
--- a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils/TrinoImages.java
+++ b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/testutils/TrinoImages.java
@@ -19,5 +19,5 @@ package org.apache.flink.connector.jdbc.trino.testutils;
/** Postgres docker images. */
public interface TrinoImages {
- String TRINO_IMAGE = "trinodb/trino:418";
+ String TRINO_IMAGE = "trinodb/trino:451";
}
diff --git a/flink-connector-jdbc/pom.xml b/flink-connector-jdbc/pom.xml
index fe18432d..45cc62f4 100644
--- a/flink-connector-jdbc/pom.xml
+++ b/flink-connector-jdbc/pom.xml
@@ -137,6 +137,14 @@ under the License.
<scope>test</scope>
</dependency>
+ <!-- Derby tests -->
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.14.2.0</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index 32bd0ffa..fda0c842 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@ under the License.
<junit4.version>4.13.2</junit4.version>
<junit5.version>5.10.1</junit5.version>
<assertj.version>3.24.2</assertj.version>
- <testcontainers.version>1.19.3</testcontainers.version>
+ <testcontainers.version>1.19.8</testcontainers.version>
<mockito.version>3.12.4</mockito.version>
<japicmp.referenceVersion>3.0.0-1.16</japicmp.referenceVersion>
@@ -74,7 +74,6 @@ under the License.
<flink.parent.artifactId>flink-connector-jdbc-parent</flink.parent.artifactId>
- <flink.forkCountITCase>1</flink.forkCountITCase>
<!-- These 2 properties should be removed together with upgrade of flink-connector-parent to 1.1.x -->
<flink.surefire.baseArgLine>-XX:+UseG1GC -Xms256m -XX:+IgnoreUnrecognizedVMOptions ${surefire.module.config}</flink.surefire.baseArgLine>
<surefire.module.config>
(flink-connector-jdbc) 13/14: [FLINK-35363] Fix deprecated documentation
Posted by fa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git
commit 9d535c6fefdb652faaa8a4265c46683cbcbca7b0
Author: Joao Boto <bo...@boto.pro>
AuthorDate: Fri Jul 12 22:22:20 2024 +0200
[FLINK-35363] Fix deprecated documentation
---
.../jdbc/internal/options/InternalJdbcConnectionOptions.java | 2 +-
.../src/main/java/org/apache/flink/connector/jdbc/JdbcSink.java | 6 +++++-
.../apache/flink/connector/jdbc/catalog/AbstractJdbcCatalog.java | 2 +-
.../java/org/apache/flink/connector/jdbc/catalog/JdbcCatalog.java | 2 +-
.../flink/connector/jdbc/catalog/factory/JdbcCatalogFactory.java | 3 ++-
.../flink/connector/jdbc/converter/AbstractJdbcRowConverter.java | 2 +-
.../org/apache/flink/connector/jdbc/converter/JdbcRowConverter.java | 2 +-
.../org/apache/flink/connector/jdbc/dialect/AbstractDialect.java | 2 +-
.../java/org/apache/flink/connector/jdbc/dialect/JdbcDialect.java | 2 +-
.../org/apache/flink/connector/jdbc/dialect/JdbcDialectFactory.java | 2 +-
.../apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java | 2 +-
.../main/java/org/apache/flink/connector/jdbc/sink/JdbcSink.java | 2 +-
.../java/org/apache/flink/connector/jdbc/sink/JdbcSinkBuilder.java | 3 +--
.../java/org/apache/flink/connector/jdbc/source/JdbcSource.java | 2 +-
.../org/apache/flink/connector/jdbc/source/JdbcSourceBuilder.java | 3 +--
.../connector/jdbc/source/reader/extractor/ResultExtractor.java | 2 +-
.../org/apache/flink/connector/jdbc/table/JdbcConnectorOptions.java | 2 +-
.../flink/connector/jdbc/xa/CheckpointAndXidSerializersTest.java | 1 +
.../apache/flink/connector/jdbc/xa/JdbcExactlyOnceSinkE2eTest.java | 1 +
.../org/apache/flink/connector/jdbc/xa/JdbcXaFacadeImplTest.java | 1 +
.../org/apache/flink/connector/jdbc/xa/JdbcXaFacadeTestHelper.java | 1 +
.../org/apache/flink/connector/jdbc/xa/JdbcXaSinkDerbyTest.java | 1 +
.../java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkH2Test.java | 1 +
.../apache/flink/connector/jdbc/xa/JdbcXaSinkNoInsertionTest.java | 1 +
.../java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestBase.java | 1 +
.../org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestHelper.java | 1 +
.../apache/flink/connector/jdbc/xa/SemanticXidGeneratorTest.java | 1 +
27 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/InternalJdbcConnectionOptions.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/InternalJdbcConnectionOptions.java
index de9e67b7..6c79ce15 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/InternalJdbcConnectionOptions.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/internal/options/InternalJdbcConnectionOptions.java
@@ -179,7 +179,7 @@ public class InternalJdbcConnectionOptions extends JdbcConnectionOptions {
/**
* optional, Handle the SQL dialect of jdbc driver. If not set, it will be infer by {@link
- * JdbcFactoryLoader#load} from DB url.
+ * JdbcFactoryLoader#loadDialect} from DB url.
*/
public Builder setDialect(JdbcDialect dialect) {
this.dialect = dialect;
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcSink.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcSink.java
index a46601f6..81bbc83d 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcSink.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcSink.java
@@ -30,7 +30,11 @@ import org.apache.flink.util.function.SerializableSupplier;
import javax.sql.XADataSource;
-/** Facade to create JDBC {@link SinkFunction sinks}. */
+/**
+ * Facade to create JDBC {@link SinkFunction sinks}.
+ *
+ * @deprecated Use {@link org.apache.flink.connector.jdbc.core.datastream.Jdbc}
+ */
@PublicEvolving
@Deprecated
public class JdbcSink {
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/AbstractJdbcCatalog.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/AbstractJdbcCatalog.java
index 4af50e7a..c5658367 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/AbstractJdbcCatalog.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/AbstractJdbcCatalog.java
@@ -21,7 +21,7 @@ package org.apache.flink.connector.jdbc.catalog;
/**
* Abstract catalog for any JDBC catalogs.
*
- * @deprecated use org.apache.flink.connector.jdbc.core.table.catalog.AbstractJdbcCatalog
+ * @deprecated Use {@link org.apache.flink.connector.jdbc.core.database.catalog.AbstractJdbcCatalog}
*/
@Deprecated
public abstract class AbstractJdbcCatalog
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalog.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalog.java
index b392788e..08db15da 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalog.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalog.java
@@ -37,7 +37,7 @@ import static org.apache.flink.connector.jdbc.JdbcConnectionOptions.getBriefAuth
/**
* Catalogs for relational databases via JDBC.
*
- * @deprecated user org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog
+ * @deprecated Use {@link org.apache.flink.connector.jdbc.core.database.catalog.JdbcCatalog}
*/
@Deprecated
@PublicEvolving
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactory.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactory.java
index 9aad0c7a..223b91c1 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactory.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactory.java
@@ -42,7 +42,8 @@ import static org.apache.flink.table.factories.FactoryUtil.PROPERTY_VERSION;
/**
* Factory for {@link JdbcCatalog}.
*
- * @deprecated use org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactory
+ * @deprecated Use {@link
+ * org.apache.flink.connector.jdbc.core.database.catalog.factory.JdbcCatalogFactory}.
*/
@Deprecated
public class JdbcCatalogFactory implements CatalogFactory {
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java
index 433b40c4..3f016201 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java
@@ -24,7 +24,7 @@ import org.apache.flink.table.types.logical.RowType;
/**
* Base class for all converters that convert between JDBC object and Flink internal object.
*
- * @deprecated use AbstractDialectConverter
+ * @deprecated Use {@link AbstractDialectConverter}
*/
@Deprecated
public abstract class AbstractJdbcRowConverter extends AbstractDialectConverter {
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/JdbcRowConverter.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/JdbcRowConverter.java
index 0effab66..bd0bc6c9 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/JdbcRowConverter.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/JdbcRowConverter.java
@@ -26,7 +26,7 @@ import org.apache.flink.table.data.RowData;
* Converter that is responsible to convert between JDBC object and Flink SQL internal data
* structure {@link RowData}.
*
- * @deprecated use JdbcDialectConverter
+ * @deprecated Use {@link JdbcDialectConverter}
*/
@Deprecated
@PublicEvolving
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractDialect.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractDialect.java
index 73db56e8..3a5af411 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractDialect.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractDialect.java
@@ -29,7 +29,7 @@ import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
* <p>Implementors should be careful to check the default SQL statements are performant for their
* specific dialect and override them if necessary.
*
- * @deprecated use org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialect
+ * @deprecated Use {@link org.apache.flink.connector.jdbc.core.database.dialect.AbstractDialect}
*/
@Deprecated
@PublicEvolving
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialect.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialect.java
index 400593d0..b8d2a63f 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialect.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialect.java
@@ -26,7 +26,7 @@ import org.apache.flink.connector.jdbc.core.database.JdbcFactory;
* and stateless.
*
* @see JdbcFactory
- * @deprecated use org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect
+ * @deprecated Use {@link org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect}
*/
@Deprecated
@PublicEvolving
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectFactory.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectFactory.java
index 4a6128f4..de674cda 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectFactory.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectFactory.java
@@ -30,7 +30,7 @@ import org.apache.flink.util.StringUtils;
* current classpath to be found.
*
* @see org.apache.flink.connector.jdbc.dialect.JdbcDialect
- * @deprecated use JdbcFactory
+ * @deprecated Use {@link JdbcFactory}
*/
@Deprecated
public interface JdbcDialectFactory extends JdbcFactory {
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java
index 73beac35..b1711478 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java
@@ -23,7 +23,7 @@ import org.apache.flink.connector.jdbc.core.database.catalog.JdbcCatalogTypeMapp
/**
* Separate the jdbc meta-information type to flink table type into the interface.
*
- * @deprecated use JdbcCatalogTypeMapper
+ * @deprecated Use {@link JdbcCatalogTypeMapper}
*/
@Deprecated
public interface JdbcDialectTypeMapper extends JdbcCatalogTypeMapper {}
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSink.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSink.java
index a1f8a4b4..2b1ba89a 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSink.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSink.java
@@ -44,7 +44,7 @@ import java.util.Collections;
* Flink Sink to produce data into a jdbc database.
*
* @see JdbcSinkBuilder on how to construct a JdbcSink
- * @deprecated please use {@link org.apache.flink.connector.jdbc.core.datastream.sink.JdbcSink}
+ * @deprecated Use {@link org.apache.flink.connector.jdbc.core.datastream.sink.JdbcSink}
*/
@PublicEvolving
@Deprecated
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSinkBuilder.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSinkBuilder.java
index 3b073568..da08b999 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSinkBuilder.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/sink/JdbcSinkBuilder.java
@@ -39,8 +39,7 @@ import static org.apache.flink.util.Preconditions.checkNotNull;
/**
* Builder to construct {@link JdbcSink}.
*
- * @deprecated please use {@link
- * org.apache.flink.connector.jdbc.core.datastream.sink.JdbcSinkBuilder}
+ * @deprecated Use {@link org.apache.flink.connector.jdbc.core.datastream.sink.JdbcSinkBuilder}
*/
@PublicEvolving
@Deprecated
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSource.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSource.java
index 19405624..cee58e75 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSource.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSource.java
@@ -53,7 +53,7 @@ import java.util.Objects;
/**
* JDBC source.
*
- * @deprecated please use {@link org.apache.flink.connector.jdbc.core.datastream.source.JdbcSource}
+ * @deprecated Use {@link org.apache.flink.connector.jdbc.core.datastream.source.JdbcSource}
*/
@PublicEvolving
@Deprecated
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceBuilder.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceBuilder.java
index 7e940e92..a1931584 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceBuilder.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceBuilder.java
@@ -89,8 +89,7 @@ import java.util.Objects;
* @see PreparedStatement
* @see DriverManager
* @see JdbcSource
- * @deprecated please use {@link
- * org.apache.flink.connector.jdbc.core.datastream.source.JdbcSourceBuilder}
+ * @deprecated Use {@link org.apache.flink.connector.jdbc.core.datastream.source.JdbcSourceBuilder}
*/
@PublicEvolving
@Deprecated
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/ResultExtractor.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/ResultExtractor.java
index 79935080..0a3e0ce9 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/ResultExtractor.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/ResultExtractor.java
@@ -26,7 +26,7 @@ import java.sql.ResultSet;
* The Extractor to extract the data from {@link ResultSet}.
*
* @param <T> The target data type.
- * @deprecated please use {@link
+ * @deprecated Use {@link
* org.apache.flink.connector.jdbc.core.datastream.source.reader.extractor.ResultExtractor}
*/
@PublicEvolving
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcConnectorOptions.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcConnectorOptions.java
index 8612e926..bee0d54a 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcConnectorOptions.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcConnectorOptions.java
@@ -23,7 +23,7 @@ import org.apache.flink.annotation.PublicEvolving;
/**
* Options for the JDBC connector.
*
- * @deprecated please use {@link org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions}
+ * @deprecated Use {@link org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions}
*/
@PublicEvolving
@Deprecated
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializersTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializersTest.java
index b736dddb..ef020ea3 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializersTest.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/CheckpointAndXidSerializersTest.java
@@ -22,6 +22,7 @@ import org.apache.flink.api.common.typeutils.TypeSerializer;
import org.apache.flink.connector.jdbc.datasource.transactions.xa.xid.XaXidTest;
/** XaSerializersTest. */
+@Deprecated
class CheckpointAndXidSerializersTest extends SerializerTestBase<CheckpointAndXid> {
private static final CheckpointAndXid CHECKPOINT_AND_XID =
CheckpointAndXid.createRestored(1L, 1, XaXidTest.XID);
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 eb8569db..f27cba56 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
@@ -72,6 +72,7 @@ import static org.apache.flink.util.Preconditions.checkState;
import static org.assertj.core.api.Assertions.assertThat;
/** A simple end-to-end test for {@link JdbcXaSinkFunction}. */
+@Deprecated
public abstract class JdbcExactlyOnceSinkE2eTest implements DatabaseTest {
private static final Logger LOG = LoggerFactory.getLogger(JdbcExactlyOnceSinkE2eTest.class);
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeImplTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeImplTest.java
index 12d3762d..313c0d5d 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeImplTest.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeImplTest.java
@@ -36,6 +36,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/** {@link XaFacadeImpl} tests. */
+@Deprecated
class JdbcXaFacadeImplTest extends JdbcTestBase {
private static final Xid XID =
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeTestHelper.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeTestHelper.java
index b167d62a..7eb232c8 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeTestHelper.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaFacadeTestHelper.java
@@ -33,6 +33,7 @@ import java.util.stream.IntStream;
import static org.apache.flink.connector.jdbc.JdbcTestFixture.TEST_DATA;
import static org.assertj.core.api.Assertions.assertThat;
+@Deprecated
class JdbcXaFacadeTestHelper implements AutoCloseable {
private final String table;
private final DatabaseMetadata metadata;
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkDerbyTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkDerbyTest.java
index 1f899af7..1a75a5a3 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkDerbyTest.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkDerbyTest.java
@@ -29,6 +29,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
* {@link JdbcXaSinkFunction} tests using Derby DB. Derby supports XA but doesn't use MVCC, so we
* can't check anything before all transactions are completed.
*/
+@Deprecated
class JdbcXaSinkDerbyTest extends JdbcXaSinkTestBase {
/**
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkH2Test.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkH2Test.java
index d080bbcf..6574242b 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkH2Test.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkH2Test.java
@@ -33,6 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* transaction is not yet committed). But XA support isn't full, so for some scenarios {@link
* H2XaDsWrapper wrapper} is used, and for some - Derby.
*/
+@Deprecated
class JdbcXaSinkH2Test extends JdbcXaSinkTestBase implements H2XaTestBase {
@Override
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkNoInsertionTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkNoInsertionTest.java
index 48972a97..b8e477bc 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkNoInsertionTest.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkNoInsertionTest.java
@@ -28,6 +28,7 @@ import static org.apache.flink.connector.jdbc.JdbcTestFixture.TEST_DATA;
import static org.assertj.core.api.Assertions.assertThat;
/** Tests that data is not inserted ahead of time. */
+@Deprecated
class JdbcXaSinkNoInsertionTest extends JdbcXaSinkTestBase implements H2XaTestBase {
@Override
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestBase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestBase.java
index 8441318f..c7407b0b 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestBase.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestBase.java
@@ -53,6 +53,7 @@ import static org.apache.flink.connector.jdbc.JdbcTestFixture.INSERT_TEMPLATE;
* // todo: javadoc case Base class for {@link JdbcXaSinkFunction} tests. In addition to {@link
* JdbcTestBase} init it initializes/closes helpers.
*/
+@Deprecated
abstract class JdbcXaSinkTestBase extends JdbcTestBase {
JdbcXaFacadeTestHelper xaHelper;
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestHelper.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestHelper.java
index 76050fe0..81bee7d2 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestHelper.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkTestHelper.java
@@ -25,6 +25,7 @@ import org.apache.flink.util.Preconditions;
import static org.apache.flink.connector.jdbc.JdbcTestFixture.TEST_DATA;
import static org.apache.flink.connector.jdbc.xa.JdbcXaSinkTestBase.TEST_SINK_CONTEXT;
+@Deprecated
class JdbcXaSinkTestHelper implements AutoCloseable {
private final JdbcXaSinkFunction<TestEntry> sink;
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/SemanticXidGeneratorTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/SemanticXidGeneratorTest.java
index 03b9f8dd..70c26314 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/SemanticXidGeneratorTest.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/xa/SemanticXidGeneratorTest.java
@@ -33,6 +33,7 @@ import static org.apache.flink.connector.jdbc.xa.JdbcXaSinkTestBase.TEST_RUNTIME
import static org.assertj.core.api.Assertions.assertThat;
/** Simple uniqueness tests for the {@link SemanticXidGenerator}. */
+@Deprecated
class SemanticXidGeneratorTest {
private static final int COUNT = 100_000;
(flink-connector-jdbc) 04/14: [FLINK-35365] Reorganize catalog code
Posted by fa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git
commit d8e5665ce9c04058f5aab6c2e696fa0a6b038728
Author: Joao Boto <bo...@boto.pro>
AuthorDate: Tue May 7 10:33:46 2024 +0200
[FLINK-35365] Reorganize catalog code
---
.../2047daea-3713-4298-bdb3-e269f539363f | 303 ---------------------
.../archunit-violations/stored.rules | 11 +-
flink-connector-jdbc-core/pom.xml | 15 +-
.../connector/jdbc/core/table/JdbcFactory.java | 30 +-
.../jdbc/core/table/JdbcFactoryLoader.java | 60 ++--
.../table}/catalog/AbstractJdbcCatalog.java | 37 ++-
.../jdbc/core/table/catalog/JdbcCatalog.java | 10 +
.../table/catalog/JdbcCatalogTypeMapper.java} | 6 +-
.../table}/catalog/factory/JdbcCatalogFactory.java | 27 +-
.../catalog/factory/JdbcCatalogFactoryOptions.java | 4 +-
.../databases/cratedb/dialect/CrateDBFactory.java | 14 +
.../jdbc/databases/db2/dialect/Db2Factory.java | 12 +
.../jdbc/databases/derby/dialect/DerbyFactory.java | 12 +
.../jdbc/databases/mysql/catalog/MySqlCatalog.java | 6 +-
.../databases/mysql/catalog/MySqlTypeMapper.java | 4 +-
.../jdbc/databases/mysql/dialect/MySqlFactory.java | 13 +
.../oceanbase/dialect/OceanBaseFactory.java | 12 +
.../databases/oracle/dialect/OracleFactory.java | 12 +
.../postgres/catalog/PostgresCatalog.java | 10 +-
.../postgres/catalog/PostgresTypeMapper.java | 4 +-
.../postgres/dialect/PostgresFactory.java | 14 +
.../sqlserver/dialect/SqlServerFactory.java | 12 +
.../jdbc/databases/trino/dialect/TrinoFactory.java | 12 +
.../flink/connector/jdbc/utils/JdbcUtils.java | 4 +-
.../org.apache.flink.table.factories.Factory | 2 +-
.../table/catalog/AbstractJdbcCatalogTest.java} | 15 +-
.../table/dialect/JdbcDialectConverterTest.java} | 6 +-
.../table/dialect/JdbcDialectTest.java} | 4 +-
...ialectTypeTest.java => CrateDBDialectTest.java} | 6 +-
...Db2DialectTypeTest.java => Db2DialectTest.java} | 6 +-
.../databases/mysql/dialect/MySqlDialectTest.java | 46 +++-
.../mysql/dialect/MySqlDialectTypeTest.java | 65 -----
...ypeTest.java => OceanBaseMysqlDialectTest.java} | 8 +-
...peTest.java => OceanBaseOracleDialectTest.java} | 8 +-
...DialectTypeTest.java => OracleDialectTest.java} | 6 +-
.../catalog/factory/JdbcCatalogFactoryTest.java | 17 +-
...alectTypeTest.java => PostgresDialectTest.java} | 6 +-
...oDialectTypeTest.java => TrinoDialectTest.java} | 6 +-
flink-connector-jdbc/pom.xml | 42 +++
.../AbstractJdbcCatalog.java} | 25 +-
.../flink/connector/jdbc/catalog/JdbcCatalog.java | 13 +-
.../connector/jdbc/catalog/JdbcCatalogUtils.java | 37 ++-
.../jdbc/catalog/factory/JdbcCatalogFactory.java | 23 +-
.../jdbc/converter/AbstractJdbcRowConverter.java | 2 +-
.../jdbc/dialect/JdbcDialectTypeMapper.java | 19 +-
.../org.apache.flink.table.factories.Factory | 1 -
.../jdbc/dialect/JdbcDialectTypeTest.java | 20 +-
pom.xml | 9 +
48 files changed, 474 insertions(+), 562 deletions(-)
diff --git a/flink-connector-jdbc-core/archunit-violations/2047daea-3713-4298-bdb3-e269f539363f b/flink-connector-jdbc-core/archunit-violations/2047daea-3713-4298-bdb3-e269f539363f
deleted file mode 100644
index 662348fa..00000000
--- a/flink-connector-jdbc-core/archunit-violations/2047daea-3713-4298-bdb3-e269f539363f
+++ /dev/null
@@ -1,303 +0,0 @@
-Class <org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog> extends class <org.apache.flink.table.catalog.AbstractCatalog> in (AbstractJdbcCatalog.java:0)
-Class <org.apache.flink.connector.jdbc.table.JdbcFilterPushdownPreparedStatementVisitor> extends class <org.apache.flink.table.expressions.ExpressionDefaultVisitor> in (JdbcFilterPushdownPreparedStatementVisitor.java:0)
-Constructor <org.apache.flink.connector.jdbc.JdbcConnectionOptions.<init>(java.lang.String, java.lang.String, int, java.util.Properties)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcConnectionOptions.java:50)
-Constructor <org.apache.flink.connector.jdbc.JdbcConnectionOptions.<init>(java.lang.String, java.lang.String, int, java.util.Properties)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcConnectionOptions.java:53)
-Constructor <org.apache.flink.connector.jdbc.JdbcConnectionOptions.<init>(java.lang.String, java.lang.String, int, java.util.Properties)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcConnectionOptions.java:57)
-Constructor <org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions.<init>(boolean, int, boolean, java.util.Optional, boolean)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcExactlyOnceOptions.java:75)
-Constructor <org.apache.flink.connector.jdbc.JdbcExecutionOptions.<init>(long, int, int)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean)> in (JdbcExecutionOptions.java:38)
-Constructor <org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog.<init>(java.lang.ClassLoader, java.lang.String, java.lang.String, java.lang.String, java.util.Properties)> calls constructor <org.apache.flink.table.catalog.AbstractCatalog.<init>(java.lang.String, java.lang.String)> in (AbstractJdbcCatalog.java:121)
-Constructor <org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog.<init>(java.lang.ClassLoader, java.lang.String, java.lang.String, java.lang.String, java.util.Properties)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean)> in (AbstractJdbcCatalog.java:124)
-Constructor <org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog.<init>(java.lang.ClassLoader, java.lang.String, java.lang.String, java.lang.String, java.util.Properties)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean)> in (AbstractJdbcCatalog.java:132)
-Constructor <org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog.<init>(java.lang.ClassLoader, java.lang.String, java.lang.String, java.lang.String, java.util.Properties)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean)> in (AbstractJdbcCatalog.java:134)
-Constructor <org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog.<init>(java.lang.ClassLoader, java.lang.String, java.lang.String, java.lang.String, java.util.Properties)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (AbstractJdbcCatalog.java:123)
-Constructor <org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog.<init>(java.lang.ClassLoader, java.lang.String, java.lang.String, java.lang.String, java.util.Properties)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (AbstractJdbcCatalog.java:131)
-Constructor <org.apache.flink.connector.jdbc.catalog.JdbcCatalog.<init>(java.lang.ClassLoader, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcCatalog.java:0)
-Constructor <org.apache.flink.connector.jdbc.converter.AbstractJdbcRowConverter.<init>(org.apache.flink.table.types.logical.RowType)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (AbstractJdbcRowConverter.java:60)
-Constructor <org.apache.flink.connector.jdbc.databases.cratedb.catalog.CrateDBCatalog.<init>(java.lang.ClassLoader, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (CrateDBCatalog.java:0)
-Constructor <org.apache.flink.connector.jdbc.databases.mysql.catalog.MySqlCatalog.<init>(java.lang.ClassLoader, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (MySqlCatalog.java:0)
-Constructor <org.apache.flink.connector.jdbc.databases.mysql.catalog.MySqlCatalog.<init>(java.lang.ClassLoader, java.lang.String, java.lang.String, java.lang.String, java.util.Properties)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (MySqlCatalog.java:92)
-Constructor <org.apache.flink.connector.jdbc.databases.mysql.catalog.MySqlCatalog.<init>(java.lang.ClassLoader, java.lang.String, java.lang.String, java.lang.String, java.util.Properties)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (MySqlCatalog.java:94)
-Constructor <org.apache.flink.connector.jdbc.databases.postgres.catalog.PostgresCatalog.<init>(java.lang.ClassLoader, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (PostgresCatalog.java:0)
-Constructor <org.apache.flink.connector.jdbc.databases.postgres.catalog.PostgresTablePath.<init>(java.lang.String, java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (PostgresTablePath.java:41)
-Constructor <org.apache.flink.connector.jdbc.databases.postgres.catalog.PostgresTablePath.<init>(java.lang.String, java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (PostgresTablePath.java:44)
-Constructor <org.apache.flink.connector.jdbc.datasource.connections.xa.SimpleXaConnectionProvider.<init>(java.util.function.Supplier, java.lang.Integer)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (SimpleXaConnectionProvider.java:81)
-Constructor <org.apache.flink.connector.jdbc.internal.GenericJdbcSinkFunction.<init>(org.apache.flink.connector.jdbc.internal.JdbcOutputFormat)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (GenericJdbcSinkFunction.java:44)
-Constructor <org.apache.flink.connector.jdbc.internal.JdbcOutputFormat.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.internal.JdbcOutputFormat$StatementExecutorFactory)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcOutputFormat.java:87)
-Constructor <org.apache.flink.connector.jdbc.internal.JdbcOutputFormat.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.internal.JdbcOutputFormat$StatementExecutorFactory)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcOutputFormat.java:88)
-Constructor <org.apache.flink.connector.jdbc.internal.JdbcOutputFormat.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.internal.JdbcOutputFormat$StatementExecutorFactory)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcOutputFormat.java:89)
-Constructor <org.apache.flink.connector.jdbc.internal.TableJdbcUpsertOutputFormat.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.internal.JdbcOutputFormat$StatementExecutorFactory, org.apache.flink.connector.jdbc.internal.JdbcOutputFormat$StatementExecutorFactory)> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (TableJdbcUpsertOutputFormat.java:0)
-Constructor <org.apache.flink.connector.jdbc.internal.executor.InsertOrUpdateJdbcExecutor.<init>(java.lang.String, java.lang.String, java.lang.String, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, java.util.function.Function, java.util.function.Function)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (InsertOrUpdateJdbcExecutor.java:76)
-Constructor <org.apache.flink.connector.jdbc.internal.executor.InsertOrUpdateJdbcExecutor.<init>(java.lang.String, java.lang.String, java.lang.String, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, java.util.function.Function, java.util.function.Function)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (InsertOrUpdateJdbcExecutor.java:77)
-Constructor <org.apache.flink.connector.jdbc.internal.executor.InsertOrUpdateJdbcExecutor.<init>(java.lang.String, java.lang.String, java.lang.String, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, java.util.function.Function, java.util.function.Function)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (InsertOrUpdateJdbcExecutor.java:78)
-Constructor <org.apache.flink.connector.jdbc.internal.executor.InsertOrUpdateJdbcExecutor.<init>(java.lang.String, java.lang.String, java.lang.String, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, java.util.function.Function, java.util.function.Function)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (InsertOrUpdateJdbcExecutor.java:79)
-Constructor <org.apache.flink.connector.jdbc.internal.executor.InsertOrUpdateJdbcExecutor.<init>(java.lang.String, java.lang.String, java.lang.String, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, java.util.function.Function, java.util.function.Function)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (InsertOrUpdateJdbcExecutor.java:80)
-Constructor <org.apache.flink.connector.jdbc.internal.executor.InsertOrUpdateJdbcExecutor.<init>(java.lang.String, java.lang.String, java.lang.String, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, java.util.function.Function, java.util.function.Function)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (InsertOrUpdateJdbcExecutor.java:81)
-Constructor <org.apache.flink.connector.jdbc.internal.executor.InsertOrUpdateJdbcExecutor.<init>(java.lang.String, java.lang.String, java.lang.String, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, java.util.function.Function, java.util.function.Function)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (InsertOrUpdateJdbcExecutor.java:82)
-Constructor <org.apache.flink.connector.jdbc.internal.executor.InsertOrUpdateJdbcExecutor.<init>(java.lang.String, java.lang.String, java.lang.String, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, org.apache.flink.connector.jdbc.JdbcStatementBuilder, java.util.function.Function, java.util.function.Function)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (InsertOrUpdateJdbcExecutor.java:83)
-Constructor <org.apache.flink.connector.jdbc.internal.executor.TableInsertOrUpdateStatementExecutor.<init>(org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, java.util.function.Functi [...]
-Constructor <org.apache.flink.connector.jdbc.internal.executor.TableInsertOrUpdateStatementExecutor.<init>(org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, java.util.function.Functi [...]
-Constructor <org.apache.flink.connector.jdbc.internal.executor.TableInsertOrUpdateStatementExecutor.<init>(org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, java.util.function.Functi [...]
-Constructor <org.apache.flink.connector.jdbc.internal.executor.TableInsertOrUpdateStatementExecutor.<init>(org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, java.util.function.Functi [...]
-Constructor <org.apache.flink.connector.jdbc.internal.executor.TableInsertOrUpdateStatementExecutor.<init>(org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, java.util.function.Functi [...]
-Constructor <org.apache.flink.connector.jdbc.internal.executor.TableInsertOrUpdateStatementExecutor.<init>(org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, org.apache.flink.connector.jdbc.converter.JdbcRowConverter, java.util.function.Functi [...]
-Constructor <org.apache.flink.connector.jdbc.internal.executor.TableSimpleStatementExecutor.<init>(org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.converter.JdbcRowConverter)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (TableSimpleStatementExecutor.java:47)
-Constructor <org.apache.flink.connector.jdbc.internal.executor.TableSimpleStatementExecutor.<init>(org.apache.flink.connector.jdbc.statement.StatementFactory, org.apache.flink.connector.jdbc.converter.JdbcRowConverter)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (TableSimpleStatementExecutor.java:48)
-Constructor <org.apache.flink.connector.jdbc.internal.options.JdbcDmlOptions.<init>(java.lang.String, org.apache.flink.connector.jdbc.dialect.JdbcDialect, [Ljava.lang.String;, [I, [Ljava.lang.String;)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcDmlOptions.java:51)
-Constructor <org.apache.flink.connector.jdbc.internal.options.JdbcDmlOptions.<init>(java.lang.String, org.apache.flink.connector.jdbc.dialect.JdbcDialect, [Ljava.lang.String;, [I, [Ljava.lang.String;)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcDmlOptions.java:52)
-Constructor <org.apache.flink.connector.jdbc.internal.options.JdbcDmlOptions.<init>(java.lang.String, org.apache.flink.connector.jdbc.dialect.JdbcDialect, [Ljava.lang.String;, [I, [Ljava.lang.String;)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcDmlOptions.java:53)
-Constructor <org.apache.flink.connector.jdbc.internal.options.JdbcInsertOptions.<init>(java.lang.String, [I)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcInsertOptions.java:33)
-Constructor <org.apache.flink.connector.jdbc.sink.writer.JdbcWriter.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.statements.JdbcQueryStatement, org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer, org.apache.flink.connector.base.DeliveryGuarantee, java.util.Collection, org.apache.flink.a [...]
-Constructor <org.apache.flink.connector.jdbc.sink.writer.JdbcWriter.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.statements.JdbcQueryStatement, org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer, org.apache.flink.connector.base.DeliveryGuarantee, java.util.Collection, org.apache.flink.a [...]
-Constructor <org.apache.flink.connector.jdbc.sink.writer.JdbcWriter.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.statements.JdbcQueryStatement, org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer, org.apache.flink.connector.base.DeliveryGuarantee, java.util.Collection, org.apache.flink.a [...]
-Constructor <org.apache.flink.connector.jdbc.sink.writer.JdbcWriter.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.statements.JdbcQueryStatement, org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer, org.apache.flink.connector.base.DeliveryGuarantee, java.util.Collection, org.apache.flink.a [...]
-Constructor <org.apache.flink.connector.jdbc.sink.writer.JdbcWriter.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.statements.JdbcQueryStatement, org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer, org.apache.flink.connector.base.DeliveryGuarantee, java.util.Collection, org.apache.flink.a [...]
-Constructor <org.apache.flink.connector.jdbc.sink.writer.JdbcWriter.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.statements.JdbcQueryStatement, org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer, org.apache.flink.connector.base.DeliveryGuarantee, java.util.Collection, org.apache.flink.a [...]
-Constructor <org.apache.flink.connector.jdbc.sink.writer.JdbcWriter.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.statements.JdbcQueryStatement, org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer, org.apache.flink.connector.base.DeliveryGuarantee, java.util.Collection, org.apache.flink.a [...]
-Constructor <org.apache.flink.connector.jdbc.sink.writer.JdbcWriter.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.statements.JdbcQueryStatement, org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer, org.apache.flink.connector.base.DeliveryGuarantee, java.util.Collection, org.apache.flink.a [...]
-Constructor <org.apache.flink.connector.jdbc.sink.writer.JdbcWriter.<init>(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.JdbcExecutionOptions, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.statements.JdbcQueryStatement, org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer, org.apache.flink.connector.base.DeliveryGuarantee, java.util.Collection, org.apache.flink.a [...]
-Constructor <org.apache.flink.connector.jdbc.source.JdbcSource.<init>(org.apache.flink.configuration.Configuration, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.source.enumerator.JdbcSqlSplitEnumeratorBase$Provider, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.base.DeliveryGuarantee)> calls method <org.apache.flink. [...]
-Constructor <org.apache.flink.connector.jdbc.source.JdbcSource.<init>(org.apache.flink.configuration.Configuration, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.source.enumerator.JdbcSqlSplitEnumeratorBase$Provider, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.base.DeliveryGuarantee)> calls method <org.apache.flink. [...]
-Constructor <org.apache.flink.connector.jdbc.source.JdbcSource.<init>(org.apache.flink.configuration.Configuration, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.source.enumerator.JdbcSqlSplitEnumeratorBase$Provider, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.base.DeliveryGuarantee)> calls method <org.apache.flink. [...]
-Constructor <org.apache.flink.connector.jdbc.source.JdbcSource.<init>(org.apache.flink.configuration.Configuration, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.source.enumerator.JdbcSqlSplitEnumeratorBase$Provider, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.base.DeliveryGuarantee)> calls method <org.apache.flink. [...]
-Constructor <org.apache.flink.connector.jdbc.source.JdbcSource.<init>(org.apache.flink.configuration.Configuration, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.source.enumerator.JdbcSqlSplitEnumeratorBase$Provider, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.base.DeliveryGuarantee)> calls method <org.apache.flink. [...]
-Constructor <org.apache.flink.connector.jdbc.source.JdbcSource.<init>(org.apache.flink.configuration.Configuration, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.jdbc.source.enumerator.JdbcSqlSplitEnumeratorBase$Provider, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.base.DeliveryGuarantee)> calls method <org.apache.flink. [...]
-Constructor <org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumStateSerializer.<init>(org.apache.flink.connector.jdbc.source.split.JdbcSourceSplitSerializer)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcSourceEnumStateSerializer.java:47)
-Constructor <org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumerator.<init>(org.apache.flink.api.connector.source.SplitEnumeratorContext, org.apache.flink.connector.jdbc.source.enumerator.JdbcSqlSplitEnumeratorBase, java.util.List)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcSourceEnumerator.java:54)
-Constructor <org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumerator.<init>(org.apache.flink.api.connector.source.SplitEnumeratorContext, org.apache.flink.connector.jdbc.source.enumerator.JdbcSqlSplitEnumeratorBase, java.util.List)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcSourceEnumerator.java:55)
-Constructor <org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumerator.<init>(org.apache.flink.api.connector.source.SplitEnumeratorContext, org.apache.flink.connector.jdbc.source.enumerator.JdbcSqlSplitEnumeratorBase, java.util.List)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcSourceEnumerator.java:57)
-Constructor <org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumeratorState.<init>(java.util.List, java.util.List, java.util.List, java.io.Serializable)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcSourceEnumeratorState.java:47)
-Constructor <org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumeratorState.<init>(java.util.List, java.util.List, java.util.List, java.io.Serializable)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcSourceEnumeratorState.java:48)
-Constructor <org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumeratorState.<init>(java.util.List, java.util.List, java.util.List, java.io.Serializable)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcSourceEnumeratorState.java:49)
-Constructor <org.apache.flink.connector.jdbc.source.enumerator.SqlTemplateSplitEnumerator.<init>(java.io.Serializable, java.lang.String, org.apache.flink.connector.jdbc.split.JdbcParameterValuesProvider)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (SqlTemplateSplitEnumerator.java:47)
-Constructor <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.<init>(org.apache.flink.api.connector.source.SourceReaderContext, org.apache.flink.configuration.Configuration, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.base.DeliveryGuarantee, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor)> calls method <org.apache.flink.util.Preco [...]
-Constructor <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.<init>(org.apache.flink.api.connector.source.SourceReaderContext, org.apache.flink.configuration.Configuration, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.base.DeliveryGuarantee, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor)> calls method <org.apache.flink.util.Preco [...]
-Constructor <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.<init>(org.apache.flink.api.connector.source.SourceReaderContext, org.apache.flink.configuration.Configuration, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.base.DeliveryGuarantee, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor)> calls method <org.apache.flink.util.Preco [...]
-Constructor <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.<init>(org.apache.flink.api.connector.source.SourceReaderContext, org.apache.flink.configuration.Configuration, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.base.DeliveryGuarantee, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor)> calls method <org.apache.flink.util.Preco [...]
-Constructor <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.<init>(org.apache.flink.api.connector.source.SourceReaderContext, org.apache.flink.configuration.Configuration, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.base.DeliveryGuarantee, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor)> calls method <org.apache.flink.util.Preco [...]
-Constructor <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.<init>(org.apache.flink.api.connector.source.SourceReaderContext, org.apache.flink.configuration.Configuration, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.base.DeliveryGuarantee, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor)> calls method <org.apache.flink.util.Preco [...]
-Constructor <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.<init>(org.apache.flink.api.connector.source.SourceReaderContext, org.apache.flink.configuration.Configuration, org.apache.flink.api.common.typeinfo.TypeInformation, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider, org.apache.flink.connector.base.DeliveryGuarantee, org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor)> calls method <org.apache.flink.util.Preco [...]
-Constructor <org.apache.flink.connector.jdbc.source.split.JdbcSourceSplitState.<init>(org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcSourceSplitState.java:38)
-Constructor <org.apache.flink.connector.jdbc.split.CompositeJdbcParameterValuesProvider.<init>(org.apache.flink.connector.jdbc.split.JdbcParameterValuesProvider, org.apache.flink.connector.jdbc.split.JdbcParameterValuesProvider)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (CompositeJdbcParameterValuesProvider.java:34)
-Constructor <org.apache.flink.connector.jdbc.split.JdbcNumericBetweenParametersProvider.<init>(long, long)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcNumericBetweenParametersProvider.java:55)
-Constructor <org.apache.flink.connector.jdbc.split.JdbcNumericBetweenParametersProvider.<init>(long, long, long)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcNumericBetweenParametersProvider.java:68)
-Constructor <org.apache.flink.connector.jdbc.table.JdbcDynamicTableSource$JdbcDataStreamScanProvider.<init>(org.apache.flink.connector.jdbc.source.JdbcSource)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcDynamicTableSource.java:319)
-Constructor <org.apache.flink.connector.jdbc.table.JdbcFilterPushdownPreparedStatementVisitor.<init>(java.util.function.Function)> calls constructor <org.apache.flink.table.expressions.ExpressionDefaultVisitor.<init>()> in (JdbcFilterPushdownPreparedStatementVisitor.java:52)
-Constructor <org.apache.flink.connector.jdbc.table.JdbcRowDataLookupFunction.<init>(org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions, int, [Ljava.lang.String;, [Lorg.apache.flink.table.types.DataType;, [Ljava.lang.String;, org.apache.flink.table.types.logical.RowType, java.util.List, [Ljava.io.Serializable;)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.String, [Ljava.lang.Object;)> in (JdbcRowDataLookupFunction.java:95)
-Constructor <org.apache.flink.connector.jdbc.table.JdbcRowDataLookupFunction.<init>(org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions, int, [Ljava.lang.String;, [Lorg.apache.flink.table.types.DataType;, [Ljava.lang.String;, org.apache.flink.table.types.logical.RowType, java.util.List, [Ljava.io.Serializable;)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcRowDataLookupFunction.java:82)
-Constructor <org.apache.flink.connector.jdbc.table.JdbcRowDataLookupFunction.<init>(org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions, int, [Ljava.lang.String;, [Lorg.apache.flink.table.types.DataType;, [Ljava.lang.String;, org.apache.flink.table.types.logical.RowType, java.util.List, [Ljava.io.Serializable;)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcRowDataLookupFunction.java:83)
-Constructor <org.apache.flink.connector.jdbc.table.JdbcRowDataLookupFunction.<init>(org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions, int, [Ljava.lang.String;, [Lorg.apache.flink.table.types.DataType;, [Ljava.lang.String;, org.apache.flink.table.types.logical.RowType, java.util.List, [Ljava.io.Serializable;)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcRowDataLookupFunction.java:84)
-Constructor <org.apache.flink.connector.jdbc.table.JdbcRowDataLookupFunction.<init>(org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions, int, [Ljava.lang.String;, [Lorg.apache.flink.table.types.DataType;, [Ljava.lang.String;, org.apache.flink.table.types.logical.RowType, java.util.List, [Ljava.io.Serializable;)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcRowDataLookupFunction.java:85)
-Constructor <org.apache.flink.connector.jdbc.table.JdbcRowDataLookupFunction.<init>(org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions, int, [Ljava.lang.String;, [Lorg.apache.flink.table.types.DataType;, [Ljava.lang.String;, org.apache.flink.table.types.logical.RowType, java.util.List, [Ljava.io.Serializable;)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcRowDataLookupFunction.java:86)
-Constructor <org.apache.flink.connector.jdbc.table.JdbcRowDataLookupFunction.<init>(org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions, int, [Ljava.lang.String;, [Lorg.apache.flink.table.types.DataType;, [Ljava.lang.String;, org.apache.flink.table.types.logical.RowType, java.util.List, [Ljava.io.Serializable;)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcRowDataLookupFunction.java:87)
-Constructor <org.apache.flink.connector.jdbc.table.JdbcRowDataLookupFunction.<init>(org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions, int, [Ljava.lang.String;, [Lorg.apache.flink.table.types.DataType;, [Ljava.lang.String;, org.apache.flink.table.types.logical.RowType, java.util.List, [Ljava.io.Serializable;)> has parameter of type <[Lorg.apache.flink.table.types.DataType;> in (JdbcRowDataLookupFunction.java:0)
-Constructor <org.apache.flink.connector.jdbc.table.RowDataResultExtractor.<init>(org.apache.flink.connector.jdbc.converter.JdbcRowConverter)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (RowDataResultExtractor.java:35)
-Constructor <org.apache.flink.connector.jdbc.xa.CheckpointAndXid.<init>(long, javax.transaction.xa.Xid, int, boolean)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (CheckpointAndXid.java:46)
-Constructor <org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunction.<init>(org.apache.flink.connector.jdbc.internal.JdbcOutputFormat, org.apache.flink.connector.jdbc.xa.XaFacade, org.apache.flink.connector.jdbc.xa.XidGenerator, org.apache.flink.connector.jdbc.xa.XaSinkStateHandler, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.xa.XaGroupOps)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcXaSink [...]
-Constructor <org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunction.<init>(org.apache.flink.connector.jdbc.internal.JdbcOutputFormat, org.apache.flink.connector.jdbc.xa.XaFacade, org.apache.flink.connector.jdbc.xa.XidGenerator, org.apache.flink.connector.jdbc.xa.XaSinkStateHandler, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.xa.XaGroupOps)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcXaSinkFunction.j [...]
-Constructor <org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunction.<init>(org.apache.flink.connector.jdbc.internal.JdbcOutputFormat, org.apache.flink.connector.jdbc.xa.XaFacade, org.apache.flink.connector.jdbc.xa.XidGenerator, org.apache.flink.connector.jdbc.xa.XaSinkStateHandler, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.xa.XaGroupOps)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcXaSinkFunction.j [...]
-Constructor <org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunction.<init>(org.apache.flink.connector.jdbc.internal.JdbcOutputFormat, org.apache.flink.connector.jdbc.xa.XaFacade, org.apache.flink.connector.jdbc.xa.XidGenerator, org.apache.flink.connector.jdbc.xa.XaSinkStateHandler, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.xa.XaGroupOps)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcXaSinkFunction.j [...]
-Constructor <org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunction.<init>(org.apache.flink.connector.jdbc.internal.JdbcOutputFormat, org.apache.flink.connector.jdbc.xa.XaFacade, org.apache.flink.connector.jdbc.xa.XidGenerator, org.apache.flink.connector.jdbc.xa.XaSinkStateHandler, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.xa.XaGroupOps)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcXaSinkFunction.j [...]
-Constructor <org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunction.<init>(org.apache.flink.connector.jdbc.internal.JdbcOutputFormat, org.apache.flink.connector.jdbc.xa.XaFacade, org.apache.flink.connector.jdbc.xa.XidGenerator, org.apache.flink.connector.jdbc.xa.XaSinkStateHandler, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.xa.XaGroupOps)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcXaSinkFunction.j [...]
-Constructor <org.apache.flink.connector.jdbc.xa.XaFacadeImpl.<init>(java.util.function.Supplier, java.lang.Integer)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (XaFacadeImpl.java:90)
-Constructor <org.apache.flink.connector.jdbc.xa.XidImpl.<init>(int, [B, [B)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean)> in (XidImpl.java:46)
-Constructor <org.apache.flink.connector.jdbc.xa.XidImpl.<init>(int, [B, [B)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean)> in (XidImpl.java:47)
-Field <org.apache.flink.connector.jdbc.converter.AbstractJdbcRowConverter.fieldTypes> has type <[Lorg.apache.flink.table.types.logical.LogicalType;> in (AbstractJdbcRowConverter.java:0)
-Field <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.fieldDataTypes> has type <[Lorg.apache.flink.table.types.DataType;> in (JdbcOutputFormatBuilder.java:0)
-Interface <org.apache.flink.connector.jdbc.JdbcStatementBuilder> extends interface <org.apache.flink.util.function.BiConsumerWithException> in (JdbcStatementBuilder.java:0)
-Method <org.apache.flink.connector.jdbc.JdbcConnectionOptions$JdbcConnectionOptionsBuilder.withProperty(java.lang.String, java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcConnectionOptions.java:116)
-Method <org.apache.flink.connector.jdbc.JdbcConnectionOptions$JdbcConnectionOptionsBuilder.withProperty(java.lang.String, java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcConnectionOptions.java:117)
-Method <org.apache.flink.connector.jdbc.JdbcInputFormat$JdbcInputFormatBuilder.setFetchSize(int)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.String, [Ljava.lang.Object;)> in (JdbcInputFormat.java:406)
-Method <org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog.databaseExists(java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean)> in (AbstractJdbcCatalog.java:221)
-Method <org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog.getDatabase(java.lang.String)> calls constructor <org.apache.flink.table.catalog.CatalogDatabaseImpl.<init>(java.util.Map, java.lang.String)> in (AbstractJdbcCatalog.java:252)
-Method <org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog.getDatabase(java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (AbstractJdbcCatalog.java:248)
-Method <org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog.getPrimaryKey(java.sql.DatabaseMetaData, java.lang.String, java.lang.String, java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (AbstractJdbcCatalog.java:194)
-Method <org.apache.flink.connector.jdbc.catalog.JdbcCatalog.getInternal()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcCatalog.java:0)
-Method <org.apache.flink.connector.jdbc.catalog.JdbcCatalogUtils.validateJdbcUrl(java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean)> in (JdbcCatalogUtils.java:44)
-Method <org.apache.flink.connector.jdbc.converter.AbstractPostgresCompatibleRowConverter.createPostgresArrayConverter(org.apache.flink.table.types.logical.ArrayType)> calls method <org.apache.flink.table.types.logical.utils.LogicalTypeUtils.toInternalConversionClass(org.apache.flink.table.types.logical.LogicalType)> in (AbstractPostgresCompatibleRowConverter.java:75)
-Method <org.apache.flink.connector.jdbc.databases.cratedb.catalog.CrateDBTablePath.fromFlinkTableName(java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (CrateDBTablePath.java:41)
-Method <org.apache.flink.connector.jdbc.databases.mysql.catalog.MySqlCatalog.listTables(java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (MySqlCatalog.java:114)
-Method <org.apache.flink.connector.jdbc.databases.postgres.catalog.PostgresCatalog.listTables(java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (PostgresCatalog.java:184)
-Method <org.apache.flink.connector.jdbc.databases.postgres.catalog.PostgresTablePath.fromFlinkTableName(java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (PostgresTablePath.java:56)
-Method <org.apache.flink.connector.jdbc.datasource.connections.SimpleJdbcConnectionProvider.loadDriver(java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (SimpleJdbcConnectionProvider.java:86)
-Method <org.apache.flink.connector.jdbc.datasource.connections.xa.PoolingXaConnectionProvider.endAndPrepare(javax.transaction.xa.Xid)> calls method <org.apache.flink.util.Preconditions.checkState(boolean)> in (PoolingXaConnectionProvider.java:109)
-Method <org.apache.flink.connector.jdbc.datasource.connections.xa.PoolingXaConnectionProvider.open()> calls method <org.apache.flink.util.Preconditions.checkState(boolean)> in (PoolingXaConnectionProvider.java:79)
-Method <org.apache.flink.connector.jdbc.datasource.connections.xa.PoolingXaConnectionProvider.peekPooled()> calls method <org.apache.flink.util.ExceptionUtils.rethrow(java.lang.Throwable)> in (PoolingXaConnectionProvider.java:202)
-Method <org.apache.flink.connector.jdbc.datasource.connections.xa.PoolingXaConnectionProvider.start(javax.transaction.xa.Xid)> calls method <org.apache.flink.util.Preconditions.checkState(boolean)> in (PoolingXaConnectionProvider.java:91)
-Method <org.apache.flink.connector.jdbc.datasource.connections.xa.SimpleXaConnectionProvider.execute(org.apache.flink.connector.jdbc.datasource.connections.xa.XaCommand)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (SimpleXaConnectionProvider.java:261)
-Method <org.apache.flink.connector.jdbc.datasource.connections.xa.SimpleXaConnectionProvider.from(javax.sql.XADataSource)> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (SimpleXaConnectionProvider.java:0)
-Method <org.apache.flink.connector.jdbc.datasource.connections.xa.SimpleXaConnectionProvider.getConnection()> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (SimpleXaConnectionProvider.java:128)
-Method <org.apache.flink.connector.jdbc.datasource.connections.xa.SimpleXaConnectionProvider.open()> calls method <org.apache.flink.util.Preconditions.checkState(boolean)> in (SimpleXaConnectionProvider.java:101)
-Method <org.apache.flink.connector.jdbc.datasource.connections.xa.SimpleXaConnectionProvider.open()> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (SimpleXaConnectionProvider.java:87)
-Method <org.apache.flink.connector.jdbc.datasource.connections.xa.SimpleXaConnectionProvider.recover()> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (SimpleXaConnectionProvider.java:246)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.XaTransaction.checkState()> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (XaTransaction.java:121)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.XaTransaction.checkState()> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (XaTransaction.java:122)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.XaTransaction.createTx(long)> calls method <org.apache.flink.util.ExceptionUtils.rethrowIOException(java.lang.Throwable)> in (XaTransaction.java:135)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.XaTransaction.createTx(long)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (XaTransaction.java:130)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.XaTransaction.open(org.apache.flink.connector.jdbc.sink.writer.JdbcWriterState)> calls method <org.apache.flink.util.ExceptionUtils.rethrowIOException(java.lang.Throwable)> in (XaTransaction.java:86)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.XaTransaction.prepareTx()> calls method <org.apache.flink.util.ExceptionUtils.rethrowIOException(java.lang.Throwable)> in (XaTransaction.java:151)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.deserialize([B)> calls constructor <org.apache.flink.core.memory.DataInputDeserializer.<init>([B)> in (TransactionId.java:96)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.deserialize([B)> calls method <org.apache.flink.core.memory.DataInputDeserializer.readInt()> in (TransactionId.java:101)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.deserialize([B)> calls method <org.apache.flink.core.memory.DataInputDeserializer.readInt()> in (TransactionId.java:98)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.deserialize([B)> calls method <org.apache.flink.core.memory.DataInputDeserializer.readInt()> in (TransactionId.java:99)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.deserialize([B)> calls method <org.apache.flink.core.memory.DataInputDeserializer.readLong()> in (TransactionId.java:100)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.fromXid(int, [B, [B, boolean)> calls constructor <org.apache.flink.core.memory.DataInputDeserializer.<init>([B)> in (TransactionId.java:83)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.fromXid(int, [B, [B, boolean)> calls constructor <org.apache.flink.core.memory.DataInputDeserializer.<init>([B)> in (TransactionId.java:87)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.fromXid(int, [B, [B, boolean)> calls method <org.apache.flink.core.memory.DataInputDeserializer.readInt()> in (TransactionId.java:85)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.fromXid(int, [B, [B, boolean)> calls method <org.apache.flink.core.memory.DataInputDeserializer.readInt()> in (TransactionId.java:88)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.fromXid(int, [B, [B, boolean)> calls method <org.apache.flink.core.memory.DataInputDeserializer.readLong()> in (TransactionId.java:89)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.getBranchQualifier()> calls constructor <org.apache.flink.core.memory.DataOutputSerializer.<init>(int)> in (TransactionId.java:172)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.getBranchQualifier()> calls method <org.apache.flink.core.memory.DataOutputSerializer.getSharedBuffer()> in (TransactionId.java:175)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.getBranchQualifier()> calls method <org.apache.flink.core.memory.DataOutputSerializer.writeInt(int)> in (TransactionId.java:173)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.getBranchQualifier()> calls method <org.apache.flink.core.memory.DataOutputSerializer.writeLong(long)> in (TransactionId.java:174)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.getBranchQualifier()> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (TransactionId.java:169)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.getGlobalTransactionId()> calls constructor <org.apache.flink.core.memory.DataOutputSerializer.<init>(int)> in (TransactionId.java:158)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.getGlobalTransactionId()> calls method <org.apache.flink.core.memory.DataOutputSerializer.getSharedBuffer()> in (TransactionId.java:161)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.getGlobalTransactionId()> calls method <org.apache.flink.core.memory.DataOutputSerializer.write([B, int, int)> in (TransactionId.java:159)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.getGlobalTransactionId()> calls method <org.apache.flink.core.memory.DataOutputSerializer.writeInt(int)> in (TransactionId.java:160)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.readJobId(org.apache.flink.core.memory.DataInputDeserializer)> calls method <org.apache.flink.core.memory.DataInputDeserializer.read([B)> in (TransactionId.java:110)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.readJobId(org.apache.flink.core.memory.DataInputDeserializer)> has parameter of type <org.apache.flink.core.memory.DataInputDeserializer> in (TransactionId.java:0)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.serialize()> calls constructor <org.apache.flink.core.memory.DataOutputSerializer.<init>(int)> in (TransactionId.java:183)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.serialize()> calls method <org.apache.flink.core.memory.DataOutputSerializer.getSharedBuffer()> in (TransactionId.java:189)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.serialize()> calls method <org.apache.flink.core.memory.DataOutputSerializer.write([B, int, int)> in (TransactionId.java:184)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.serialize()> calls method <org.apache.flink.core.memory.DataOutputSerializer.writeInt(int)> in (TransactionId.java:185)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.serialize()> calls method <org.apache.flink.core.memory.DataOutputSerializer.writeInt(int)> in (TransactionId.java:186)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.serialize()> calls method <org.apache.flink.core.memory.DataOutputSerializer.writeInt(int)> in (TransactionId.java:188)
-Method <org.apache.flink.connector.jdbc.datasource.transactions.xa.domain.TransactionId.serialize()> calls method <org.apache.flink.core.memory.DataOutputSerializer.writeLong(long)> in (TransactionId.java:187)
-Method <org.apache.flink.connector.jdbc.dialect.AbstractDialect$Range.of(int, int)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (AbstractDialect.java:256)
-Method <org.apache.flink.connector.jdbc.internal.JdbcOutputFormat.getConnection()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcOutputFormat.java:0)
-Method <org.apache.flink.connector.jdbc.internal.JdbcOutputFormat.open(org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer)> calls constructor <org.apache.flink.util.concurrent.ExecutorThreadFactory.<init>(java.lang.String)> in (JdbcOutputFormat.java:103)
-Method <org.apache.flink.connector.jdbc.internal.JdbcOutputFormat.open(org.apache.flink.connector.jdbc.internal.JdbcOutputSerializer)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcOutputFormat.java:94)
-Method <org.apache.flink.connector.jdbc.internal.RowJdbcOutputFormat$Builder.build()> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (RowJdbcOutputFormat.java:132)
-Method <org.apache.flink.connector.jdbc.internal.TableJdbcUpsertOutputFormat.createUpsertRowExecutor(org.apache.flink.connector.jdbc.internal.options.JdbcDmlOptions)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean)> in (TableJdbcUpsertOutputFormat.java:152)
-Method <org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions$Builder.build()> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (InternalJdbcConnectionOptions.java:202)
-Method <org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions$Builder.build()> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (InternalJdbcConnectionOptions.java:203)
-Method <org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions$Builder.setProperty(java.lang.String, java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (InternalJdbcConnectionOptions.java:195)
-Method <org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions$Builder.setProperty(java.lang.String, java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (InternalJdbcConnectionOptions.java:196)
-Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.build(org.apache.flink.connector.base.DeliveryGuarantee, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:111)
-Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.build(org.apache.flink.connector.base.DeliveryGuarantee, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:112)
-Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.build(org.apache.flink.connector.base.DeliveryGuarantee, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:113)
-Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.build(org.apache.flink.connector.base.DeliveryGuarantee, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:114)
-Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.build(org.apache.flink.connector.base.DeliveryGuarantee, org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:115)
-Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.buildAtLeastOnce(org.apache.flink.connector.jdbc.JdbcConnectionOptions)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:67)
-Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.buildAtLeastOnce(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:73)
-Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.buildAtLeastOnce(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:78)
-Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.buildExactlyOnce(org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.connections.xa.XaConnectionProvider)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:101)
-Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.buildExactlyOnce(org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.connector.jdbc.datasource.connections.xa.XaConnectionProvider)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:102)
-Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.buildExactlyOnce(org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.util.function.SerializableSupplier)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:85)
-Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.buildExactlyOnce(org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions, org.apache.flink.util.function.SerializableSupplier)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:86)
-Method <org.apache.flink.connector.jdbc.sink.JdbcSinkBuilder.withExecutionOptions(org.apache.flink.connector.jdbc.JdbcExecutionOptions)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSinkBuilder.java:51)
-Method <org.apache.flink.connector.jdbc.sink.committer.JdbcCommitableSerializer.deserialize(int, [B)> calls constructor <org.apache.flink.core.memory.DataInputDeserializer.<init>([B)> in (JdbcCommitableSerializer.java:34)
-Method <org.apache.flink.connector.jdbc.sink.committer.JdbcCommitableSerializer.serialize(org.apache.flink.connector.jdbc.sink.committer.JdbcCommitable)> calls constructor <org.apache.flink.core.memory.DataOutputSerializer.<init>(int)> in (JdbcCommitableSerializer.java:27)
-Method <org.apache.flink.connector.jdbc.sink.committer.JdbcCommitableSerializer.serialize(org.apache.flink.connector.jdbc.sink.committer.JdbcCommitable)> calls method <org.apache.flink.core.memory.DataOutputSerializer.getSharedBuffer()> in (JdbcCommitableSerializer.java:29)
-Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriter.snapshotState(long)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.String, [Ljava.lang.Object;)> in (JdbcWriter.java:192)
-Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.deserialize(int, [B)> calls constructor <org.apache.flink.core.memory.DataInputDeserializer.<init>([B)> in (JdbcWriterStateSerializer.java:48)
-Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.deserializeV2(org.apache.flink.core.memory.DataInputDeserializer)> calls method <org.apache.flink.core.memory.DataInputDeserializer.read([B, int, int)> in (JdbcWriterStateSerializer.java:62)
-Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.deserializeV2(org.apache.flink.core.memory.DataInputDeserializer)> calls method <org.apache.flink.core.memory.DataInputDeserializer.read([B, int, int)> in (JdbcWriterStateSerializer.java:70)
-Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.deserializeV2(org.apache.flink.core.memory.DataInputDeserializer)> calls method <org.apache.flink.core.memory.DataInputDeserializer.readByte()> in (JdbcWriterStateSerializer.java:60)
-Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.deserializeV2(org.apache.flink.core.memory.DataInputDeserializer)> calls method <org.apache.flink.core.memory.DataInputDeserializer.readByte()> in (JdbcWriterStateSerializer.java:68)
-Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.deserializeV2(org.apache.flink.core.memory.DataInputDeserializer)> calls method <org.apache.flink.core.memory.DataInputDeserializer.readInt()> in (JdbcWriterStateSerializer.java:57)
-Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.deserializeV2(org.apache.flink.core.memory.DataInputDeserializer)> calls method <org.apache.flink.core.memory.DataInputDeserializer.readInt()> in (JdbcWriterStateSerializer.java:65)
-Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.deserializeV2(org.apache.flink.core.memory.DataInputDeserializer)> has parameter of type <org.apache.flink.core.memory.DataInputDeserializer> in (JdbcWriterStateSerializer.java:0)
-Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.serialize(org.apache.flink.connector.jdbc.sink.writer.JdbcWriterState)> calls constructor <org.apache.flink.core.memory.DataOutputSerializer.<init>(int)> in (JdbcWriterStateSerializer.java:29)
-Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.serialize(org.apache.flink.connector.jdbc.sink.writer.JdbcWriterState)> calls method <org.apache.flink.core.memory.DataOutputSerializer.getSharedBuffer()> in (JdbcWriterStateSerializer.java:42)
-Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.serialize(org.apache.flink.connector.jdbc.sink.writer.JdbcWriterState)> calls method <org.apache.flink.core.memory.DataOutputSerializer.write([B, int, int)> in (JdbcWriterStateSerializer.java:34)
-Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.serialize(org.apache.flink.connector.jdbc.sink.writer.JdbcWriterState)> calls method <org.apache.flink.core.memory.DataOutputSerializer.write([B, int, int)> in (JdbcWriterStateSerializer.java:40)
-Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.serialize(org.apache.flink.connector.jdbc.sink.writer.JdbcWriterState)> calls method <org.apache.flink.core.memory.DataOutputSerializer.writeByte(int)> in (JdbcWriterStateSerializer.java:33)
-Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.serialize(org.apache.flink.connector.jdbc.sink.writer.JdbcWriterState)> calls method <org.apache.flink.core.memory.DataOutputSerializer.writeByte(int)> in (JdbcWriterStateSerializer.java:39)
-Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.serialize(org.apache.flink.connector.jdbc.sink.writer.JdbcWriterState)> calls method <org.apache.flink.core.memory.DataOutputSerializer.writeInt(int)> in (JdbcWriterStateSerializer.java:30)
-Method <org.apache.flink.connector.jdbc.sink.writer.JdbcWriterStateSerializer.serialize(org.apache.flink.connector.jdbc.sink.writer.JdbcWriterState)> calls method <org.apache.flink.core.memory.DataOutputSerializer.writeInt(int)> in (JdbcWriterStateSerializer.java:36)
-Method <org.apache.flink.connector.jdbc.source.JdbcSource.equals(java.lang.Object)> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcSource.java:0)
-Method <org.apache.flink.connector.jdbc.source.JdbcSource.getConfiguration()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcSource.java:0)
-Method <org.apache.flink.connector.jdbc.source.JdbcSource.getResultExtractor()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcSource.java:0)
-Method <org.apache.flink.connector.jdbc.source.JdbcSource.getSqlSplitEnumeratorProvider()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcSource.java:0)
-Method <org.apache.flink.connector.jdbc.source.JdbcSource.getTypeInformation()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcSource.java:0)
-Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.build()> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSourceBuilder.java:250)
-Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.build()> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSourceBuilder.java:251)
-Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.build()> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (JdbcSourceBuilder.java:248)
-Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.setConnectionProperty(java.lang.String, java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSourceBuilder.java:187)
-Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.setConnectionProperty(java.lang.String, java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSourceBuilder.java:188)
-Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.setConnectionProvider(org.apache.flink.connector.jdbc.datasource.connections.JdbcConnectionProvider)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcSourceBuilder.java:234)
-Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.setDBUrl(java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcSourceBuilder.java:164)
-Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.setDriverName(java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcSourceBuilder.java:156)
-Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.setJdbcParameterValuesProvider(org.apache.flink.connector.jdbc.split.JdbcParameterValuesProvider)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcSourceBuilder.java:195)
-Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.setResultExtractor(org.apache.flink.connector.jdbc.source.reader.extractor.ResultExtractor)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSourceBuilder.java:140)
-Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.setResultSetFetchSize(int)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.String, [Ljava.lang.Object;)> in (JdbcSourceBuilder.java:224)
-Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.setSplitReaderFetchBatchSize(int)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.String, [Ljava.lang.Object;)> in (JdbcSourceBuilder.java:200)
-Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.setSql(java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcSourceBuilder.java:131)
-Method <org.apache.flink.connector.jdbc.source.JdbcSourceBuilder.setTypeInformation(org.apache.flink.api.common.typeinfo.TypeInformation)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcSourceBuilder.java:173)
-Method <org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumStateSerializer.deserialize(int, [B)> calls method <org.apache.flink.util.InstantiationUtil.deserializeObject([B, java.lang.ClassLoader)> in (JdbcSourceEnumStateSerializer.java:110)
-Method <org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumStateSerializer.serialize(org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumeratorState)> calls method <org.apache.flink.util.InstantiationUtil.serializeObject(java.lang.Object)> in (JdbcSourceEnumStateSerializer.java:70)
-Method <org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumStateSerializer.serialize(org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumeratorState)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.String, [Ljava.lang.Object;)> in (JdbcSourceEnumStateSerializer.java:58)
-Method <org.apache.flink.connector.jdbc.source.enumerator.JdbcSourceEnumStateSerializer.serializeJdbcSourceSplits(java.io.DataOutputStream, java.util.List)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (JdbcSourceEnumStateSerializer.java:86)
-Method <org.apache.flink.connector.jdbc.source.enumerator.SqlTemplateSplitEnumerator$TemplateSqlSplitEnumeratorProvider.setSqlTemplate(java.lang.String)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (SqlTemplateSplitEnumerator.java:92)
-Method <org.apache.flink.connector.jdbc.source.enumerator.SqlTemplateSplitEnumerator.getParameterValuesProvider()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (SqlTemplateSplitEnumerator.java:0)
-Method <org.apache.flink.connector.jdbc.source.enumerator.SqlTemplateSplitEnumerator.getSqlTemplate()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (SqlTemplateSplitEnumerator.java:0)
-Method <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.fetch()> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (JdbcSourceSplitReader.java:131)
-Method <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.finishSplit()> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (JdbcSourceSplitReader.java:157)
-Method <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.getConnection()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcSourceSplitReader.java:0)
-Method <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.getResultSet()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcSourceSplitReader.java:0)
-Method <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.getSplits()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcSourceSplitReader.java:0)
-Method <org.apache.flink.connector.jdbc.source.reader.JdbcSourceSplitReader.getStatement()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcSourceSplitReader.java:0)
-Method <org.apache.flink.connector.jdbc.source.reader.extractor.RowResultExtractor.extract(java.sql.ResultSet)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean)> in (RowResultExtractor.java:33)
-Method <org.apache.flink.connector.jdbc.source.split.JdbcSourceSplitSerializer.deserializeJdbcSourceSplit(java.io.DataInputStream)> calls method <org.apache.flink.util.InstantiationUtil.deserializeObject([B, java.lang.ClassLoader)> in (JdbcSourceSplitSerializer.java:100)
-Method <org.apache.flink.connector.jdbc.source.split.JdbcSourceSplitSerializer.deserializeJdbcSourceSplit(java.io.DataInputStream)> calls method <org.apache.flink.util.InstantiationUtil.deserializeObject([B, java.lang.ClassLoader)> in (JdbcSourceSplitSerializer.java:109)
-Method <org.apache.flink.connector.jdbc.source.split.JdbcSourceSplitSerializer.serialize(org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcSourceSplitSerializer.java:46)
-Method <org.apache.flink.connector.jdbc.source.split.JdbcSourceSplitSerializer.serializeJdbcSourceSplit(java.io.DataOutputStream, org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit)> calls method <org.apache.flink.util.InstantiationUtil.serializeObject(java.lang.Object)> in (JdbcSourceSplitSerializer.java:80)
-Method <org.apache.flink.connector.jdbc.source.split.JdbcSourceSplitSerializer.serializeJdbcSourceSplit(java.io.DataOutputStream, org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit)> calls method <org.apache.flink.util.InstantiationUtil.serializeObject(java.lang.Object)> in (JdbcSourceSplitSerializer.java:87)
-Method <org.apache.flink.connector.jdbc.split.JdbcNumericBetweenParametersProvider.getParameterValues()> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (JdbcNumericBetweenParametersProvider.java:100)
-Method <org.apache.flink.connector.jdbc.split.JdbcNumericBetweenParametersProvider.ofBatchNum(int)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcNumericBetweenParametersProvider.java:87)
-Method <org.apache.flink.connector.jdbc.split.JdbcNumericBetweenParametersProvider.ofBatchSize(long)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcNumericBetweenParametersProvider.java:75)
-Method <org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatementImpl.parseNamedStatement(java.lang.String, java.util.Map)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (FieldNamedPreparedStatementImpl.java:247)
-Method <org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatementImpl.prepareStatement(java.sql.Connection, java.lang.String, [Ljava.lang.String;, java.lang.String, int)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (FieldNamedPreparedStatementImpl.java:202)
-Method <org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatementImpl.prepareStatement(java.sql.Connection, java.lang.String, [Ljava.lang.String;, java.lang.String, int)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (FieldNamedPreparedStatementImpl.java:212)
-Method <org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatementImpl.prepareStatement(java.sql.Connection, java.lang.String, [Ljava.lang.String;, java.lang.String, int)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (FieldNamedPreparedStatementImpl.java:187)
-Method <org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatementImpl.prepareStatement(java.sql.Connection, java.lang.String, [Ljava.lang.String;, java.lang.String, int)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (FieldNamedPreparedStatementImpl.java:188)
-Method <org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatementImpl.prepareStatement(java.sql.Connection, java.lang.String, [Ljava.lang.String;, java.lang.String, int)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (FieldNamedPreparedStatementImpl.java:189)
-Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory.checkAllOrNone(org.apache.flink.configuration.ReadableConfig, [Lorg.apache.flink.configuration.ConfigOption;)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcDynamicTableFactory.java:351)
-Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory.checkAllOrNone(org.apache.flink.configuration.ReadableConfig, [Lorg.apache.flink.configuration.ConfigOption;)> has parameter of type <[Lorg.apache.flink.configuration.ConfigOption;> in (JdbcDynamicTableFactory.java:0)
-Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory.createDynamicTableSource(org.apache.flink.table.factories.DynamicTableFactory$Context)> gets field <org.apache.flink.table.connector.source.lookup.LookupOptions.MAX_RETRIES> in (JdbcDynamicTableFactory.java:127)
-Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory.getLookupCache(org.apache.flink.configuration.ReadableConfig)> calls method <org.apache.flink.table.connector.source.lookup.LookupOptions$LookupCacheType.equals(java.lang.Object)> in (JdbcDynamicTableFactory.java:216)
-Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory.getLookupCache(org.apache.flink.configuration.ReadableConfig)> gets field <org.apache.flink.table.connector.source.lookup.LookupOptions$LookupCacheType.PARTIAL> in (JdbcDynamicTableFactory.java:215)
-Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory.getLookupCache(org.apache.flink.configuration.ReadableConfig)> gets field <org.apache.flink.table.connector.source.lookup.LookupOptions.CACHE_TYPE> in (JdbcDynamicTableFactory.java:214)
-Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory.optionalOptions()> gets field <org.apache.flink.table.connector.source.lookup.LookupOptions.CACHE_TYPE> in (JdbcDynamicTableFactory.java:257)
-Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory.optionalOptions()> gets field <org.apache.flink.table.connector.source.lookup.LookupOptions.MAX_RETRIES> in (JdbcDynamicTableFactory.java:262)
-Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory.optionalOptions()> gets field <org.apache.flink.table.connector.source.lookup.LookupOptions.PARTIAL_CACHE_CACHE_MISSING_KEY> in (JdbcDynamicTableFactory.java:261)
-Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory.optionalOptions()> gets field <org.apache.flink.table.connector.source.lookup.LookupOptions.PARTIAL_CACHE_EXPIRE_AFTER_ACCESS> in (JdbcDynamicTableFactory.java:258)
-Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory.optionalOptions()> gets field <org.apache.flink.table.connector.source.lookup.LookupOptions.PARTIAL_CACHE_EXPIRE_AFTER_WRITE> in (JdbcDynamicTableFactory.java:259)
-Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory.optionalOptions()> gets field <org.apache.flink.table.connector.source.lookup.LookupOptions.PARTIAL_CACHE_MAX_ROWS> in (JdbcDynamicTableFactory.java:260)
-Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableSink.validatePrimaryKey(org.apache.flink.table.connector.ChangelogMode)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (JdbcDynamicTableSink.java:69)
-Method <org.apache.flink.connector.jdbc.table.JdbcDynamicTableSource.getLookupRuntimeProvider(org.apache.flink.table.connector.source.LookupTableSource$LookupContext)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.Object)> in (JdbcDynamicTableSource.java:112)
-Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.build()> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcOutputFormatBuilder.java:81)
-Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.build()> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcOutputFormatBuilder.java:82)
-Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.build()> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object, java.lang.String)> in (JdbcOutputFormatBuilder.java:83)
-Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.createBufferReduceExecutor(org.apache.flink.connector.jdbc.internal.options.JdbcDmlOptions, [Lorg.apache.flink.table.types.logical.LogicalType;)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean)> in (JdbcOutputFormatBuilder.java:116)
-Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.createBufferReduceExecutor(org.apache.flink.connector.jdbc.internal.options.JdbcDmlOptions, [Lorg.apache.flink.table.types.logical.LogicalType;)> has parameter of type <[Lorg.apache.flink.table.types.logical.LogicalType;> in (JdbcOutputFormatBuilder.java:0)
-Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.createDeleteExecutor(org.apache.flink.connector.jdbc.dialect.JdbcDialect, java.lang.String, [Ljava.lang.String;, [Lorg.apache.flink.table.types.logical.LogicalType;)> has parameter of type <[Lorg.apache.flink.table.types.logical.LogicalType;> in (JdbcOutputFormatBuilder.java:0)
-Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.createInsertOrUpdateExecutor(org.apache.flink.connector.jdbc.dialect.JdbcDialect, java.lang.String, [Ljava.lang.String;, [Lorg.apache.flink.table.types.logical.LogicalType;, [I, [Ljava.lang.String;, [Lorg.apache.flink.table.types.logical.LogicalType;)> has parameter of type <[Lorg.apache.flink.table.types.logical.LogicalType;> in (JdbcOutputFormatBuilder.java:0)
-Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.createRowKeyExtractor([Lorg.apache.flink.table.types.logical.LogicalType;, [I)> has parameter of type <[Lorg.apache.flink.table.types.logical.LogicalType;> in (JdbcOutputFormatBuilder.java:0)
-Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.createSimpleBufferedExecutor(org.apache.flink.connector.jdbc.dialect.JdbcDialect, [Ljava.lang.String;, [Lorg.apache.flink.table.types.logical.LogicalType;, java.lang.String)> has parameter of type <[Lorg.apache.flink.table.types.logical.LogicalType;> in (JdbcOutputFormatBuilder.java:0)
-Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.createSimpleRowExecutor(org.apache.flink.connector.jdbc.dialect.JdbcDialect, [Ljava.lang.String;, [Lorg.apache.flink.table.types.logical.LogicalType;, java.lang.String)> has parameter of type <[Lorg.apache.flink.table.types.logical.LogicalType;> in (JdbcOutputFormatBuilder.java:0)
-Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.createUpsertRowExecutor(org.apache.flink.connector.jdbc.dialect.JdbcDialect, java.lang.String, [Ljava.lang.String;, [Lorg.apache.flink.table.types.logical.LogicalType;, [I, [Ljava.lang.String;, [Lorg.apache.flink.table.types.logical.LogicalType;)> has parameter of type <[Lorg.apache.flink.table.types.logical.LogicalType;> in (JdbcOutputFormatBuilder.java:0)
-Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.getPrimaryKey(org.apache.flink.table.data.RowData, [Lorg.apache.flink.table.data.RowData$FieldGetter;)> has parameter of type <[Lorg.apache.flink.table.data.RowData$FieldGetter;> in (JdbcOutputFormatBuilder.java:0)
-Method <org.apache.flink.connector.jdbc.table.JdbcOutputFormatBuilder.setFieldDataTypes([Lorg.apache.flink.table.types.DataType;)> has parameter of type <[Lorg.apache.flink.table.types.DataType;> in (JdbcOutputFormatBuilder.java:0)
-Method <org.apache.flink.connector.jdbc.table.JdbcRowDataInputFormat$Builder.setFetchSize(int)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean, java.lang.String, [Ljava.lang.Object;)> in (JdbcRowDataInputFormat.java:356)
-Method <org.apache.flink.connector.jdbc.table.JdbcRowDataInputFormat.createInputSplits(int)> has return type <[Lorg.apache.flink.core.io.InputSplit;> in (JdbcRowDataInputFormat.java:0)
-Method <org.apache.flink.connector.jdbc.table.JdbcRowDataInputFormat.getInputSplitAssigner([Lorg.apache.flink.core.io.InputSplit;)> calls constructor <org.apache.flink.api.common.io.DefaultInputSplitAssigner.<init>([Lorg.apache.flink.core.io.InputSplit;)> in (JdbcRowDataInputFormat.java:287)
-Method <org.apache.flink.connector.jdbc.table.JdbcRowDataInputFormat.getInputSplitAssigner([Lorg.apache.flink.core.io.InputSplit;)> has parameter of type <[Lorg.apache.flink.core.io.InputSplit;> in (JdbcRowDataInputFormat.java:0)
-Method <org.apache.flink.connector.jdbc.table.JdbcRowDataLookupFunction.getDbConnection()> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (JdbcRowDataLookupFunction.java:0)
-Method <org.apache.flink.connector.jdbc.utils.JdbcUtils.getConnectionProperties(org.apache.flink.configuration.ReadableConfig)> calls method <org.apache.flink.util.Preconditions.checkArgument(boolean)> in (JdbcUtils.java:49)
-Method <org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunction.beginTx(long)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (JdbcXaSinkFunction.java:312)
-Method <org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunction.invoke(java.lang.Object, org.apache.flink.streaming.api.functions.sink.SinkFunction$Context)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (JdbcXaSinkFunction.java:263)
-Method <org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunction.prepareCurrentTx(long)> calls method <org.apache.flink.util.ExceptionUtils.rethrowIOException(java.lang.Throwable)> in (JdbcXaSinkFunction.java:305)
-Method <org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunction.prepareCurrentTx(long)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (JdbcXaSinkFunction.java:290)
-Method <org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunction.prepareCurrentTx(long)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (JdbcXaSinkFunction.java:291)
-Method <org.apache.flink.connector.jdbc.xa.XaFacadeImpl.execute(org.apache.flink.connector.jdbc.xa.XaFacadeImpl$Command)> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (XaFacadeImpl.java:270)
-Method <org.apache.flink.connector.jdbc.xa.XaFacadeImpl.fromXaDataSource(javax.sql.XADataSource)> is annotated with <org.apache.flink.annotation.VisibleForTesting> in (XaFacadeImpl.java:0)
-Method <org.apache.flink.connector.jdbc.xa.XaFacadeImpl.getConnection()> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (XaFacadeImpl.java:137)
-Method <org.apache.flink.connector.jdbc.xa.XaFacadeImpl.open()> calls method <org.apache.flink.util.Preconditions.checkState(boolean)> in (XaFacadeImpl.java:110)
-Method <org.apache.flink.connector.jdbc.xa.XaFacadeImpl.open()> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (XaFacadeImpl.java:96)
-Method <org.apache.flink.connector.jdbc.xa.XaFacadeImpl.recover()> calls method <org.apache.flink.util.Preconditions.checkState(boolean, java.lang.Object)> in (XaFacadeImpl.java:250)
-Method <org.apache.flink.connector.jdbc.xa.XaFacadePoolingImpl.endAndPrepare(javax.transaction.xa.Xid)> calls method <org.apache.flink.util.Preconditions.checkState(boolean)> in (XaFacadePoolingImpl.java:95)
-Method <org.apache.flink.connector.jdbc.xa.XaFacadePoolingImpl.open()> calls method <org.apache.flink.util.Preconditions.checkState(boolean)> in (XaFacadePoolingImpl.java:65)
-Method <org.apache.flink.connector.jdbc.xa.XaFacadePoolingImpl.peekPooled()> calls method <org.apache.flink.util.ExceptionUtils.rethrow(java.lang.Throwable)> in (XaFacadePoolingImpl.java:187)
-Method <org.apache.flink.connector.jdbc.xa.XaFacadePoolingImpl.start(javax.transaction.xa.Xid)> calls method <org.apache.flink.util.Preconditions.checkState(boolean)> in (XaFacadePoolingImpl.java:77)
\ No newline at end of file
diff --git a/flink-connector-jdbc-core/archunit-violations/stored.rules b/flink-connector-jdbc-core/archunit-violations/stored.rules
index 1b7a0e39..0f9bf9b4 100644
--- a/flink-connector-jdbc-core/archunit-violations/stored.rules
+++ b/flink-connector-jdbc-core/archunit-violations/stored.rules
@@ -1,11 +1,10 @@
#
-#Sat May 18 04:39:49 CEST 2024
-Classes\ in\ API\ packages\ should\ have\ at\ least\ one\ API\ visibility\ annotation.=0c7b60d6-a12c-432d-8a72-747cabaeb7ed
-Connector\ production\ code\ must\ depend\ only\ on\ public\ API\ when\ outside\ of\ connector\ packages=2047daea-3713-4298-bdb3-e269f539363f
+#Tue May 28 16:21:17 CEST 2024
+Return\ and\ argument\ types\ of\ methods\ annotated\ with\ @Public\ must\ be\ annotated\ with\ @Public.=596bd7eb-1ed5-4963-a56a-941766d61233
Connector\ production\ code\ must\ not\ depend\ on\ non-public\ API\ outside\ of\ connector\ packages=f242ee43-a122-4d2f-a291-6439cdb9029f
ITCASE\ tests\ should\ use\ a\ MiniCluster\ resource\ or\ extension=6b9ab1b0-c14d-4667-bab5-407b81fba98b
-Options\ for\ connectors\ and\ formats\ should\ reside\ in\ a\ consistent\ package\ and\ be\ public\ API.=b10c194a-0517-4744-830f-81abfb71ab18
Production\ code\ must\ not\ call\ methods\ annotated\ with\ @VisibleForTesting=4bca2274-65a9-4a61-81ef-767d58233ea0
-Return\ and\ argument\ types\ of\ methods\ annotated\ with\ @Public\ must\ be\ annotated\ with\ @Public.=596bd7eb-1ed5-4963-a56a-941766d61233
-Return\ and\ argument\ types\ of\ methods\ annotated\ with\ @PublicEvolving\ must\ be\ annotated\ with\ @Public(Evolving).=d45c3af5-52c6-45fd-9926-75e75e77473a
+Options\ for\ connectors\ and\ formats\ should\ reside\ in\ a\ consistent\ package\ and\ be\ public\ API.=b10c194a-0517-4744-830f-81abfb71ab18
Tests\ inheriting\ from\ AbstractTestBase\ should\ have\ name\ ending\ with\ ITCase=0f94f11b-9bc8-445a-8be8-e7dfd8a384b0
+Return\ and\ argument\ types\ of\ methods\ annotated\ with\ @PublicEvolving\ must\ be\ annotated\ with\ @Public(Evolving).=d45c3af5-52c6-45fd-9926-75e75e77473a
+Classes\ in\ API\ packages\ should\ have\ at\ least\ one\ API\ visibility\ annotation.=0c7b60d6-a12c-432d-8a72-747cabaeb7ed
diff --git a/flink-connector-jdbc-core/pom.xml b/flink-connector-jdbc-core/pom.xml
index 990582d8..c7e767df 100644
--- a/flink-connector-jdbc-core/pom.xml
+++ b/flink-connector-jdbc-core/pom.xml
@@ -35,9 +35,7 @@ under the License.
<packaging>jar</packaging>
<properties>
- <scala.binary.version>2.12</scala.binary.version>
- <scala-library.version>2.12.7</scala-library.version>
- <assertj.version>3.23.1</assertj.version>
+
<postgres.version>42.7.3</postgres.version>
<oracle.version>21.8.0.0</oracle.version>
<trino.version>418</trino.version>
@@ -284,17 +282,6 @@ under the License.
</dependencies>
- <dependencyManagement>
- <dependencies>
- <!-- For dependency convergence -->
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>${scala-library.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<build>
<plugins>
<plugin>
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcFactory.java
index 448ecaa5..250c6d65 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcFactory.java
@@ -19,6 +19,7 @@
package org.apache.flink.connector.jdbc.core.table;
import org.apache.flink.annotation.PublicEvolving;
+import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
import org.apache.flink.util.StringUtils;
@@ -63,11 +64,26 @@ public interface JdbcFactory {
"Not supported option 'compatible-mode' with value: " + compatibleMode);
}
- // JdbcCatalog createCatalog(
- // ClassLoader classLoader,
- // String catalogName,
- // String defaultDatabase,
- // String username,
- // String pwd,
- // String baseUrl);
+ JdbcCatalog createCatalog(
+ ClassLoader classLoader,
+ String catalogName,
+ String defaultDatabase,
+ String username,
+ String pwd,
+ String baseUrl);
+
+ default JdbcCatalog createCatalog(
+ ClassLoader classLoader,
+ String catalogName,
+ String defaultDatabase,
+ String username,
+ String pwd,
+ String baseUrl,
+ String compatibleMode) {
+ if (StringUtils.isNullOrWhitespaceOnly(compatibleMode)) {
+ return createCatalog(classLoader, catalogName, defaultDatabase, username, pwd, baseUrl);
+ }
+ throw new UnsupportedOperationException(
+ "Not supported option 'compatible-mode' with value: " + compatibleMode);
+ }
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcFactoryLoader.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcFactoryLoader.java
index 3549b76d..a9db62cc 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcFactoryLoader.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcFactoryLoader.java
@@ -19,6 +19,7 @@
package org.apache.flink.connector.jdbc.core.table;
import org.apache.flink.annotation.Internal;
+import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
import org.slf4j.Logger;
@@ -57,37 +58,34 @@ public final class JdbcFactoryLoader {
return load(url, classLoader).createDialect(compatibleMode);
}
- // public static JdbcCatalog loadCatalog(
- // ClassLoader classLoader,
- // String catalogName,
- // String defaultDatabase,
- // String username,
- // String pwd,
- // String baseUrl) {
- // return load(baseUrl, classLoader)
- // .createCatalog(
- // classLoader, catalogName, defaultDatabase, username, pwd, baseUrl,
- // null);
- // }
- //
- // public static JdbcCatalog loadCatalog(
- // ClassLoader classLoader,
- // String catalogName,
- // String defaultDatabase,
- // String username,
- // String pwd,
- // String baseUrl,
- // String compatibleMode) {
- // return load(baseUrl, classLoader)
- // .createCatalog(
- // classLoader,
- // catalogName,
- // defaultDatabase,
- // username,
- // pwd,
- // baseUrl,
- // compatibleMode);
- // }
+ public static JdbcCatalog loadCatalog(
+ ClassLoader classLoader,
+ String catalogName,
+ String defaultDatabase,
+ String username,
+ String pwd,
+ String baseUrl) {
+ return loadCatalog(classLoader, catalogName, defaultDatabase, username, pwd, baseUrl, null);
+ }
+
+ public static JdbcCatalog loadCatalog(
+ ClassLoader classLoader,
+ String catalogName,
+ String defaultDatabase,
+ String username,
+ String pwd,
+ String baseUrl,
+ String compatibleMode) {
+ return load(baseUrl, classLoader)
+ .createCatalog(
+ classLoader,
+ catalogName,
+ defaultDatabase,
+ username,
+ pwd,
+ baseUrl,
+ compatibleMode);
+ }
private static JdbcFactory load(String url, ClassLoader classLoader) {
List<JdbcFactory> foundFactories = discoverFactories(classLoader);
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/AbstractJdbcCatalog.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/AbstractJdbcCatalog.java
similarity index 95%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/AbstractJdbcCatalog.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/AbstractJdbcCatalog.java
index a0521484..a3c27c47 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/AbstractJdbcCatalog.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/AbstractJdbcCatalog.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.catalog;
+package org.apache.flink.connector.jdbc.core.table.catalog;
import org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory;
import org.apache.flink.table.api.Schema;
@@ -87,7 +87,7 @@ import static org.apache.flink.util.Preconditions.checkArgument;
import static org.apache.flink.util.Preconditions.checkNotNull;
/** Abstract catalog for any JDBC catalogs. */
-public abstract class AbstractJdbcCatalog extends AbstractCatalog {
+public abstract class AbstractJdbcCatalog extends AbstractCatalog implements JdbcCatalog {
private static final Logger LOG = LoggerFactory.getLogger(AbstractJdbcCatalog.class);
@@ -123,7 +123,7 @@ public abstract class AbstractJdbcCatalog extends AbstractCatalog {
checkNotNull(userClassLoader);
checkArgument(!StringUtils.isNullOrWhitespaceOnly(baseUrl));
- JdbcCatalogUtils.validateJdbcUrl(baseUrl);
+ validateJdbcUrl(baseUrl);
this.userClassLoader = userClassLoader;
this.baseUrl = baseUrl.endsWith("/") ? baseUrl : baseUrl + "/";
@@ -565,4 +565,35 @@ public abstract class AbstractJdbcCatalog extends AbstractCatalog {
protected String getSchemaTableName(ObjectPath tablePath) {
throw new UnsupportedOperationException();
}
+
+ /**
+ * URL has to be without database, like "jdbc:dialect://localhost:1234/" or
+ * "jdbc:dialect://localhost:1234" rather than "jdbc:dialect://localhost:1234/db".
+ */
+ protected static void validateJdbcUrl(String url) {
+ String[] parts = url.trim().split("\\/+");
+
+ checkArgument(parts.length == 2);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof AbstractJdbcCatalog)) {
+ return false;
+ }
+ AbstractJdbcCatalog that = (AbstractJdbcCatalog) o;
+ return Objects.equals(getName(), that.getName())
+ && Objects.equals(getDefaultDatabase(), that.getDefaultDatabase())
+ && Objects.equals(connectionProperties, that.connectionProperties)
+ && Objects.equals(baseUrl, that.baseUrl);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(
+ getName(), getDefaultDatabase(), userClassLoader, connectionProperties, baseUrl);
+ }
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/JdbcCatalog.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/JdbcCatalog.java
new file mode 100644
index 00000000..5c70deee
--- /dev/null
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/JdbcCatalog.java
@@ -0,0 +1,10 @@
+package org.apache.flink.connector.jdbc.core.table.catalog;
+
+import org.apache.flink.annotation.PublicEvolving;
+import org.apache.flink.table.catalog.Catalog;
+
+import java.io.Serializable;
+
+/** Catalogs for relational databases via JDBC. */
+@PublicEvolving
+public interface JdbcCatalog extends Catalog, Serializable {}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/JdbcCatalogTypeMapper.java
similarity index 87%
copy from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java
copy to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/JdbcCatalogTypeMapper.java
index 11fc46ef..fa3e4cf4 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/JdbcCatalogTypeMapper.java
@@ -16,8 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.dialect;
+package org.apache.flink.connector.jdbc.core.table.catalog;
+import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.table.catalog.ObjectPath;
import org.apache.flink.table.types.DataType;
@@ -25,7 +26,8 @@ import java.sql.ResultSetMetaData;
import java.sql.SQLException;
/** Separate the jdbc meta-information type to flink table type into the interface. */
-public interface JdbcDialectTypeMapper {
+@PublicEvolving
+public interface JdbcCatalogTypeMapper {
DataType mapping(ObjectPath tablePath, ResultSetMetaData metadata, int colIndex)
throws SQLException;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/factory/JdbcCatalogFactory.java
similarity index 65%
copy from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactory.java
copy to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/factory/JdbcCatalogFactory.java
index a19e0bae..b1fd7ca5 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/factory/JdbcCatalogFactory.java
@@ -16,10 +16,11 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.catalog.factory;
+package org.apache.flink.connector.jdbc.core.table.catalog.factory;
import org.apache.flink.configuration.ConfigOption;
-import org.apache.flink.connector.jdbc.catalog.JdbcCatalog;
+import org.apache.flink.connector.jdbc.core.table.JdbcFactoryLoader;
+import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
import org.apache.flink.table.catalog.Catalog;
import org.apache.flink.table.factories.CatalogFactory;
import org.apache.flink.table.factories.FactoryUtil;
@@ -30,12 +31,11 @@ import org.slf4j.LoggerFactory;
import java.util.HashSet;
import java.util.Set;
-import static org.apache.flink.connector.jdbc.catalog.factory.JdbcCatalogFactoryOptions.BASE_URL;
-import static org.apache.flink.connector.jdbc.catalog.factory.JdbcCatalogFactoryOptions.COMPATIBLE_MODE;
-import static org.apache.flink.connector.jdbc.catalog.factory.JdbcCatalogFactoryOptions.DEFAULT_DATABASE;
-import static org.apache.flink.connector.jdbc.catalog.factory.JdbcCatalogFactoryOptions.PASSWORD;
-import static org.apache.flink.connector.jdbc.catalog.factory.JdbcCatalogFactoryOptions.USERNAME;
-import static org.apache.flink.connector.jdbc.utils.JdbcUtils.getConnectionProperties;
+import static org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions.BASE_URL;
+import static org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions.COMPATIBLE_MODE;
+import static org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions.DEFAULT_DATABASE;
+import static org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions.PASSWORD;
+import static org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions.USERNAME;
import static org.apache.flink.table.factories.FactoryUtil.PROPERTY_VERSION;
/** Factory for {@link JdbcCatalog}. */
@@ -72,12 +72,13 @@ public class JdbcCatalogFactory implements CatalogFactory {
FactoryUtil.createCatalogFactoryHelper(this, context);
helper.validate();
- return new JdbcCatalog(
+ return JdbcFactoryLoader.loadCatalog(
context.getClassLoader(),
context.getName(),
- helper.getOptions().get(DEFAULT_DATABASE),
- helper.getOptions().get(BASE_URL),
- helper.getOptions().get(COMPATIBLE_MODE),
- getConnectionProperties(helper.getOptions()));
+ helper.getOptions().get(JdbcCatalogFactoryOptions.DEFAULT_DATABASE),
+ helper.getOptions().get(JdbcCatalogFactoryOptions.USERNAME),
+ helper.getOptions().get(JdbcCatalogFactoryOptions.PASSWORD),
+ helper.getOptions().get(JdbcCatalogFactoryOptions.BASE_URL),
+ helper.getOptions().get(JdbcCatalogFactoryOptions.COMPATIBLE_MODE));
}
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactoryOptions.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/factory/JdbcCatalogFactoryOptions.java
similarity index 93%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactoryOptions.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/factory/JdbcCatalogFactoryOptions.java
index 197f6b9f..b13f5c68 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactoryOptions.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/catalog/factory/JdbcCatalogFactoryOptions.java
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.catalog.factory;
+package org.apache.flink.connector.jdbc.core.table.catalog.factory;
import org.apache.flink.annotation.Internal;
import org.apache.flink.configuration.ConfigOption;
import org.apache.flink.configuration.ConfigOptions;
-import org.apache.flink.connector.jdbc.catalog.JdbcCatalog;
+import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
import org.apache.flink.connector.jdbc.table.JdbcConnectorOptions;
import org.apache.flink.table.catalog.CommonCatalogOptions;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBFactory.java
index fcf31b24..94179408 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBFactory.java
@@ -20,7 +20,9 @@ package org.apache.flink.connector.jdbc.databases.cratedb.dialect;
import org.apache.flink.annotation.Internal;
import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.databases.cratedb.catalog.CrateDBCatalog;
/** Factory for {@link CrateDBDialect}. */
@Internal
@@ -34,4 +36,16 @@ public class CrateDBFactory implements JdbcFactory {
public JdbcDialect createDialect() {
return new CrateDBDialect();
}
+
+ @Override
+ public JdbcCatalog createCatalog(
+ ClassLoader classLoader,
+ String catalogName,
+ String defaultDatabase,
+ String username,
+ String pwd,
+ String baseUrl) {
+ return new CrateDBCatalog(
+ classLoader, catalogName, defaultDatabase, username, pwd, baseUrl);
+ }
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Factory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Factory.java
index 268a20c2..4b0165cc 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Factory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2Factory.java
@@ -20,6 +20,7 @@ package org.apache.flink.connector.jdbc.databases.db2.dialect;
import org.apache.flink.annotation.Internal;
import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
/** Factory for {@link Db2Dialect}. */
@@ -34,4 +35,15 @@ public class Db2Factory implements JdbcFactory {
public JdbcDialect createDialect() {
return new Db2Dialect();
}
+
+ @Override
+ public JdbcCatalog createCatalog(
+ ClassLoader classLoader,
+ String catalogName,
+ String defaultDatabase,
+ String username,
+ String pwd,
+ String baseUrl) {
+ throw new UnsupportedOperationException("Catalog for DB2 is not supported yet.");
+ }
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyFactory.java
index 639d8695..7df224fc 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/derby/dialect/DerbyFactory.java
@@ -20,6 +20,7 @@ package org.apache.flink.connector.jdbc.databases.derby.dialect;
import org.apache.flink.annotation.Internal;
import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
/** Factory for {@link DerbyDialect}. */
@@ -34,4 +35,15 @@ public class DerbyFactory implements JdbcFactory {
public JdbcDialect createDialect() {
return new DerbyDialect();
}
+
+ @Override
+ public JdbcCatalog createCatalog(
+ ClassLoader classLoader,
+ String catalogName,
+ String defaultDatabase,
+ String username,
+ String pwd,
+ String baseUrl) {
+ throw new UnsupportedOperationException("Catalog for Derby is not supported yet.");
+ }
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalog.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalog.java
index a511e77c..982b92e9 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalog.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlCatalog.java
@@ -20,8 +20,8 @@ package org.apache.flink.connector.jdbc.databases.mysql.catalog;
import org.apache.flink.annotation.Internal;
import org.apache.flink.annotation.VisibleForTesting;
-import org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectTypeMapper;
+import org.apache.flink.connector.jdbc.core.table.catalog.AbstractJdbcCatalog;
+import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalogTypeMapper;
import org.apache.flink.table.catalog.ObjectPath;
import org.apache.flink.table.catalog.exceptions.CatalogException;
import org.apache.flink.table.catalog.exceptions.DatabaseNotExistException;
@@ -52,7 +52,7 @@ public class MySqlCatalog extends AbstractJdbcCatalog {
private static final Logger LOG = LoggerFactory.getLogger(MySqlCatalog.class);
- private final JdbcDialectTypeMapper dialectTypeMapper;
+ private final JdbcCatalogTypeMapper dialectTypeMapper;
private static final Set<String> builtinDatabases =
new HashSet<String>() {
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlTypeMapper.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlTypeMapper.java
index 235136dd..f3ca932d 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlTypeMapper.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/catalog/MySqlTypeMapper.java
@@ -19,7 +19,7 @@
package org.apache.flink.connector.jdbc.databases.mysql.catalog;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectTypeMapper;
+import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalogTypeMapper;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.table.catalog.ObjectPath;
import org.apache.flink.table.catalog.exceptions.CatalogException;
@@ -34,7 +34,7 @@ import java.sql.SQLException;
/** MySQLTypeMapper util class. */
@Internal
-public class MySqlTypeMapper implements JdbcDialectTypeMapper {
+public class MySqlTypeMapper implements JdbcCatalogTypeMapper {
private static final Logger LOG = LoggerFactory.getLogger(MySqlTypeMapper.class);
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlFactory.java
index a3544a01..87051f23 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlFactory.java
@@ -20,7 +20,9 @@ package org.apache.flink.connector.jdbc.databases.mysql.dialect;
import org.apache.flink.annotation.Internal;
import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.databases.mysql.catalog.MySqlCatalog;
/** Factory for {@link MySqlDialect}. */
@Internal
@@ -34,4 +36,15 @@ public class MySqlFactory implements JdbcFactory {
public JdbcDialect createDialect() {
return new MySqlDialect();
}
+
+ @Override
+ public JdbcCatalog createCatalog(
+ ClassLoader classLoader,
+ String catalogName,
+ String defaultDatabase,
+ String username,
+ String pwd,
+ String baseUrl) {
+ return new MySqlCatalog(classLoader, catalogName, defaultDatabase, username, pwd, baseUrl);
+ }
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseFactory.java
index 1455e310..2f30aa3c 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseFactory.java
@@ -20,6 +20,7 @@ package org.apache.flink.connector.jdbc.databases.oceanbase.dialect;
import org.apache.flink.annotation.Internal;
import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
import javax.annotation.Nonnull;
@@ -43,4 +44,15 @@ public class OceanBaseFactory implements JdbcFactory {
public JdbcDialect createDialect(@Nonnull String compatibleMode) {
return new OceanBaseDialect(compatibleMode);
}
+
+ @Override
+ public JdbcCatalog createCatalog(
+ ClassLoader classLoader,
+ String catalogName,
+ String defaultDatabase,
+ String username,
+ String pwd,
+ String baseUrl) {
+ throw new UnsupportedOperationException("Catalog for OceanBase is not supported yet.");
+ }
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleFactory.java
index 78f124b1..fa63b9dc 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleFactory.java
@@ -20,6 +20,7 @@ package org.apache.flink.connector.jdbc.databases.oracle.dialect;
import org.apache.flink.annotation.Internal;
import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
/** Factory for {@link OracleDialect}. */
@@ -34,4 +35,15 @@ public class OracleFactory implements JdbcFactory {
public JdbcDialect createDialect() {
return new OracleDialect();
}
+
+ @Override
+ public JdbcCatalog createCatalog(
+ ClassLoader classLoader,
+ String catalogName,
+ String defaultDatabase,
+ String username,
+ String pwd,
+ String baseUrl) {
+ throw new UnsupportedOperationException("Catalog for Oracle is not supported yet.");
+ }
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalog.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalog.java
index 27aa1f4d..301691b7 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalog.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresCatalog.java
@@ -20,8 +20,8 @@ package org.apache.flink.connector.jdbc.databases.postgres.catalog;
import org.apache.flink.annotation.Internal;
import org.apache.flink.annotation.VisibleForTesting;
-import org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectTypeMapper;
+import org.apache.flink.connector.jdbc.core.table.catalog.AbstractJdbcCatalog;
+import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalogTypeMapper;
import org.apache.flink.table.catalog.ObjectPath;
import org.apache.flink.table.catalog.exceptions.CatalogException;
import org.apache.flink.table.catalog.exceptions.DatabaseNotExistException;
@@ -74,7 +74,7 @@ public class PostgresCatalog extends AbstractJdbcCatalog {
}
};
- protected final JdbcDialectTypeMapper dialectTypeMapper;
+ protected final JdbcCatalogTypeMapper dialectTypeMapper;
@VisibleForTesting
public PostgresCatalog(
@@ -115,7 +115,7 @@ public class PostgresCatalog extends AbstractJdbcCatalog {
String username,
String pwd,
String baseUrl,
- JdbcDialectTypeMapper dialectTypeMapper) {
+ JdbcCatalogTypeMapper dialectTypeMapper) {
this(
userClassLoader,
catalogName,
@@ -130,7 +130,7 @@ public class PostgresCatalog extends AbstractJdbcCatalog {
String catalogName,
String defaultDatabase,
String baseUrl,
- JdbcDialectTypeMapper dialectTypeMapper,
+ JdbcCatalogTypeMapper dialectTypeMapper,
Properties connectProperties) {
super(userClassLoader, catalogName, defaultDatabase, baseUrl, connectProperties);
this.dialectTypeMapper = dialectTypeMapper;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTypeMapper.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTypeMapper.java
index f213128a..c6b92605 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTypeMapper.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/PostgresTypeMapper.java
@@ -19,7 +19,7 @@
package org.apache.flink.connector.jdbc.databases.postgres.catalog;
import org.apache.flink.annotation.Internal;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectTypeMapper;
+import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalogTypeMapper;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.table.catalog.ObjectPath;
import org.apache.flink.table.types.DataType;
@@ -33,7 +33,7 @@ import java.sql.SQLException;
/** PostgresTypeMapper util class. */
@Internal
-public class PostgresTypeMapper implements JdbcDialectTypeMapper {
+public class PostgresTypeMapper implements JdbcCatalogTypeMapper {
private static final Logger LOG = LoggerFactory.getLogger(PostgresTypeMapper.class);
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresFactory.java
index 5fe6df8f..5c5310ed 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresFactory.java
@@ -20,7 +20,9 @@ package org.apache.flink.connector.jdbc.databases.postgres.dialect;
import org.apache.flink.annotation.Internal;
import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.databases.postgres.catalog.PostgresCatalog;
/** Factory for {@link PostgresDialect}. */
@Internal
@@ -34,4 +36,16 @@ public class PostgresFactory implements JdbcFactory {
public JdbcDialect createDialect() {
return new PostgresDialect();
}
+
+ @Override
+ public JdbcCatalog createCatalog(
+ ClassLoader classLoader,
+ String catalogName,
+ String defaultDatabase,
+ String username,
+ String pwd,
+ String baseUrl) {
+ return new PostgresCatalog(
+ classLoader, catalogName, defaultDatabase, username, pwd, baseUrl);
+ }
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerFactory.java
index 695cca72..43d66827 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/sqlserver/dialect/SqlServerFactory.java
@@ -20,6 +20,7 @@ package org.apache.flink.connector.jdbc.databases.sqlserver.dialect;
import org.apache.flink.annotation.Internal;
import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
/** Factory for {@link SqlServerDialect}. */
@@ -34,4 +35,15 @@ public class SqlServerFactory implements JdbcFactory {
public JdbcDialect createDialect() {
return new SqlServerDialect();
}
+
+ @Override
+ public JdbcCatalog createCatalog(
+ ClassLoader classLoader,
+ String catalogName,
+ String defaultDatabase,
+ String username,
+ String pwd,
+ String baseUrl) {
+ throw new UnsupportedOperationException("Catalog for SqlServer is not supported yet.");
+ }
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoFactory.java
index 9283b8b4..d6ef4da8 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoFactory.java
@@ -20,6 +20,7 @@ package org.apache.flink.connector.jdbc.databases.trino.dialect;
import org.apache.flink.annotation.Internal;
import org.apache.flink.connector.jdbc.core.table.JdbcFactory;
+import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialect;
/** Factory for {@link TrinoDialect}. */
@@ -34,4 +35,15 @@ public class TrinoFactory implements JdbcFactory {
public JdbcDialect createDialect() {
return new TrinoDialect();
}
+
+ @Override
+ public JdbcCatalog createCatalog(
+ ClassLoader classLoader,
+ String catalogName,
+ String defaultDatabase,
+ String username,
+ String pwd,
+ String baseUrl) {
+ throw new UnsupportedOperationException("Catalog for Trino is not supported yet.");
+ }
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/utils/JdbcUtils.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/utils/JdbcUtils.java
index d86c7319..bf405a20 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/utils/JdbcUtils.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/utils/JdbcUtils.java
@@ -33,8 +33,8 @@ import java.util.Objects;
import java.util.Properties;
import static org.apache.flink.connector.jdbc.JdbcConnectionOptions.getBriefAuthProperties;
-import static org.apache.flink.connector.jdbc.catalog.factory.JdbcCatalogFactoryOptions.PASSWORD;
-import static org.apache.flink.connector.jdbc.catalog.factory.JdbcCatalogFactoryOptions.USERNAME;
+import static org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions.PASSWORD;
+import static org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions.USERNAME;
/** Utils for jdbc connectors. */
public class JdbcUtils {
diff --git a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
index a54d9f57..41de0904 100644
--- a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
+++ b/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
@@ -14,4 +14,4 @@
# limitations under the License.
org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory
-org.apache.flink.connector.jdbc.catalog.factory.JdbcCatalogFactory
+org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactory
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtilsTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/catalog/AbstractJdbcCatalogTest.java
similarity index 71%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtilsTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/catalog/AbstractJdbcCatalogTest.java
index 23407143..cde094a0 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtilsTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/catalog/AbstractJdbcCatalogTest.java
@@ -16,28 +16,27 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.catalog;
+package org.apache.flink.connector.jdbc.core.table.catalog;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-/** Test for {@link JdbcCatalogUtils}. */
-class JdbcCatalogUtilsTest {
+/** Test for {@link AbstractJdbcCatalog}. */
+class AbstractJdbcCatalogTest {
@Test
void testJdbcUrl() {
- JdbcCatalogUtils.validateJdbcUrl("jdbc:postgresql://localhost:5432/");
-
- JdbcCatalogUtils.validateJdbcUrl("jdbc:postgresql://localhost:5432");
+ AbstractJdbcCatalog.validateJdbcUrl("jdbc:dialect://localhost:1234/");
+ AbstractJdbcCatalog.validateJdbcUrl("jdbc:dialect://localhost:1234");
}
@Test
void testInvalidJdbcUrl() {
assertThatThrownBy(
() ->
- JdbcCatalogUtils.validateJdbcUrl(
- "jdbc:postgresql://localhost:5432/db"))
+ AbstractJdbcCatalog.validateJdbcUrl(
+ "jdbc:dialect://localhost:1234/db"))
.isInstanceOf(IllegalArgumentException.class);
}
}
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/converter/AbstractDialectConverterTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/dialect/JdbcDialectConverterTest.java
similarity index 89%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/converter/AbstractDialectConverterTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/dialect/JdbcDialectConverterTest.java
index bfb77392..d39bf355 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/converter/AbstractDialectConverterTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/dialect/JdbcDialectConverterTest.java
@@ -16,10 +16,8 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.converter;
+package org.apache.flink.connector.jdbc.core.table.dialect;
-import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialectConverter;
-import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectConverter;
import org.apache.flink.table.data.RowData;
import org.apache.flink.table.types.logical.IntType;
import org.apache.flink.table.types.logical.RowType;
@@ -34,7 +32,7 @@ import java.time.LocalDateTime;
import static org.assertj.core.api.Assertions.assertThat;
/** Test for {@link AbstractDialectConverter}. */
-class AbstractDialectConverterTest {
+class JdbcDialectConverterTest {
@Test
void testExternalLocalDateTimeToTimestamp() throws Exception {
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/dialect/JdbcDialectTest.java
similarity index 98%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/dialect/JdbcDialectTest.java
index d73c61e4..99ad42ff 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/dialect/JdbcDialectTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.dialect;
+package org.apache.flink.connector.jdbc.core.table.dialect;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
@@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
/** Tests for all DataTypes and Dialects of JDBC connector. */
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public class JdbcDialectTypeTest {
+public class JdbcDialectTest {
protected String ddlFormat =
"CREATE TABLE T (f0 %s)"
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectTypeTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectTest.java
similarity index 92%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectTypeTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectTest.java
index 9e90e336..65922f52 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectTypeTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/cratedb/dialect/CrateDBDialectTest.java
@@ -18,13 +18,13 @@
package org.apache.flink.connector.jdbc.databases.cratedb.dialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectTypeTest;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectTest;
import java.util.Arrays;
import java.util.List;
-/** The CrateDB params for {@link JdbcDialectTypeTest}. */
-class CrateDBDialectTypeTest extends JdbcDialectTypeTest {
+/** The CrateDB params for {@link JdbcDialectTest}. */
+class CrateDBDialectTest extends JdbcDialectTest {
@Override
protected String testDialect() {
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectTypeTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectTest.java
similarity index 91%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectTypeTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectTest.java
index 31e364a2..04fbe3c9 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectTypeTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/db2/dialect/Db2DialectTest.java
@@ -18,13 +18,13 @@
package org.apache.flink.connector.jdbc.databases.db2.dialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectTypeTest;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectTest;
import java.util.Arrays;
import java.util.List;
-/** The Db2 params for {@link JdbcDialectTypeTest}. */
-class Db2DialectTypeTest extends JdbcDialectTypeTest {
+/** The Db2 params for {@link JdbcDialectTest}. */
+class Db2DialectTest extends JdbcDialectTest {
@Override
protected String testDialect() {
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectTest.java
index a91d9b41..5491d398 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectTest.java
@@ -18,12 +18,54 @@
package org.apache.flink.connector.jdbc.databases.mysql.dialect;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectTest;
+
import org.junit.jupiter.api.Test;
+import java.util.Arrays;
+import java.util.List;
+
import static org.assertj.core.api.Assertions.assertThat;
-/** Tests for {@link MySqlDialect}. */
-class MySqlDialectTest {
+/** The MySql params for {@link JdbcDialectTest}. */
+class MySqlDialectTest extends JdbcDialectTest {
+
+ @Override
+ protected String testDialect() {
+ return "mysql";
+ }
+
+ @Override
+ protected List<TestItem> testData() {
+ return Arrays.asList(
+ createTestItem("CHAR"),
+ createTestItem("VARCHAR"),
+ createTestItem("BOOLEAN"),
+ createTestItem("TINYINT"),
+ createTestItem("SMALLINT"),
+ createTestItem("INTEGER"),
+ createTestItem("BIGINT"),
+ createTestItem("FLOAT"),
+ createTestItem("DOUBLE"),
+ createTestItem("DECIMAL(10, 4)"),
+ createTestItem("DECIMAL(38, 18)"),
+ createTestItem("DATE"),
+ createTestItem("TIME"),
+ createTestItem("TIMESTAMP(3)"),
+ createTestItem("TIMESTAMP WITHOUT TIME ZONE"),
+ createTestItem("VARBINARY"),
+
+ // Not valid data
+ createTestItem("BINARY", "The MySQL dialect doesn't support type: BINARY(1)."),
+ createTestItem(
+ "VARBINARY(10)", "The MySQL dialect doesn't support type: VARBINARY(10)."),
+ createTestItem(
+ "TIMESTAMP(9) WITHOUT TIME ZONE",
+ "The precision of field 'f0' is out of the TIMESTAMP precision range [0, 6] supported by MySQL dialect."),
+ createTestItem(
+ "TIMESTAMP_LTZ(3)",
+ "The MySQL dialect doesn't support type: TIMESTAMP_LTZ(3)."));
+ }
@Test
void testAppendDefaultUrlProperties() {
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectTypeTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectTypeTest.java
deleted file mode 100644
index dac699cb..00000000
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/dialect/MySqlDialectTypeTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.connector.jdbc.databases.mysql.dialect;
-
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectTypeTest;
-
-import java.util.Arrays;
-import java.util.List;
-
-/** The MySql params for {@link JdbcDialectTypeTest}. */
-class MySqlDialectTypeTest extends JdbcDialectTypeTest {
-
- @Override
- protected String testDialect() {
- return "mysql";
- }
-
- @Override
- protected List<TestItem> testData() {
- return Arrays.asList(
- createTestItem("CHAR"),
- createTestItem("VARCHAR"),
- createTestItem("BOOLEAN"),
- createTestItem("TINYINT"),
- createTestItem("SMALLINT"),
- createTestItem("INTEGER"),
- createTestItem("BIGINT"),
- createTestItem("FLOAT"),
- createTestItem("DOUBLE"),
- createTestItem("DECIMAL(10, 4)"),
- createTestItem("DECIMAL(38, 18)"),
- createTestItem("DATE"),
- createTestItem("TIME"),
- createTestItem("TIMESTAMP(3)"),
- createTestItem("TIMESTAMP WITHOUT TIME ZONE"),
- createTestItem("VARBINARY"),
-
- // Not valid data
- createTestItem("BINARY", "The MySQL dialect doesn't support type: BINARY(1)."),
- createTestItem(
- "VARBINARY(10)", "The MySQL dialect doesn't support type: VARBINARY(10)."),
- createTestItem(
- "TIMESTAMP(9) WITHOUT TIME ZONE",
- "The precision of field 'f0' is out of the TIMESTAMP precision range [0, 6] supported by MySQL dialect."),
- createTestItem(
- "TIMESTAMP_LTZ(3)",
- "The MySQL dialect doesn't support type: TIMESTAMP_LTZ(3)."));
- }
-}
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseMysqlDialectTypeTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseMysqlDialectTest.java
similarity index 91%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseMysqlDialectTypeTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseMysqlDialectTest.java
index 09daadaf..7b74b3a7 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseMysqlDialectTypeTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseMysqlDialectTest.java
@@ -18,15 +18,15 @@
package org.apache.flink.connector.jdbc.databases.oceanbase.dialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectTypeTest;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectTest;
import java.util.Arrays;
import java.util.List;
-/** The OceanBase MySql mode params for {@link JdbcDialectTypeTest}. */
-class OceanBaseMysqlDialectTypeTest extends JdbcDialectTypeTest {
+/** The OceanBase MySql mode params for {@link JdbcDialectTest}. */
+class OceanBaseMysqlDialectTest extends JdbcDialectTest {
- public OceanBaseMysqlDialectTypeTest() {
+ public OceanBaseMysqlDialectTest() {
ddlFormat =
"CREATE TABLE T (f0 %s)"
+ " WITH ("
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseOracleDialectTypeTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseOracleDialectTest.java
similarity index 90%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseOracleDialectTypeTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseOracleDialectTest.java
index 21d46a3b..ebc519f1 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseOracleDialectTypeTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oceanbase/dialect/OceanBaseOracleDialectTest.java
@@ -18,15 +18,15 @@
package org.apache.flink.connector.jdbc.databases.oceanbase.dialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectTypeTest;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectTest;
import java.util.Arrays;
import java.util.List;
-/** The OceanBase Oracle mode params for {@link JdbcDialectTypeTest}. */
-class OceanBaseOracleDialectTypeTest extends JdbcDialectTypeTest {
+/** The OceanBase Oracle mode params for {@link JdbcDialectTest}. */
+class OceanBaseOracleDialectTest extends JdbcDialectTest {
- public OceanBaseOracleDialectTypeTest() {
+ public OceanBaseOracleDialectTest() {
ddlFormat =
"CREATE TABLE T (f0 %s)"
+ " WITH ("
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectTypeTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectTest.java
similarity index 91%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectTypeTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectTest.java
index d4526791..6619b262 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectTypeTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/dialect/OracleDialectTest.java
@@ -18,13 +18,13 @@
package org.apache.flink.connector.jdbc.databases.oracle.dialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectTypeTest;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectTest;
import java.util.Arrays;
import java.util.List;
-/** The Oracle params for {@link JdbcDialectTypeTest}. */
-class OracleDialectTypeTest extends JdbcDialectTypeTest {
+/** The Oracle params for {@link JdbcDialectTest}. */
+class OracleDialectTest extends JdbcDialectTest {
@Override
protected String testDialect() {
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/factory/JdbcCatalogFactoryTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/factory/JdbcCatalogFactoryTest.java
index cef7e3b9..0cb69d80 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/factory/JdbcCatalogFactoryTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/catalog/factory/JdbcCatalogFactoryTest.java
@@ -18,9 +18,10 @@
package org.apache.flink.connector.jdbc.databases.postgres.catalog.factory;
-import org.apache.flink.connector.jdbc.catalog.JdbcCatalog;
-import org.apache.flink.connector.jdbc.catalog.factory.JdbcCatalogFactory;
-import org.apache.flink.connector.jdbc.catalog.factory.JdbcCatalogFactoryOptions;
+import org.apache.flink.connector.jdbc.core.table.JdbcFactoryLoader;
+import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog;
+import org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactory;
+import org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions;
import org.apache.flink.connector.jdbc.databases.postgres.PostgresTestBase;
import org.apache.flink.connector.jdbc.databases.postgres.catalog.PostgresCatalog;
import org.apache.flink.table.catalog.Catalog;
@@ -51,7 +52,7 @@ class JdbcCatalogFactoryTest implements PostgresTestBase {
baseUrl = jdbcUrl.substring(0, jdbcUrl.lastIndexOf("/"));
catalog =
- new JdbcCatalog(
+ JdbcFactoryLoader.loadCatalog(
Thread.currentThread().getContextClassLoader(),
TEST_CATALOG_NAME,
PostgresCatalog.DEFAULT_DATABASE,
@@ -80,14 +81,10 @@ class JdbcCatalogFactoryTest implements PostgresTestBase {
checkEquals(catalog, (JdbcCatalog) actualCatalog);
- assertThat(((JdbcCatalog) actualCatalog).getInternal()).isInstanceOf(PostgresCatalog.class);
+ assertThat((JdbcCatalog) actualCatalog).isInstanceOf(PostgresCatalog.class);
}
private static void checkEquals(JdbcCatalog c1, JdbcCatalog c2) {
- assertThat(c2.getName()).isEqualTo(c1.getName());
- assertThat(c2.getDefaultDatabase()).isEqualTo(c1.getDefaultDatabase());
- assertThat(c2.getUsername()).isEqualTo(c1.getUsername());
- assertThat(c2.getPassword()).isEqualTo(c1.getPassword());
- assertThat(c2.getBaseUrl()).isEqualTo(c1.getBaseUrl());
+ assertThat(c2).isEqualTo(c1);
}
}
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectTypeTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectTest.java
similarity index 92%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectTypeTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectTest.java
index 1da9b971..a0973a28 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectTypeTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/dialect/PostgresDialectTest.java
@@ -18,13 +18,13 @@
package org.apache.flink.connector.jdbc.databases.postgres.dialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectTypeTest;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectTest;
import java.util.Arrays;
import java.util.List;
-/** The PostgresSql params for {@link JdbcDialectTypeTest}. */
-class PostgresDialectTypeTest extends JdbcDialectTypeTest {
+/** The PostgresSql params for {@link JdbcDialectTest}. */
+class PostgresDialectTest extends JdbcDialectTest {
@Override
protected String testDialect() {
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectTypeTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectTest.java
similarity index 91%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectTypeTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectTest.java
index 6133285a..88a386db 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectTypeTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/databases/trino/dialect/TrinoDialectTest.java
@@ -18,13 +18,13 @@
package org.apache.flink.connector.jdbc.databases.trino.dialect;
-import org.apache.flink.connector.jdbc.dialect.JdbcDialectTypeTest;
+import org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectTest;
import java.util.Arrays;
import java.util.List;
-/** The Oracle params for {@link JdbcDialectTypeTest}. */
-class TrinoDialectTypeTest extends JdbcDialectTypeTest {
+/** The Oracle params for {@link JdbcDialectTest}. */
+class TrinoDialectTest extends JdbcDialectTest {
@Override
protected String testDialect() {
diff --git a/flink-connector-jdbc/pom.xml b/flink-connector-jdbc/pom.xml
index 5e507f93..60211302 100644
--- a/flink-connector-jdbc/pom.xml
+++ b/flink-connector-jdbc/pom.xml
@@ -42,20 +42,58 @@ under the License.
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-jdbc-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-annotations</artifactId>
<version>${flink.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-core</artifactId>
<version>${flink.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-test-utils</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-common</artifactId>
<version>${flink.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-api-java-bridge</artifactId>
+ <version>${flink.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
</dependencies>
@@ -95,6 +133,10 @@ under the License.
</excludes>
</filter>
</filters>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"/>
+ </transformers>
</configuration>
</execution>
</executions>
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/AbstractJdbcCatalog.java
similarity index 57%
copy from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java
copy to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/AbstractJdbcCatalog.java
index f45f0c09..6a7e1714 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/AbstractJdbcCatalog.java
@@ -16,19 +16,24 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.converter;
-
-import org.apache.flink.connector.jdbc.core.table.dialect.AbstractDialectConverter;
-import org.apache.flink.table.types.logical.RowType;
+package org.apache.flink.connector.jdbc.catalog;
/**
- * Base class for all converters that convert between JDBC object and Flink internal object.
+ * Abstract catalog for any JDBC catalogs.
*
- * @deprecated use AbstractDialectConverter
- * */
+ * @deprecated use org.apache.flink.connector.jdbc.core.table.catalog.AbstractJdbcCatalog
+ */
@Deprecated
-public abstract class AbstractJdbcRowConverter extends AbstractDialectConverter {
- public AbstractJdbcRowConverter(RowType rowType) {
- super(rowType);
+public abstract class AbstractJdbcCatalog
+ extends org.apache.flink.connector.jdbc.core.table.catalog.AbstractJdbcCatalog {
+
+ public AbstractJdbcCatalog(
+ ClassLoader userClassLoader,
+ String catalogName,
+ String defaultDatabase,
+ String username,
+ String pwd,
+ String baseUrl) {
+ super(userClassLoader, catalogName, defaultDatabase, username, pwd, baseUrl);
}
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalog.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalog.java
similarity index 92%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalog.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalog.java
index 44c0fa64..34688cc2 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalog.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalog.java
@@ -21,6 +21,7 @@ package org.apache.flink.connector.jdbc.catalog;
import org.apache.flink.annotation.Internal;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.connector.jdbc.core.table.catalog.AbstractJdbcCatalog;
import org.apache.flink.table.catalog.CatalogBaseTable;
import org.apache.flink.table.catalog.CatalogDatabase;
import org.apache.flink.table.catalog.ObjectPath;
@@ -33,11 +34,17 @@ import java.util.Properties;
import static org.apache.flink.connector.jdbc.JdbcConnectionOptions.getBriefAuthProperties;
-/** Catalogs for relational databases via JDBC. */
+/**
+ * Catalogs for relational databases via JDBC.
+ *
+ * @deprecated user org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalog
+ */
+@Deprecated
@PublicEvolving
-public class JdbcCatalog extends AbstractJdbcCatalog {
+public class JdbcCatalog
+ extends org.apache.flink.connector.jdbc.core.table.catalog.AbstractJdbcCatalog {
- private final AbstractJdbcCatalog internal;
+ private final org.apache.flink.connector.jdbc.core.table.catalog.AbstractJdbcCatalog internal;
@Deprecated
/**
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtils.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtils.java
similarity index 76%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtils.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtils.java
index af94b9cb..c45cabd8 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtils.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalogUtils.java
@@ -32,7 +32,12 @@ import java.util.Properties;
import static org.apache.flink.connector.jdbc.JdbcConnectionOptions.getBriefAuthProperties;
import static org.apache.flink.util.Preconditions.checkArgument;
-/** Utils for {@link JdbcCatalog}. */
+/**
+ * Utils for {@link JdbcCatalog}.
+ *
+ * @deprecated
+ */
+@Deprecated
public class JdbcCatalogUtils {
/**
* URL has to be without database, like "jdbc:postgresql://localhost:5432/" or
@@ -75,18 +80,36 @@ public class JdbcCatalogUtils {
JdbcDialect dialect =
JdbcFactoryLoader.loadDialect(baseUrl, userClassLoader, compatibleMode);
+ org.apache.flink.connector.jdbc.core.table.catalog.AbstractJdbcCatalog catalog;
if (dialect instanceof PostgresDialect) {
- return new PostgresCatalog(
- userClassLoader, catalogName, defaultDatabase, baseUrl, connectionProperties);
+ catalog =
+ new PostgresCatalog(
+ userClassLoader,
+ catalogName,
+ defaultDatabase,
+ baseUrl,
+ connectionProperties);
} else if (dialect instanceof CrateDBDialect) {
- return new CrateDBCatalog(
- userClassLoader, catalogName, defaultDatabase, baseUrl, connectionProperties);
+ catalog =
+ new CrateDBCatalog(
+ userClassLoader,
+ catalogName,
+ defaultDatabase,
+ baseUrl,
+ connectionProperties);
} else if (dialect instanceof MySqlDialect) {
- return new MySqlCatalog(
- userClassLoader, catalogName, defaultDatabase, baseUrl, connectionProperties);
+ catalog =
+ new MySqlCatalog(
+ userClassLoader,
+ catalogName,
+ defaultDatabase,
+ baseUrl,
+ connectionProperties);
} else {
throw new UnsupportedOperationException(
String.format("Catalog for '%s' is not supported yet.", dialect));
}
+
+ return (AbstractJdbcCatalog) catalog;
}
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactory.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactory.java
similarity index 72%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactory.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactory.java
index a19e0bae..5f14840e 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactory.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/factory/JdbcCatalogFactory.java
@@ -20,6 +20,7 @@ package org.apache.flink.connector.jdbc.catalog.factory;
import org.apache.flink.configuration.ConfigOption;
import org.apache.flink.connector.jdbc.catalog.JdbcCatalog;
+import org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions;
import org.apache.flink.table.catalog.Catalog;
import org.apache.flink.table.factories.CatalogFactory;
import org.apache.flink.table.factories.FactoryUtil;
@@ -30,18 +31,26 @@ import org.slf4j.LoggerFactory;
import java.util.HashSet;
import java.util.Set;
-import static org.apache.flink.connector.jdbc.catalog.factory.JdbcCatalogFactoryOptions.BASE_URL;
-import static org.apache.flink.connector.jdbc.catalog.factory.JdbcCatalogFactoryOptions.COMPATIBLE_MODE;
-import static org.apache.flink.connector.jdbc.catalog.factory.JdbcCatalogFactoryOptions.DEFAULT_DATABASE;
-import static org.apache.flink.connector.jdbc.catalog.factory.JdbcCatalogFactoryOptions.PASSWORD;
-import static org.apache.flink.connector.jdbc.catalog.factory.JdbcCatalogFactoryOptions.USERNAME;
+import static org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions.BASE_URL;
+import static org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions.COMPATIBLE_MODE;
+import static org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions.DEFAULT_DATABASE;
+import static org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions.PASSWORD;
+import static org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactoryOptions.USERNAME;
import static org.apache.flink.connector.jdbc.utils.JdbcUtils.getConnectionProperties;
import static org.apache.flink.table.factories.FactoryUtil.PROPERTY_VERSION;
-/** Factory for {@link JdbcCatalog}. */
+/**
+ * Factory for {@link JdbcCatalog}.
+ *
+ * @deprecated use org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactory
+ */
+@Deprecated
public class JdbcCatalogFactory implements CatalogFactory {
- private static final Logger LOG = LoggerFactory.getLogger(JdbcCatalogFactory.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(
+ org.apache.flink.connector.jdbc.core.table.catalog.factory.JdbcCatalogFactory
+ .class);
@Override
public String factoryIdentifier() {
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java
index f45f0c09..cccf06d3 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/converter/AbstractJdbcRowConverter.java
@@ -25,7 +25,7 @@ import org.apache.flink.table.types.logical.RowType;
* Base class for all converters that convert between JDBC object and Flink internal object.
*
* @deprecated use AbstractDialectConverter
- * */
+ */
@Deprecated
public abstract class AbstractJdbcRowConverter extends AbstractDialectConverter {
public AbstractJdbcRowConverter(RowType rowType) {
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java
similarity index 67%
copy from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java
copy to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java
index 11fc46ef..5b598602 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java
@@ -18,15 +18,12 @@
package org.apache.flink.connector.jdbc.dialect;
-import org.apache.flink.table.catalog.ObjectPath;
-import org.apache.flink.table.types.DataType;
+import org.apache.flink.connector.jdbc.core.table.catalog.JdbcCatalogTypeMapper;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-
-/** Separate the jdbc meta-information type to flink table type into the interface. */
-public interface JdbcDialectTypeMapper {
-
- DataType mapping(ObjectPath tablePath, ResultSetMetaData metadata, int colIndex)
- throws SQLException;
-}
+/**
+ * Separate the jdbc meta-information type to flink table type into the interface.
+ *
+ * @deprecated use JdbcCatalogTypeMapper
+ */
+@Deprecated
+public interface JdbcDialectTypeMapper extends JdbcCatalogTypeMapper {}
diff --git a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flink-connector-jdbc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
similarity index 93%
copy from flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
copy to flink-connector-jdbc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
index a54d9f57..44a97bdb 100644
--- a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
+++ b/flink-connector-jdbc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
@@ -13,5 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory
org.apache.flink.connector.jdbc.catalog.factory.JdbcCatalogFactory
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeTest.java
similarity index 67%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java
rename to flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeTest.java
index 11fc46ef..80edaea5 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeMapper.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/JdbcDialectTypeTest.java
@@ -18,15 +18,11 @@
package org.apache.flink.connector.jdbc.dialect;
-import org.apache.flink.table.catalog.ObjectPath;
-import org.apache.flink.table.types.DataType;
-
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-
-/** Separate the jdbc meta-information type to flink table type into the interface. */
-public interface JdbcDialectTypeMapper {
-
- DataType mapping(ObjectPath tablePath, ResultSetMetaData metadata, int colIndex)
- throws SQLException;
-}
+/**
+ * Tests for all DataTypes and Dialects of JDBC connector.
+ *
+ * @deprecated use org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectTest
+ */
+@Deprecated
+public class JdbcDialectTypeTest
+ extends org.apache.flink.connector.jdbc.core.table.dialect.JdbcDialectTest {}
diff --git a/pom.xml b/pom.xml
index 2f41ad2e..107ac34c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,8 @@ under the License.
<properties>
<flink.version>1.18.0</flink.version>
+ <scala.binary.version>2.12</scala.binary.version>
+ <scala-library.version>2.12.7</scala-library.version>
<jackson-bom.version>2.13.4.20221013</jackson-bom.version>
<junit4.version>4.13.2</junit4.version>
@@ -171,6 +173,13 @@ under the License.
<dependencyManagement>
<dependencies>
+ <!-- For dependency convergence -->
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>${scala-library.version}</version>
+ </dependency>
+
<!-- Flink dependencies -->
<dependency>
(flink-connector-jdbc) 12/14: [FLINK-35368] Reorganize table code
Posted by fa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git
commit 67046e0aabd9a36f000f6f347554a20c019dfc21
Author: Joao Boto <bo...@boto.pro>
AuthorDate: Mon Jul 8 18:32:57 2024 +0200
[FLINK-35368] Reorganize table code
---
.../core/database/catalog/AbstractJdbcCatalog.java | 12 +++---
.../catalog/factory/JdbcCatalogFactoryOptions.java | 2 +-
.../{ => core}/table/JdbcConnectorOptions.java | 4 +-
.../{ => core}/table/JdbcDynamicTableFactory.java | 46 +++++++++++-----------
.../table/sink}/JdbcDynamicTableSink.java | 2 +-
.../table/sink}/JdbcOutputFormatBuilder.java | 2 +-
.../table/source}/JdbcDynamicTableSource.java | 2 +-
...JdbcFilterPushdownPreparedStatementVisitor.java | 2 +-
.../table/source}/JdbcRowDataInputFormat.java | 2 +-
.../table/source}/JdbcRowDataLookupFunction.java | 2 +-
.../table/source}/ParameterizedPredicate.java | 2 +-
.../org.apache.flink.table.factories.Factory | 2 +-
.../table/JdbcDynamicTableFactoryTest.java | 4 +-
.../jdbc/{ => core}/table/JdbcTablePlanTest.java | 2 +-
.../table/sink}/JdbcAppendOnlyWriterTest.java | 2 +-
.../table/sink}/JdbcDynamicTableSinkITCase.java | 2 +-
.../table/sink}/JdbcOutputFormatTest.java | 2 +-
.../source}/JdbcDynamicTableSourceITCase.java | 2 +-
...FilterPushdownPreparedStatementVisitorTest.java | 2 +-
.../table/source}/JdbcLookupTestBase.java | 2 +-
.../table/source}/JdbcRowDataInputFormatTest.java | 2 +-
.../source}/JdbcRowDataLookupFunctionTest.java | 2 +-
.../derby/table/DerbyDynamicTableSinkITCase.java | 2 +-
.../derby/table/DerbyDynamicTableSourceITCase.java | 2 +-
.../jdbc/{ => core}/table/JdbcTablePlanTest.xml | 0
.../database/table/Db2DynamicTableSinkITCase.java | 2 +-
.../table/Db2DynamicTableSourceITCase.java | 2 +-
.../mysql/table/MySqlDynamicTableSinkITCase.java | 2 +-
.../mysql/table/MySqlDynamicTableSourceITCase.java | 2 +-
.../OceanBaseMySqlDynamicTableSinkITCase.java | 2 +-
.../OceanBaseMySqlDynamicTableSourceITCase.java | 2 +-
.../OceanBaseOracleDynamicTableSinkITCase.java | 2 +-
.../OceanBaseOracleDynamicTableSourceITCase.java | 2 +-
.../oracle/table/OracleDynamicTableSinkITCase.java | 2 +-
.../table/OracleDynamicTableSourceITCase.java | 2 +-
.../table/PostgresDynamicTableSinkITCase.java | 2 +-
.../table/PostgresDynamicTableSourceITCase.java | 2 +-
.../table/SqlServerDynamicTableSinkITCase.java | 2 +-
.../table/SqlServerDynamicTableSourceITCase.java | 2 +-
.../trino/table/TrinoDynamicTableSinkITCase.java | 2 +-
.../trino/table/TrinoDynamicTableSourceITCase.java | 2 +-
flink-connector-jdbc/pom.xml | 8 ++++
.../connector/jdbc/table/JdbcConnectorOptions.java | 31 +++++----------
43 files changed, 89 insertions(+), 88 deletions(-)
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/AbstractJdbcCatalog.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/AbstractJdbcCatalog.java
index 63d1e90f..7f859145 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/AbstractJdbcCatalog.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/AbstractJdbcCatalog.java
@@ -18,7 +18,7 @@
package org.apache.flink.connector.jdbc.core.database.catalog;
-import org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory;
+import org.apache.flink.connector.jdbc.core.table.JdbcDynamicTableFactory;
import org.apache.flink.table.api.Schema;
import org.apache.flink.table.api.ValidationException;
import org.apache.flink.table.catalog.AbstractCatalog;
@@ -77,11 +77,11 @@ import java.util.function.Predicate;
import static org.apache.flink.connector.jdbc.JdbcConnectionOptions.PASSWORD_KEY;
import static org.apache.flink.connector.jdbc.JdbcConnectionOptions.USER_KEY;
import static org.apache.flink.connector.jdbc.JdbcConnectionOptions.getBriefAuthProperties;
-import static org.apache.flink.connector.jdbc.table.JdbcConnectorOptions.PASSWORD;
-import static org.apache.flink.connector.jdbc.table.JdbcConnectorOptions.TABLE_NAME;
-import static org.apache.flink.connector.jdbc.table.JdbcConnectorOptions.URL;
-import static org.apache.flink.connector.jdbc.table.JdbcConnectorOptions.USERNAME;
-import static org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory.IDENTIFIER;
+import static org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions.PASSWORD;
+import static org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions.TABLE_NAME;
+import static org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions.URL;
+import static org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions.USERNAME;
+import static org.apache.flink.connector.jdbc.core.table.JdbcDynamicTableFactory.IDENTIFIER;
import static org.apache.flink.table.factories.FactoryUtil.CONNECTOR;
import static org.apache.flink.util.Preconditions.checkArgument;
import static org.apache.flink.util.Preconditions.checkNotNull;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/factory/JdbcCatalogFactoryOptions.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/factory/JdbcCatalogFactoryOptions.java
index 08faa228..02c607b4 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/factory/JdbcCatalogFactoryOptions.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/factory/JdbcCatalogFactoryOptions.java
@@ -22,7 +22,7 @@ import org.apache.flink.annotation.Internal;
import org.apache.flink.configuration.ConfigOption;
import org.apache.flink.configuration.ConfigOptions;
import org.apache.flink.connector.jdbc.core.database.catalog.JdbcCatalog;
-import org.apache.flink.connector.jdbc.table.JdbcConnectorOptions;
+import org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions;
import org.apache.flink.table.catalog.CommonCatalogOptions;
/** {@link ConfigOption}s for {@link JdbcCatalog}. */
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcConnectorOptions.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcConnectorOptions.java
similarity index 98%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcConnectorOptions.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcConnectorOptions.java
index 0b39df45..35c60232 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcConnectorOptions.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcConnectorOptions.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.table;
+package org.apache.flink.connector.jdbc.core.table;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.configuration.ConfigOption;
@@ -179,5 +179,5 @@ public class JdbcConnectorOptions {
.defaultValue(3)
.withDescription("The max retry times if writing records to database failed.");
- private JdbcConnectorOptions() {}
+ protected JdbcConnectorOptions() {}
}
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactory.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcDynamicTableFactory.java
similarity index 87%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactory.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcDynamicTableFactory.java
index 4e427027..56a0dcaa 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactory.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcDynamicTableFactory.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.table;
+package org.apache.flink.connector.jdbc.core.table;
import org.apache.flink.annotation.Internal;
import org.apache.flink.configuration.ConfigOption;
@@ -25,6 +25,8 @@ import org.apache.flink.configuration.ReadableConfig;
import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
import org.apache.flink.connector.jdbc.core.database.JdbcFactoryLoader;
import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
+import org.apache.flink.connector.jdbc.core.table.sink.JdbcDynamicTableSink;
+import org.apache.flink.connector.jdbc.core.table.source.JdbcDynamicTableSource;
import org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions;
import org.apache.flink.connector.jdbc.internal.options.JdbcDmlOptions;
import org.apache.flink.connector.jdbc.internal.options.JdbcReadOptions;
@@ -50,27 +52,27 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import static org.apache.flink.connector.jdbc.table.JdbcConnectorOptions.COMPATIBLE_MODE;
-import static org.apache.flink.connector.jdbc.table.JdbcConnectorOptions.DRIVER;
-import static org.apache.flink.connector.jdbc.table.JdbcConnectorOptions.LOOKUP_CACHE_MAX_ROWS;
-import static org.apache.flink.connector.jdbc.table.JdbcConnectorOptions.LOOKUP_CACHE_MISSING_KEY;
-import static org.apache.flink.connector.jdbc.table.JdbcConnectorOptions.LOOKUP_CACHE_TTL;
-import static org.apache.flink.connector.jdbc.table.JdbcConnectorOptions.LOOKUP_MAX_RETRIES;
-import static org.apache.flink.connector.jdbc.table.JdbcConnectorOptions.MAX_RETRY_TIMEOUT;
-import static org.apache.flink.connector.jdbc.table.JdbcConnectorOptions.PASSWORD;
-import static org.apache.flink.connector.jdbc.table.JdbcConnectorOptions.SCAN_AUTO_COMMIT;
-import static org.apache.flink.connector.jdbc.table.JdbcConnectorOptions.SCAN_FETCH_SIZE;
-import static org.apache.flink.connector.jdbc.table.JdbcConnectorOptions.SCAN_PARTITION_COLUMN;
-import static org.apache.flink.connector.jdbc.table.JdbcConnectorOptions.SCAN_PARTITION_LOWER_BOUND;
-import static org.apache.flink.connector.jdbc.table.JdbcConnectorOptions.SCAN_PARTITION_NUM;
-import static org.apache.flink.connector.jdbc.table.JdbcConnectorOptions.SCAN_PARTITION_UPPER_BOUND;
-import static org.apache.flink.connector.jdbc.table.JdbcConnectorOptions.SINK_BUFFER_FLUSH_INTERVAL;
-import static org.apache.flink.connector.jdbc.table.JdbcConnectorOptions.SINK_BUFFER_FLUSH_MAX_ROWS;
-import static org.apache.flink.connector.jdbc.table.JdbcConnectorOptions.SINK_MAX_RETRIES;
-import static org.apache.flink.connector.jdbc.table.JdbcConnectorOptions.SINK_PARALLELISM;
-import static org.apache.flink.connector.jdbc.table.JdbcConnectorOptions.TABLE_NAME;
-import static org.apache.flink.connector.jdbc.table.JdbcConnectorOptions.URL;
-import static org.apache.flink.connector.jdbc.table.JdbcConnectorOptions.USERNAME;
+import static org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions.COMPATIBLE_MODE;
+import static org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions.DRIVER;
+import static org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions.LOOKUP_CACHE_MAX_ROWS;
+import static org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions.LOOKUP_CACHE_MISSING_KEY;
+import static org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions.LOOKUP_CACHE_TTL;
+import static org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions.LOOKUP_MAX_RETRIES;
+import static org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions.MAX_RETRY_TIMEOUT;
+import static org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions.PASSWORD;
+import static org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions.SCAN_AUTO_COMMIT;
+import static org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions.SCAN_FETCH_SIZE;
+import static org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions.SCAN_PARTITION_COLUMN;
+import static org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions.SCAN_PARTITION_LOWER_BOUND;
+import static org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions.SCAN_PARTITION_NUM;
+import static org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions.SCAN_PARTITION_UPPER_BOUND;
+import static org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions.SINK_BUFFER_FLUSH_INTERVAL;
+import static org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions.SINK_BUFFER_FLUSH_MAX_ROWS;
+import static org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions.SINK_MAX_RETRIES;
+import static org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions.SINK_PARALLELISM;
+import static org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions.TABLE_NAME;
+import static org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions.URL;
+import static org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions.USERNAME;
import static org.apache.flink.connector.jdbc.utils.JdbcUtils.getConnectionProperties;
/**
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSink.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/sink/JdbcDynamicTableSink.java
similarity index 98%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSink.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/sink/JdbcDynamicTableSink.java
index 4403f194..7b2c2f76 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSink.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/sink/JdbcDynamicTableSink.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.table;
+package org.apache.flink.connector.jdbc.core.table.sink;
import org.apache.flink.annotation.Internal;
import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatBuilder.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/sink/JdbcOutputFormatBuilder.java
similarity index 99%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatBuilder.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/sink/JdbcOutputFormatBuilder.java
index 1bd2fc5d..493cc8d2 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatBuilder.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/sink/JdbcOutputFormatBuilder.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.table;
+package org.apache.flink.connector.jdbc.core.table.sink;
import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSource.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/source/JdbcDynamicTableSource.java
similarity index 99%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSource.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/source/JdbcDynamicTableSource.java
index 08716bc8..11bdd226 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSource.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/source/JdbcDynamicTableSource.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.table;
+package org.apache.flink.connector.jdbc.core.table.source;
import org.apache.flink.annotation.Internal;
import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcFilterPushdownPreparedStatementVisitor.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/source/JdbcFilterPushdownPreparedStatementVisitor.java
similarity index 99%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcFilterPushdownPreparedStatementVisitor.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/source/JdbcFilterPushdownPreparedStatementVisitor.java
index a4e31eee..908beeb4 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcFilterPushdownPreparedStatementVisitor.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/source/JdbcFilterPushdownPreparedStatementVisitor.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.table;
+package org.apache.flink.connector.jdbc.core.table.source;
import org.apache.flink.annotation.Experimental;
import org.apache.flink.table.expressions.CallExpression;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormat.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/source/JdbcRowDataInputFormat.java
similarity index 99%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormat.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/source/JdbcRowDataInputFormat.java
index 812c1891..b06f555d 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormat.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/source/JdbcRowDataInputFormat.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.table;
+package org.apache.flink.connector.jdbc.core.table.source;
import org.apache.flink.annotation.Internal;
import org.apache.flink.api.common.io.DefaultInputSplitAssigner;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunction.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/source/JdbcRowDataLookupFunction.java
similarity index 99%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunction.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/source/JdbcRowDataLookupFunction.java
index 9bbe8939..dd39fa27 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunction.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/source/JdbcRowDataLookupFunction.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.table;
+package org.apache.flink.connector.jdbc.core.table.source;
import org.apache.flink.annotation.Internal;
import org.apache.flink.annotation.VisibleForTesting;
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/ParameterizedPredicate.java b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/source/ParameterizedPredicate.java
similarity index 96%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/ParameterizedPredicate.java
rename to flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/source/ParameterizedPredicate.java
index 82a9a856..483f3bca 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/ParameterizedPredicate.java
+++ b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/source/ParameterizedPredicate.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.table;
+package org.apache.flink.connector.jdbc.core.table.source;
import org.apache.flink.annotation.Experimental;
diff --git a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
index b0c68772..b245d318 100644
--- a/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
+++ b/flink-connector-jdbc-core/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
@@ -13,5 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.flink.connector.jdbc.table.JdbcDynamicTableFactory
+org.apache.flink.connector.jdbc.core.table.JdbcDynamicTableFactory
org.apache.flink.connector.jdbc.core.database.catalog.factory.JdbcCatalogFactory
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactoryTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/JdbcDynamicTableFactoryTest.java
similarity index 98%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactoryTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/JdbcDynamicTableFactoryTest.java
index a23bf197..e9bf7022 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactoryTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/JdbcDynamicTableFactoryTest.java
@@ -16,10 +16,12 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.table;
+package org.apache.flink.connector.jdbc.core.table;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
+import org.apache.flink.connector.jdbc.core.table.sink.JdbcDynamicTableSink;
+import org.apache.flink.connector.jdbc.core.table.source.JdbcDynamicTableSource;
import org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions;
import org.apache.flink.connector.jdbc.internal.options.JdbcDmlOptions;
import org.apache.flink.connector.jdbc.internal.options.JdbcReadOptions;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcTablePlanTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/JdbcTablePlanTest.java
similarity index 99%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcTablePlanTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/JdbcTablePlanTest.java
index c342d6ba..ad4558d4 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcTablePlanTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/JdbcTablePlanTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.table;
+package org.apache.flink.connector.jdbc.core.table;
import org.apache.flink.table.api.TableConfig;
import org.apache.flink.table.planner.utils.StreamTableTestUtil;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcAppendOnlyWriterTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/sink/JdbcAppendOnlyWriterTest.java
similarity index 98%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcAppendOnlyWriterTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/sink/JdbcAppendOnlyWriterTest.java
index 17ea9260..bec03d73 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcAppendOnlyWriterTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/sink/JdbcAppendOnlyWriterTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.table;
+package org.apache.flink.connector.jdbc.core.table.sink;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.connector.jdbc.JdbcTestBase;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSinkITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/sink/JdbcDynamicTableSinkITCase.java
similarity index 99%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSinkITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/sink/JdbcDynamicTableSinkITCase.java
index 2d4735c6..f95fd3c9 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSinkITCase.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/sink/JdbcDynamicTableSinkITCase.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.table;
+package org.apache.flink.connector.jdbc.core.table.sink;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.configuration.Configuration;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/sink/JdbcOutputFormatTest.java
similarity index 99%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/sink/JdbcOutputFormatTest.java
index fff4ad7a..32618d92 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/sink/JdbcOutputFormatTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.table;
+package org.apache.flink.connector.jdbc.core.table.sink;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.connector.jdbc.JdbcDataTestBase;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSourceITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/source/JdbcDynamicTableSourceITCase.java
similarity index 99%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSourceITCase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/source/JdbcDynamicTableSourceITCase.java
index bab5a408..b05a038c 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSourceITCase.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/source/JdbcDynamicTableSourceITCase.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.table;
+package org.apache.flink.connector.jdbc.core.table.source;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.connector.jdbc.testutils.DatabaseTest;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcFilterPushdownPreparedStatementVisitorTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/source/JdbcFilterPushdownPreparedStatementVisitorTest.java
similarity index 99%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcFilterPushdownPreparedStatementVisitorTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/source/JdbcFilterPushdownPreparedStatementVisitorTest.java
index 1f5a0493..752c25da 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcFilterPushdownPreparedStatementVisitorTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/source/JdbcFilterPushdownPreparedStatementVisitorTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.table;
+package org.apache.flink.connector.jdbc.core.table.source;
import org.apache.flink.connector.jdbc.JdbcTestBase;
import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialect;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcLookupTestBase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/source/JdbcLookupTestBase.java
similarity index 98%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcLookupTestBase.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/source/JdbcLookupTestBase.java
index 1c8cbdd9..7255538f 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcLookupTestBase.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/source/JdbcLookupTestBase.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.table;
+package org.apache.flink.connector.jdbc.core.table.source;
import org.apache.flink.connector.jdbc.derby.DerbyTestBase;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormatTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/source/JdbcRowDataInputFormatTest.java
similarity index 99%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormatTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/source/JdbcRowDataInputFormatTest.java
index 259c3746..93f32490 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormatTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/source/JdbcRowDataInputFormatTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.table;
+package org.apache.flink.connector.jdbc.core.table.source;
import org.apache.flink.connector.jdbc.JdbcDataTestBase;
import org.apache.flink.connector.jdbc.JdbcTestFixture;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunctionTest.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/source/JdbcRowDataLookupFunctionTest.java
similarity index 99%
rename from flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunctionTest.java
rename to flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/source/JdbcRowDataLookupFunctionTest.java
index 08d7d8fe..16f3937a 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunctionTest.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/core/table/source/JdbcRowDataLookupFunctionTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.connector.jdbc.table;
+package org.apache.flink.connector.jdbc.core.table.source;
import org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions;
import org.apache.flink.table.api.DataTypes;
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/table/DerbyDynamicTableSinkITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/table/DerbyDynamicTableSinkITCase.java
index 6912bae7..8242fb3f 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/table/DerbyDynamicTableSinkITCase.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/table/DerbyDynamicTableSinkITCase.java
@@ -18,9 +18,9 @@
package org.apache.flink.connector.jdbc.derby.table;
+import org.apache.flink.connector.jdbc.core.table.sink.JdbcDynamicTableSinkITCase;
import org.apache.flink.connector.jdbc.derby.DerbyTestBase;
import org.apache.flink.connector.jdbc.derby.database.dialect.DerbyDialect;
-import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSinkITCase;
/** The Table Sink ITCase for {@link DerbyDialect}. */
class DerbyDynamicTableSinkITCase extends JdbcDynamicTableSinkITCase implements DerbyTestBase {}
diff --git a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/table/DerbyDynamicTableSourceITCase.java b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/table/DerbyDynamicTableSourceITCase.java
index 5d201227..e1d95c19 100644
--- a/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/table/DerbyDynamicTableSourceITCase.java
+++ b/flink-connector-jdbc-core/src/test/java/org/apache/flink/connector/jdbc/derby/table/DerbyDynamicTableSourceITCase.java
@@ -18,9 +18,9 @@
package org.apache.flink.connector.jdbc.derby.table;
+import org.apache.flink.connector.jdbc.core.table.source.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.derby.DerbyTestBase;
import org.apache.flink.connector.jdbc.derby.database.dialect.DerbyDialect;
-import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.types.Row;
diff --git a/flink-connector-jdbc-core/src/test/resources/org/apache/flink/connector/jdbc/table/JdbcTablePlanTest.xml b/flink-connector-jdbc-core/src/test/resources/org/apache/flink/connector/jdbc/core/table/JdbcTablePlanTest.xml
similarity index 100%
rename from flink-connector-jdbc-core/src/test/resources/org/apache/flink/connector/jdbc/table/JdbcTablePlanTest.xml
rename to flink-connector-jdbc-core/src/test/resources/org/apache/flink/connector/jdbc/core/table/JdbcTablePlanTest.xml
diff --git a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/database/table/Db2DynamicTableSinkITCase.java b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/database/table/Db2DynamicTableSinkITCase.java
index 769177c4..2f0acb22 100644
--- a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/database/table/Db2DynamicTableSinkITCase.java
+++ b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/database/table/Db2DynamicTableSinkITCase.java
@@ -18,9 +18,9 @@
package org.apache.flink.connector.jdbc.db2.database.table;
+import org.apache.flink.connector.jdbc.core.table.sink.JdbcDynamicTableSinkITCase;
import org.apache.flink.connector.jdbc.db2.Db2TestBase;
import org.apache.flink.connector.jdbc.db2.database.dialect.Db2Dialect;
-import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSinkITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
diff --git a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/database/table/Db2DynamicTableSourceITCase.java b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/database/table/Db2DynamicTableSourceITCase.java
index 13c6d603..c5b94fb0 100644
--- a/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/database/table/Db2DynamicTableSourceITCase.java
+++ b/flink-connector-jdbc-db2/src/test/java/org/apache/flink/connector/jdbc/db2/database/table/Db2DynamicTableSourceITCase.java
@@ -18,9 +18,9 @@
package org.apache.flink.connector.jdbc.db2.database.table;
+import org.apache.flink.connector.jdbc.core.table.source.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.db2.Db2TestBase;
import org.apache.flink.connector.jdbc.db2.database.dialect.Db2Dialect;
-import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.types.Row;
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/table/MySqlDynamicTableSinkITCase.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/table/MySqlDynamicTableSinkITCase.java
index 3b48699a..83d7e118 100644
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/table/MySqlDynamicTableSinkITCase.java
+++ b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/table/MySqlDynamicTableSinkITCase.java
@@ -18,9 +18,9 @@
package org.apache.flink.connector.jdbc.mysql.table;
+import org.apache.flink.connector.jdbc.core.table.sink.JdbcDynamicTableSinkITCase;
import org.apache.flink.connector.jdbc.mysql.MySqlTestBase;
import org.apache.flink.connector.jdbc.mysql.database.dialect.MySqlDialect;
-import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSinkITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
diff --git a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/table/MySqlDynamicTableSourceITCase.java b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/table/MySqlDynamicTableSourceITCase.java
index ff335e5e..1de6b73f 100644
--- a/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/table/MySqlDynamicTableSourceITCase.java
+++ b/flink-connector-jdbc-mysql/src/test/java/org/apache/flink/connector/jdbc/mysql/table/MySqlDynamicTableSourceITCase.java
@@ -18,9 +18,9 @@
package org.apache.flink.connector.jdbc.mysql.table;
+import org.apache.flink.connector.jdbc.core.table.source.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.mysql.MySqlTestBase;
import org.apache.flink.connector.jdbc.mysql.database.dialect.MySqlDialect;
-import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.types.Row;
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseMySqlDynamicTableSinkITCase.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseMySqlDynamicTableSinkITCase.java
index 03532644..ff6522ad 100644
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseMySqlDynamicTableSinkITCase.java
+++ b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseMySqlDynamicTableSinkITCase.java
@@ -18,8 +18,8 @@
package org.apache.flink.connector.jdbc.oceanbase.table;
+import org.apache.flink.connector.jdbc.core.table.sink.JdbcDynamicTableSinkITCase;
import org.apache.flink.connector.jdbc.oceanbase.OceanBaseMysqlTestBase;
-import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSinkITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseMySqlDynamicTableSourceITCase.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseMySqlDynamicTableSourceITCase.java
index 0af6da0a..f32d3150 100644
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseMySqlDynamicTableSourceITCase.java
+++ b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseMySqlDynamicTableSourceITCase.java
@@ -18,8 +18,8 @@
package org.apache.flink.connector.jdbc.oceanbase.table;
+import org.apache.flink.connector.jdbc.core.table.source.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.oceanbase.OceanBaseMysqlTestBase;
-import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.types.Row;
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseOracleDynamicTableSinkITCase.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseOracleDynamicTableSinkITCase.java
index 711d64ae..03b91ae8 100644
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseOracleDynamicTableSinkITCase.java
+++ b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseOracleDynamicTableSinkITCase.java
@@ -18,8 +18,8 @@
package org.apache.flink.connector.jdbc.oceanbase.table;
+import org.apache.flink.connector.jdbc.core.table.sink.JdbcDynamicTableSinkITCase;
import org.apache.flink.connector.jdbc.oceanbase.OceanBaseOracleTestBase;
-import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSinkITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.types.Row;
diff --git a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseOracleDynamicTableSourceITCase.java b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseOracleDynamicTableSourceITCase.java
index 03dd6ab9..b4ad8a56 100644
--- a/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseOracleDynamicTableSourceITCase.java
+++ b/flink-connector-jdbc-oceanbase/src/test/java/org/apache/flink/connector/jdbc/oceanbase/table/OceanBaseOracleDynamicTableSourceITCase.java
@@ -18,8 +18,8 @@
package org.apache.flink.connector.jdbc.oceanbase.table;
+import org.apache.flink.connector.jdbc.core.table.source.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.oceanbase.OceanBaseOracleTestBase;
-import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.types.Row;
diff --git a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/table/OracleDynamicTableSinkITCase.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/table/OracleDynamicTableSinkITCase.java
index b467cb72..6fab11d4 100644
--- a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/table/OracleDynamicTableSinkITCase.java
+++ b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/table/OracleDynamicTableSinkITCase.java
@@ -18,9 +18,9 @@
package org.apache.flink.connector.jdbc.oracle.table;
+import org.apache.flink.connector.jdbc.core.table.sink.JdbcDynamicTableSinkITCase;
import org.apache.flink.connector.jdbc.oracle.OracleTestBase;
import org.apache.flink.connector.jdbc.oracle.database.dialect.OracleDialect;
-import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSinkITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableBuilder;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
diff --git a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/table/OracleDynamicTableSourceITCase.java b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/table/OracleDynamicTableSourceITCase.java
index 97ff3924..e3e6fff9 100644
--- a/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/table/OracleDynamicTableSourceITCase.java
+++ b/flink-connector-jdbc-oracle/src/test/java/org/apache/flink/connector/jdbc/oracle/table/OracleDynamicTableSourceITCase.java
@@ -18,9 +18,9 @@
package org.apache.flink.connector.jdbc.oracle.table;
+import org.apache.flink.connector.jdbc.core.table.source.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.oracle.OracleTestBase;
import org.apache.flink.connector.jdbc.oracle.database.dialect.OracleDialect;
-import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableBuilder;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
diff --git a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/table/PostgresDynamicTableSinkITCase.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/table/PostgresDynamicTableSinkITCase.java
index 2947a3a9..040c883e 100644
--- a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/table/PostgresDynamicTableSinkITCase.java
+++ b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/table/PostgresDynamicTableSinkITCase.java
@@ -18,9 +18,9 @@
package org.apache.flink.connector.jdbc.postgres.table;
+import org.apache.flink.connector.jdbc.core.table.sink.JdbcDynamicTableSinkITCase;
import org.apache.flink.connector.jdbc.postgres.PostgresTestBase;
import org.apache.flink.connector.jdbc.postgres.database.dialect.PostgresDialect;
-import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSinkITCase;
/** The Table Sink ITCase for {@link PostgresDialect}. */
class PostgresDynamicTableSinkITCase extends JdbcDynamicTableSinkITCase
diff --git a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/table/PostgresDynamicTableSourceITCase.java b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/table/PostgresDynamicTableSourceITCase.java
index f2c43e88..079260d9 100644
--- a/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/table/PostgresDynamicTableSourceITCase.java
+++ b/flink-connector-jdbc-postgres/src/test/java/org/apache/flink/connector/jdbc/postgres/table/PostgresDynamicTableSourceITCase.java
@@ -18,9 +18,9 @@
package org.apache.flink.connector.jdbc.postgres.table;
+import org.apache.flink.connector.jdbc.core.table.source.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.postgres.PostgresTestBase;
import org.apache.flink.connector.jdbc.postgres.database.dialect.PostgresDialect;
-import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.types.Row;
diff --git a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/table/SqlServerDynamicTableSinkITCase.java b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/table/SqlServerDynamicTableSinkITCase.java
index 2c2e3eb1..5088a7c2 100644
--- a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/table/SqlServerDynamicTableSinkITCase.java
+++ b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/table/SqlServerDynamicTableSinkITCase.java
@@ -18,9 +18,9 @@
package org.apache.flink.connector.jdbc.sqlserver.table;
+import org.apache.flink.connector.jdbc.core.table.sink.JdbcDynamicTableSinkITCase;
import org.apache.flink.connector.jdbc.sqlserver.SqlServerTestBase;
import org.apache.flink.connector.jdbc.sqlserver.database.dialect.SqlServerDialect;
-import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSinkITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
diff --git a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/table/SqlServerDynamicTableSourceITCase.java b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/table/SqlServerDynamicTableSourceITCase.java
index 34d6161a..8b85d01a 100644
--- a/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/table/SqlServerDynamicTableSourceITCase.java
+++ b/flink-connector-jdbc-sqlserver/src/test/java/org/apache/flink/connector/jdbc/sqlserver/table/SqlServerDynamicTableSourceITCase.java
@@ -18,9 +18,9 @@
package org.apache.flink.connector.jdbc.sqlserver.table;
+import org.apache.flink.connector.jdbc.core.table.source.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.sqlserver.SqlServerTestBase;
import org.apache.flink.connector.jdbc.sqlserver.database.dialect.SqlServerDialect;
-import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.types.Row;
diff --git a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/table/TrinoDynamicTableSinkITCase.java b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/table/TrinoDynamicTableSinkITCase.java
index b1e115aa..58622321 100644
--- a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/table/TrinoDynamicTableSinkITCase.java
+++ b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/table/TrinoDynamicTableSinkITCase.java
@@ -18,7 +18,7 @@
package org.apache.flink.connector.jdbc.trino.table;
-import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSinkITCase;
+import org.apache.flink.connector.jdbc.core.table.sink.JdbcDynamicTableSinkITCase;
import org.apache.flink.connector.jdbc.testutils.DatabaseMetadata;
import org.apache.flink.connector.jdbc.testutils.TableManaged;
import org.apache.flink.connector.jdbc.trino.TrinoTestBase;
diff --git a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/table/TrinoDynamicTableSourceITCase.java b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/table/TrinoDynamicTableSourceITCase.java
index 560fd31f..3c7df607 100644
--- a/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/table/TrinoDynamicTableSourceITCase.java
+++ b/flink-connector-jdbc-trino/src/test/java/org/apache/flink/connector/jdbc/trino/table/TrinoDynamicTableSourceITCase.java
@@ -18,7 +18,7 @@
package org.apache.flink.connector.jdbc.trino.table;
-import org.apache.flink.connector.jdbc.table.JdbcDynamicTableSourceITCase;
+import org.apache.flink.connector.jdbc.core.table.source.JdbcDynamicTableSourceITCase;
import org.apache.flink.connector.jdbc.testutils.tables.TableRow;
import org.apache.flink.connector.jdbc.trino.TrinoTestBase;
import org.apache.flink.connector.jdbc.trino.database.dialect.TrinoDialect;
diff --git a/flink-connector-jdbc/pom.xml b/flink-connector-jdbc/pom.xml
index 45cc62f4..c038ca2c 100644
--- a/flink-connector-jdbc/pom.xml
+++ b/flink-connector-jdbc/pom.xml
@@ -145,6 +145,14 @@ under the License.
<scope>test</scope>
</dependency>
+ <!-- H2 tests -->
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>2.2.224</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
diff --git a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/RowDataResultExtractor.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcConnectorOptions.java
similarity index 50%
rename from flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/RowDataResultExtractor.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcConnectorOptions.java
index 534f4921..8612e926 100644
--- a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/table/RowDataResultExtractor.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcConnectorOptions.java
@@ -18,25 +18,14 @@
package org.apache.flink.connector.jdbc.table;
-import org.apache.flink.connector.jdbc.core.database.dialect.JdbcDialectConverter;
-import org.apache.flink.connector.jdbc.core.datastream.source.reader.extractor.ResultExtractor;
-import org.apache.flink.table.data.RowData;
-import org.apache.flink.util.Preconditions;
+import org.apache.flink.annotation.PublicEvolving;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-/** The result extractor for {@link RowData}. */
-public class RowDataResultExtractor implements ResultExtractor<RowData> {
-
- private final JdbcDialectConverter jdbcDialectConverter;
-
- public RowDataResultExtractor(JdbcDialectConverter jdbcDialectConverter) {
- this.jdbcDialectConverter = Preconditions.checkNotNull(jdbcDialectConverter);
- }
-
- @Override
- public RowData extract(ResultSet resultSet) throws SQLException {
- return jdbcDialectConverter.toInternal(resultSet);
- }
-}
+/**
+ * Options for the JDBC connector.
+ *
+ * @deprecated please use {@link org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions}
+ */
+@PublicEvolving
+@Deprecated
+public class JdbcConnectorOptions
+ extends org.apache.flink.connector.jdbc.core.table.JdbcConnectorOptions {}