You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by wa...@apache.org on 2023/04/18 02:56:18 UTC
[flink-connector-jdbc] branch main updated (b6c3cb2 -> 396f205)
This is an automated email from the ASF dual-hosted git repository.
wanglijie pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git
from b6c3cb2 [FLINK-31759][JDBC] Using sql_connector_download_table shortcode for table document.
new 508b152 [FLINK-31649] Fix archunit ITCase needs minicluster
new 6397c63 [FLINK-31649] Fix archunit returning public(evolving) methods
new 396f205 [FLINK-31649] Fix archunit connectors options must be public
The 3 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:
.../6b9ab1b0-c14d-4667-bab5-407b81fba98b | 36 --------------------
.../b10c194a-0517-4744-830f-81abfb71ab18 | 2 --
.../d45c3af5-52c6-45fd-9926-75e75e77473a | 7 ----
.../connector/jdbc/JdbcExactlyOnceOptions.java | 1 +
.../flink/connector/jdbc/JdbcExecutionOptions.java | 1 +
.../flink/connector/jdbc/catalog/JdbcCatalog.java | 2 ++
.../connector/jdbc/dialect/AbstractDialect.java | 1 +
.../connector/jdbc/internal/JdbcOutputFormat.java | 6 ++--
...ons.java => InternalJdbcConnectionOptions.java} | 14 ++++----
.../jdbc/table/JdbcDynamicTableFactory.java | 13 ++++----
.../connector/jdbc/table/JdbcDynamicTableSink.java | 6 ++--
.../jdbc/table/JdbcDynamicTableSource.java | 6 ++--
.../jdbc/table/JdbcOutputFormatBuilder.java | 6 ++--
.../jdbc/table/JdbcRowDataLookupFunction.java | 4 +--
.../connector/jdbc/xa/JdbcXaSinkFunctionState.java | 3 ++
.../connector/jdbc/xa/XaSinkStateHandler.java | 4 +--
.../apache/flink/connector/jdbc/JdbcITCase.java | 3 +-
.../jdbc/catalog/MySqlCatalogTestBase.java | 3 +-
.../jdbc/catalog/PostgresCatalogTestBase.java | 3 +-
.../connector/jdbc/internal/JdbcFullTest.java | 10 +++---
.../jdbc/internal/JdbcTableOutputFormatTest.java | 12 +++----
...ProviderDriverClassConcurrentLoadingITCase.java | 3 +-
.../jdbc/table/JdbcAppendOnlyWriterTest.java | 4 +--
.../jdbc/table/JdbcDynamicTableFactoryTest.java | 30 ++++++++---------
.../connector/jdbc/table/JdbcOutputFormatTest.java | 38 +++++++++++-----------
.../jdbc/table/JdbcRowDataInputFormatTest.java | 4 +--
.../jdbc/table/JdbcRowDataLookupFunctionTest.java | 6 ++--
.../connector/jdbc/testutils/JdbcITCaseBase.java} | 30 ++++++++---------
28 files changed, 111 insertions(+), 147 deletions(-)
rename flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/options/{JdbcConnectorOptions.java => InternalJdbcConnectionOptions.java} (94%)
copy flink-connector-jdbc/src/{main/java/org/apache/flink/connector/jdbc/internal/converter/DerbyRowConverter.java => test/java/org/apache/flink/connector/jdbc/testutils/JdbcITCaseBase.java} (55%)
[flink-connector-jdbc] 03/03: [FLINK-31649] Fix archunit connectors options must be public
Posted by wa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wanglijie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git
commit 396f205bcbed133d1e7dc0d6c3ce9487dcbc1dd7
Author: Joao Boto <bo...@boto.pro>
AuthorDate: Thu Apr 13 15:00:33 2023 +0200
[FLINK-31649] Fix archunit connectors options must be public
---
.../b10c194a-0517-4744-830f-81abfb71ab18 | 2 --
.../connector/jdbc/internal/JdbcOutputFormat.java | 6 ++--
...ons.java => InternalJdbcConnectionOptions.java} | 14 ++++----
.../jdbc/table/JdbcDynamicTableFactory.java | 13 ++++----
.../connector/jdbc/table/JdbcDynamicTableSink.java | 6 ++--
.../jdbc/table/JdbcDynamicTableSource.java | 6 ++--
.../jdbc/table/JdbcOutputFormatBuilder.java | 6 ++--
.../jdbc/table/JdbcRowDataLookupFunction.java | 4 +--
.../connector/jdbc/internal/JdbcFullTest.java | 10 +++---
.../jdbc/internal/JdbcTableOutputFormatTest.java | 12 +++----
.../jdbc/table/JdbcAppendOnlyWriterTest.java | 4 +--
.../jdbc/table/JdbcDynamicTableFactoryTest.java | 30 ++++++++---------
.../connector/jdbc/table/JdbcOutputFormatTest.java | 38 +++++++++++-----------
.../jdbc/table/JdbcRowDataInputFormatTest.java | 4 +--
.../jdbc/table/JdbcRowDataLookupFunctionTest.java | 6 ++--
15 files changed, 80 insertions(+), 81 deletions(-)
diff --git a/flink-connector-jdbc/archunit-violations/b10c194a-0517-4744-830f-81abfb71ab18 b/flink-connector-jdbc/archunit-violations/b10c194a-0517-4744-830f-81abfb71ab18
index 400c942..e69de29 100644
--- a/flink-connector-jdbc/archunit-violations/b10c194a-0517-4744-830f-81abfb71ab18
+++ b/flink-connector-jdbc/archunit-violations/b10c194a-0517-4744-830f-81abfb71ab18
@@ -1,2 +0,0 @@
-Class <org.apache.flink.connector.jdbc.internal.options.JdbcConnectorOptions> does not reside in a package 'org.apache.flink..table' in (JdbcConnectorOptions.java:0)
-org.apache.flink.connector.jdbc.internal.options.JdbcConnectorOptions does not satisfy: annotated with @PublicEvolving or annotated with @Public
\ No newline at end of file
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/JdbcOutputFormat.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/JdbcOutputFormat.java
index a869f6c..1ca8b63 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/JdbcOutputFormat.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/JdbcOutputFormat.java
@@ -33,7 +33,7 @@ import org.apache.flink.connector.jdbc.JdbcStatementBuilder;
import org.apache.flink.connector.jdbc.internal.connection.JdbcConnectionProvider;
import org.apache.flink.connector.jdbc.internal.connection.SimpleJdbcConnectionProvider;
import org.apache.flink.connector.jdbc.internal.executor.JdbcBatchStatementExecutor;
-import org.apache.flink.connector.jdbc.internal.options.JdbcConnectorOptions;
+import org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions;
import org.apache.flink.connector.jdbc.internal.options.JdbcDmlOptions;
import org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatementImpl;
import org.apache.flink.connector.jdbc.utils.JdbcUtils;
@@ -284,7 +284,7 @@ public class JdbcOutputFormat<In, JdbcIn, JdbcExec extends JdbcBatchStatementExe
/** Builder for a {@link JdbcOutputFormat}. */
public static class Builder {
- private JdbcConnectorOptions options;
+ private InternalJdbcConnectionOptions options;
private String[] fieldNames;
private String[] keyFields;
private int[] fieldTypes;
@@ -292,7 +292,7 @@ public class JdbcOutputFormat<In, JdbcIn, JdbcExec extends JdbcBatchStatementExe
JdbcExecutionOptions.builder();
/** required, jdbc options. */
- public Builder setOptions(JdbcConnectorOptions options) {
+ public Builder setOptions(InternalJdbcConnectionOptions options) {
this.options = options;
return this;
}
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcConnectorOptions.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/options/InternalJdbcConnectionOptions.java
similarity index 94%
rename from flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcConnectorOptions.java
rename to flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/options/InternalJdbcConnectionOptions.java
index 0b2562a..6d9aeca 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/options/JdbcConnectorOptions.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/internal/options/InternalJdbcConnectionOptions.java
@@ -32,7 +32,7 @@ import static org.apache.flink.util.Preconditions.checkNotNull;
/** Options for the JDBC connector. */
@Internal
-public class JdbcConnectorOptions extends JdbcConnectionOptions {
+public class InternalJdbcConnectionOptions extends JdbcConnectionOptions {
private static final long serialVersionUID = 1L;
@@ -40,7 +40,7 @@ public class JdbcConnectorOptions extends JdbcConnectionOptions {
private final JdbcDialect dialect;
private final @Nullable Integer parallelism;
- private JdbcConnectorOptions(
+ private InternalJdbcConnectionOptions(
String dbURL,
String tableName,
@Nullable String driverName,
@@ -73,8 +73,8 @@ public class JdbcConnectorOptions extends JdbcConnectionOptions {
@Override
public boolean equals(Object o) {
- if (o instanceof JdbcConnectorOptions) {
- JdbcConnectorOptions options = (JdbcConnectorOptions) o;
+ if (o instanceof InternalJdbcConnectionOptions) {
+ InternalJdbcConnectionOptions options = (InternalJdbcConnectionOptions) o;
return Objects.equals(url, options.url)
&& Objects.equals(tableName, options.tableName)
&& Objects.equals(driverName, options.driverName)
@@ -103,7 +103,7 @@ public class JdbcConnectorOptions extends JdbcConnectionOptions {
connectionCheckTimeoutSeconds);
}
- /** Builder of {@link JdbcConnectorOptions}. */
+ /** Builder of {@link InternalJdbcConnectionOptions}. */
public static class Builder {
private ClassLoader classLoader;
private String dbURL;
@@ -181,7 +181,7 @@ public class JdbcConnectorOptions extends JdbcConnectionOptions {
return this;
}
- public JdbcConnectorOptions build() {
+ public InternalJdbcConnectionOptions build() {
checkNotNull(dbURL, "No dbURL supplied.");
checkNotNull(tableName, "No tableName supplied.");
if (this.dialect == null) {
@@ -197,7 +197,7 @@ public class JdbcConnectorOptions extends JdbcConnectionOptions {
() -> new NullPointerException("No driverName supplied."));
}
- return new JdbcConnectorOptions(
+ return new InternalJdbcConnectionOptions(
dialect.appendDefaultUrlProperties(dbURL),
tableName,
driverName,
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactory.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactory.java
index bff5a49..3434f60 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactory.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactory.java
@@ -25,7 +25,7 @@ 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.internal.options.JdbcConnectorOptions;
+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;
import org.apache.flink.table.connector.sink.DynamicTableSink;
@@ -90,7 +90,8 @@ public class JdbcDynamicTableFactory implements DynamicTableSourceFactory, Dynam
validateConfigOptions(config, context.getClassLoader());
validateDataTypeWithJdbcDialect(
context.getPhysicalRowDataType(), config.get(URL), context.getClassLoader());
- JdbcConnectorOptions jdbcOptions = getJdbcOptions(config, context.getClassLoader());
+ InternalJdbcConnectionOptions jdbcOptions =
+ getJdbcOptions(config, context.getClassLoader());
return new JdbcDynamicTableSink(
jdbcOptions,
@@ -126,11 +127,11 @@ public class JdbcDynamicTableFactory implements DynamicTableSourceFactory, Dynam
dialect.validate((RowType) dataType.getLogicalType());
}
- private JdbcConnectorOptions getJdbcOptions(
+ private InternalJdbcConnectionOptions getJdbcOptions(
ReadableConfig readableConfig, ClassLoader classLoader) {
final String url = readableConfig.get(URL);
- final JdbcConnectorOptions.Builder builder =
- JdbcConnectorOptions.builder()
+ final InternalJdbcConnectionOptions.Builder builder =
+ InternalJdbcConnectionOptions.builder()
.setClassLoader(classLoader)
.setDBUrl(url)
.setTableName(readableConfig.get(TABLE_NAME))
@@ -169,7 +170,7 @@ public class JdbcDynamicTableFactory implements DynamicTableSourceFactory, Dynam
}
private JdbcDmlOptions getJdbcDmlOptions(
- JdbcConnectorOptions jdbcOptions, DataType dataType, int[] primaryKeyIndexes) {
+ InternalJdbcConnectionOptions jdbcOptions, DataType dataType, int[] primaryKeyIndexes) {
String[] keyFields =
Arrays.stream(primaryKeyIndexes)
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSink.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSink.java
index 03256ff..6140a22 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSink.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSink.java
@@ -22,7 +22,7 @@ import org.apache.flink.annotation.Internal;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
import org.apache.flink.connector.jdbc.internal.GenericJdbcSinkFunction;
-import org.apache.flink.connector.jdbc.internal.options.JdbcConnectorOptions;
+import org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions;
import org.apache.flink.connector.jdbc.internal.options.JdbcDmlOptions;
import org.apache.flink.table.connector.ChangelogMode;
import org.apache.flink.table.connector.sink.DynamicTableSink;
@@ -39,14 +39,14 @@ import static org.apache.flink.util.Preconditions.checkState;
@Internal
public class JdbcDynamicTableSink implements DynamicTableSink {
- private final JdbcConnectorOptions jdbcOptions;
+ private final InternalJdbcConnectionOptions jdbcOptions;
private final JdbcExecutionOptions executionOptions;
private final JdbcDmlOptions dmlOptions;
private final DataType physicalRowDataType;
private final String dialectName;
public JdbcDynamicTableSink(
- JdbcConnectorOptions jdbcOptions,
+ InternalJdbcConnectionOptions jdbcOptions,
JdbcExecutionOptions executionOptions,
JdbcDmlOptions dmlOptions,
DataType physicalRowDataType) {
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSource.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSource.java
index e27cf63..48e1702 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSource.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableSource.java
@@ -20,7 +20,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.internal.options.JdbcConnectorOptions;
+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;
import org.apache.flink.connector.jdbc.split.JdbcGenericParameterValuesProvider;
@@ -68,7 +68,7 @@ public class JdbcDynamicTableSource
SupportsFilterPushDown {
private static final Logger LOG = LoggerFactory.getLogger(JdbcDynamicTableSource.class);
- private final JdbcConnectorOptions options;
+ private final InternalJdbcConnectionOptions options;
private final JdbcReadOptions readOptions;
private final int lookupMaxRetryTimes;
@Nullable private final LookupCache cache;
@@ -79,7 +79,7 @@ public class JdbcDynamicTableSource
private Serializable[] pushdownParams = new Serializable[0];
public JdbcDynamicTableSource(
- JdbcConnectorOptions options,
+ InternalJdbcConnectionOptions options,
JdbcReadOptions readOptions,
int lookupMaxRetryTimes,
@Nullable LookupCache cache,
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatBuilder.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatBuilder.java
index df2031b..8427f29 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatBuilder.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatBuilder.java
@@ -31,7 +31,7 @@ import org.apache.flink.connector.jdbc.internal.executor.TableBufferReducedState
import org.apache.flink.connector.jdbc.internal.executor.TableBufferedStatementExecutor;
import org.apache.flink.connector.jdbc.internal.executor.TableInsertOrUpdateStatementExecutor;
import org.apache.flink.connector.jdbc.internal.executor.TableSimpleStatementExecutor;
-import org.apache.flink.connector.jdbc.internal.options.JdbcConnectorOptions;
+import org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions;
import org.apache.flink.connector.jdbc.internal.options.JdbcDmlOptions;
import org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatement;
import org.apache.flink.table.data.GenericRowData;
@@ -53,7 +53,7 @@ public class JdbcOutputFormatBuilder implements Serializable {
private static final long serialVersionUID = 1L;
- private JdbcConnectorOptions jdbcOptions;
+ private InternalJdbcConnectionOptions jdbcOptions;
private JdbcExecutionOptions executionOptions;
private JdbcDmlOptions dmlOptions;
private TypeInformation<RowData> rowDataTypeInformation;
@@ -61,7 +61,7 @@ public class JdbcOutputFormatBuilder implements Serializable {
public JdbcOutputFormatBuilder() {}
- public JdbcOutputFormatBuilder setJdbcOptions(JdbcConnectorOptions jdbcOptions) {
+ public JdbcOutputFormatBuilder setJdbcOptions(InternalJdbcConnectionOptions jdbcOptions) {
this.jdbcOptions = jdbcOptions;
return this;
}
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunction.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunction.java
index cb344b2..4d327b4 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunction.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunction.java
@@ -24,7 +24,7 @@ import org.apache.flink.connector.jdbc.converter.JdbcRowConverter;
import org.apache.flink.connector.jdbc.dialect.JdbcDialect;
import org.apache.flink.connector.jdbc.internal.connection.JdbcConnectionProvider;
import org.apache.flink.connector.jdbc.internal.connection.SimpleJdbcConnectionProvider;
-import org.apache.flink.connector.jdbc.internal.options.JdbcConnectorOptions;
+import org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions;
import org.apache.flink.connector.jdbc.statement.FieldNamedPreparedStatement;
import org.apache.flink.table.data.RowData;
import org.apache.flink.table.functions.FunctionContext;
@@ -66,7 +66,7 @@ public class JdbcRowDataLookupFunction extends LookupFunction {
private transient FieldNamedPreparedStatement statement;
public JdbcRowDataLookupFunction(
- JdbcConnectorOptions options,
+ InternalJdbcConnectionOptions options,
int maxRetryTimes,
String[] fieldNames,
DataType[] fieldTypes,
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcFullTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcFullTest.java
index 057bbb0..d41b685 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcFullTest.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcFullTest.java
@@ -23,14 +23,13 @@ import org.apache.flink.api.common.functions.RuntimeContext;
import org.apache.flink.api.java.DataSet;
import org.apache.flink.api.java.ExecutionEnvironment;
import org.apache.flink.api.java.tuple.Tuple2;
-import org.apache.flink.connector.jdbc.JdbcConnectionOptions;
import org.apache.flink.connector.jdbc.JdbcDataTestBase;
import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
import org.apache.flink.connector.jdbc.JdbcInputFormat;
import org.apache.flink.connector.jdbc.JdbcStatementBuilder;
import org.apache.flink.connector.jdbc.internal.connection.SimpleJdbcConnectionProvider;
import org.apache.flink.connector.jdbc.internal.executor.JdbcBatchStatementExecutor;
-import org.apache.flink.connector.jdbc.internal.options.JdbcConnectorOptions;
+import org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions;
import org.apache.flink.connector.jdbc.split.JdbcNumericBetweenParametersProvider;
import org.apache.flink.types.Row;
@@ -79,7 +78,7 @@ class JdbcFullTest extends JdbcDataTestBase {
JdbcOutputFormat jdbcOutputFormat =
JdbcOutputFormat.builder()
.setOptions(
- JdbcConnectorOptions.builder()
+ InternalJdbcConnectionOptions.builder()
.setDBUrl(getMetadata().getJdbcUrl())
.setTableName(OUTPUT_TABLE)
.build())
@@ -136,8 +135,9 @@ class JdbcFullTest extends JdbcDataTestBase {
// NOTE: in this case (with Derby driver) setSqlTypes could be skipped, but
// some databases don't null values correctly when no column type was specified
// in PreparedStatement.setObject (see its javadoc for more details)
- JdbcConnectionOptions connectionOptions =
- new JdbcConnectionOptions.JdbcConnectionOptionsBuilder()
+ org.apache.flink.connector.jdbc.JdbcConnectionOptions connectionOptions =
+ new org.apache.flink.connector.jdbc.JdbcConnectionOptions
+ .JdbcConnectionOptionsBuilder()
.withUrl(getMetadata().getJdbcUrl())
.withDriverName(getMetadata().getDriverClass())
.build();
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcTableOutputFormatTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcTableOutputFormatTest.java
index 11eca03..d0caddf 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcTableOutputFormatTest.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/JdbcTableOutputFormatTest.java
@@ -25,7 +25,7 @@ import org.apache.flink.connector.jdbc.JdbcDataTestBase;
import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
import org.apache.flink.connector.jdbc.internal.connection.SimpleJdbcConnectionProvider;
import org.apache.flink.connector.jdbc.internal.executor.JdbcBatchStatementExecutor;
-import org.apache.flink.connector.jdbc.internal.options.JdbcConnectorOptions;
+import org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions;
import org.apache.flink.connector.jdbc.internal.options.JdbcDmlOptions;
import org.apache.flink.types.Row;
@@ -65,8 +65,8 @@ public class JdbcTableOutputFormatTest extends JdbcDataTestBase {
@Test
void testUpsertFormatCloseBeforeOpen() throws Exception {
- JdbcConnectorOptions options =
- JdbcConnectorOptions.builder()
+ InternalJdbcConnectionOptions options =
+ InternalJdbcConnectionOptions.builder()
.setDBUrl(getMetadata().getJdbcUrl())
.setTableName(OUTPUT_TABLE)
.build();
@@ -101,7 +101,7 @@ public class JdbcTableOutputFormatTest extends JdbcDataTestBase {
format =
new TableJdbcUpsertOutputFormat(
new SimpleJdbcConnectionProvider(
- JdbcConnectorOptions.builder()
+ InternalJdbcConnectionOptions.builder()
.setDBUrl(getMetadata().getJdbcUrl())
.setTableName(OUTPUT_TABLE)
.build()) {
@@ -172,8 +172,8 @@ public class JdbcTableOutputFormatTest extends JdbcDataTestBase {
@Test
void testJdbcOutputFormat() throws Exception {
- JdbcConnectorOptions options =
- JdbcConnectorOptions.builder()
+ InternalJdbcConnectionOptions options =
+ InternalJdbcConnectionOptions.builder()
.setDBUrl(getMetadata().getJdbcUrl())
.setTableName(OUTPUT_TABLE)
.build();
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcAppendOnlyWriterTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcAppendOnlyWriterTest.java
index f0407dc..5e93b01 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcAppendOnlyWriterTest.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcAppendOnlyWriterTest.java
@@ -25,7 +25,7 @@ import org.apache.flink.connector.jdbc.JdbcTestBase;
import org.apache.flink.connector.jdbc.databases.DatabaseMetadata;
import org.apache.flink.connector.jdbc.dialect.JdbcDialectLoader;
import org.apache.flink.connector.jdbc.internal.JdbcOutputFormat;
-import org.apache.flink.connector.jdbc.internal.options.JdbcConnectorOptions;
+import org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -62,7 +62,7 @@ class JdbcAppendOnlyWriterTest extends JdbcTestBase {
format =
JdbcOutputFormat.builder()
.setOptions(
- JdbcConnectorOptions.builder()
+ InternalJdbcConnectionOptions.builder()
.setDBUrl(getMetadata().getJdbcUrl())
.setDialect(
JdbcDialectLoader.load(
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactoryTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactoryTest.java
index 44d4d65..a23bf19 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactoryTest.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcDynamicTableFactoryTest.java
@@ -20,7 +20,7 @@ package org.apache.flink.connector.jdbc.table;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
-import org.apache.flink.connector.jdbc.internal.options.JdbcConnectorOptions;
+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;
import org.apache.flink.table.api.DataTypes;
@@ -72,8 +72,8 @@ class JdbcDynamicTableFactoryTest {
// validation for source
DynamicTableSource actualSource = createTableSource(SCHEMA, properties);
- JdbcConnectorOptions options =
- JdbcConnectorOptions.builder()
+ InternalJdbcConnectionOptions options =
+ InternalJdbcConnectionOptions.builder()
.setDBUrl("jdbc:derby:memory:mydb")
.setTableName("mytable")
.setDriverName("org.apache.derby.jdbc.EmbeddedDriver")
@@ -124,8 +124,8 @@ class JdbcDynamicTableFactoryTest {
DynamicTableSource actual = createTableSource(SCHEMA, properties);
- JdbcConnectorOptions options =
- JdbcConnectorOptions.builder()
+ InternalJdbcConnectionOptions options =
+ InternalJdbcConnectionOptions.builder()
.setDBUrl("jdbc:derby:memory:mydb")
.setTableName("mytable")
.build();
@@ -161,8 +161,8 @@ class JdbcDynamicTableFactoryTest {
DynamicTableSource actual = createTableSource(SCHEMA, properties);
- JdbcConnectorOptions options =
- JdbcConnectorOptions.builder()
+ InternalJdbcConnectionOptions options =
+ InternalJdbcConnectionOptions.builder()
.setDBUrl("jdbc:derby:memory:mydb")
.setTableName("mytable")
.build();
@@ -186,8 +186,8 @@ class JdbcDynamicTableFactoryTest {
DynamicTableSource actual = createTableSource(SCHEMA, properties);
- JdbcConnectorOptions options =
- JdbcConnectorOptions.builder()
+ InternalJdbcConnectionOptions options =
+ InternalJdbcConnectionOptions.builder()
.setDBUrl("jdbc:derby:memory:mydb")
.setTableName("mytable")
.build();
@@ -214,8 +214,8 @@ class JdbcDynamicTableFactoryTest {
DynamicTableSink actual = createTableSink(SCHEMA, properties);
- JdbcConnectorOptions options =
- JdbcConnectorOptions.builder()
+ InternalJdbcConnectionOptions options =
+ InternalJdbcConnectionOptions.builder()
.setDBUrl("jdbc:derby:memory:mydb")
.setTableName("mytable")
.build();
@@ -247,8 +247,8 @@ class JdbcDynamicTableFactoryTest {
DynamicTableSink actual = createTableSink(SCHEMA, properties);
- JdbcConnectorOptions options =
- JdbcConnectorOptions.builder()
+ InternalJdbcConnectionOptions options =
+ InternalJdbcConnectionOptions.builder()
.setDBUrl("jdbc:derby:memory:mydb")
.setTableName("mytable")
.setParallelism(2)
@@ -371,8 +371,8 @@ class JdbcDynamicTableFactoryTest {
DynamicTableSource actual = createTableSource(SCHEMA, properties);
- JdbcConnectorOptions options =
- JdbcConnectorOptions.builder()
+ InternalJdbcConnectionOptions options =
+ InternalJdbcConnectionOptions.builder()
.setDBUrl("jdbc:derby:memory:mydb")
.setTableName("mytable")
.build();
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatTest.java
index 897d485..dacacce 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatTest.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcOutputFormatTest.java
@@ -21,7 +21,7 @@ package org.apache.flink.connector.jdbc.table;
import org.apache.flink.connector.jdbc.JdbcDataTestBase;
import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
import org.apache.flink.connector.jdbc.internal.JdbcOutputFormat;
-import org.apache.flink.connector.jdbc.internal.options.JdbcConnectorOptions;
+import org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions;
import org.apache.flink.connector.jdbc.internal.options.JdbcDmlOptions;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.table.data.RowData;
@@ -89,8 +89,8 @@ class JdbcOutputFormatTest extends JdbcDataTestBase {
String expectedMsg = "unable to open JDBC writer";
assertThatThrownBy(
() -> {
- JdbcConnectorOptions jdbcOptions =
- JdbcConnectorOptions.builder()
+ InternalJdbcConnectionOptions jdbcOptions =
+ InternalJdbcConnectionOptions.builder()
.setDriverName("org.apache.derby.jdbc.idontexist")
.setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl())
.setTableName(INPUT_TABLE)
@@ -120,8 +120,8 @@ class JdbcOutputFormatTest extends JdbcDataTestBase {
void testInvalidURL() {
assertThatThrownBy(
() -> {
- JdbcConnectorOptions jdbcOptions =
- JdbcConnectorOptions.builder()
+ InternalJdbcConnectionOptions jdbcOptions =
+ InternalJdbcConnectionOptions.builder()
.setDriverName(DERBY_EBOOKSHOP_DB.getDriverClass())
.setDBUrl("jdbc:der:iamanerror:mory:ebookshop")
.setTableName(INPUT_TABLE)
@@ -150,8 +150,8 @@ class JdbcOutputFormatTest extends JdbcDataTestBase {
void testIncompatibleTypes() {
assertThatThrownBy(
() -> {
- JdbcConnectorOptions jdbcOptions =
- JdbcConnectorOptions.builder()
+ InternalJdbcConnectionOptions jdbcOptions =
+ InternalJdbcConnectionOptions.builder()
.setDriverName(DERBY_EBOOKSHOP_DB.getDriverClass())
.setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl())
.setTableName(INPUT_TABLE)
@@ -189,8 +189,8 @@ class JdbcOutputFormatTest extends JdbcDataTestBase {
void testExceptionOnInvalidType() {
assertThatThrownBy(
() -> {
- JdbcConnectorOptions jdbcOptions =
- JdbcConnectorOptions.builder()
+ InternalJdbcConnectionOptions jdbcOptions =
+ InternalJdbcConnectionOptions.builder()
.setDriverName(DERBY_EBOOKSHOP_DB.getDriverClass())
.setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl())
.setTableName(OUTPUT_TABLE)
@@ -230,8 +230,8 @@ class JdbcOutputFormatTest extends JdbcDataTestBase {
String expectedMsg = "Writing records to JDBC failed.";
assertThatThrownBy(
() -> {
- JdbcConnectorOptions jdbcOptions =
- JdbcConnectorOptions.builder()
+ InternalJdbcConnectionOptions jdbcOptions =
+ InternalJdbcConnectionOptions.builder()
.setDriverName(DERBY_EBOOKSHOP_DB.getDriverClass())
.setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl())
.setTableName(OUTPUT_TABLE)
@@ -276,8 +276,8 @@ class JdbcOutputFormatTest extends JdbcDataTestBase {
@Test
void testJdbcOutputFormat() throws IOException, SQLException {
- JdbcConnectorOptions jdbcOptions =
- JdbcConnectorOptions.builder()
+ InternalJdbcConnectionOptions jdbcOptions =
+ InternalJdbcConnectionOptions.builder()
.setDriverName(DERBY_EBOOKSHOP_DB.getDriverClass())
.setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl())
.setTableName(OUTPUT_TABLE)
@@ -329,8 +329,8 @@ class JdbcOutputFormatTest extends JdbcDataTestBase {
@Test
void testFlush() throws SQLException, IOException {
- JdbcConnectorOptions jdbcOptions =
- JdbcConnectorOptions.builder()
+ InternalJdbcConnectionOptions jdbcOptions =
+ InternalJdbcConnectionOptions.builder()
.setDriverName(DERBY_EBOOKSHOP_DB.getDriverClass())
.setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl())
.setTableName(OUTPUT_TABLE_2)
@@ -399,8 +399,8 @@ class JdbcOutputFormatTest extends JdbcDataTestBase {
@Test
void testFlushWithBatchSizeEqualsZero() throws SQLException, IOException {
- JdbcConnectorOptions jdbcOptions =
- JdbcConnectorOptions.builder()
+ InternalJdbcConnectionOptions jdbcOptions =
+ InternalJdbcConnectionOptions.builder()
.setDriverName(DERBY_EBOOKSHOP_DB.getDriverClass())
.setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl())
.setTableName(OUTPUT_TABLE_2)
@@ -446,8 +446,8 @@ class JdbcOutputFormatTest extends JdbcDataTestBase {
@Test
void testInvalidConnectionInJdbcOutputFormat() throws IOException, SQLException {
- JdbcConnectorOptions jdbcOptions =
- JdbcConnectorOptions.builder()
+ InternalJdbcConnectionOptions jdbcOptions =
+ InternalJdbcConnectionOptions.builder()
.setDriverName(DERBY_EBOOKSHOP_DB.getDriverClass())
.setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl())
.setTableName(OUTPUT_TABLE_3)
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormatTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormatTest.java
index 013e55e..a0040a2 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormatTest.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataInputFormatTest.java
@@ -21,7 +21,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.internal.options.JdbcConnectorOptions;
+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;
import org.apache.flink.connector.jdbc.split.JdbcParameterValuesProvider;
@@ -66,7 +66,7 @@ class JdbcRowDataInputFormatTest extends JdbcDataTestBase {
DataTypes.INT()
};
final JdbcDialect dialect =
- JdbcConnectorOptions.builder()
+ InternalJdbcConnectionOptions.builder()
.setDBUrl(DERBY_EBOOKSHOP_DB.getJdbcUrl())
.setTableName(INPUT_TABLE)
.build()
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunctionTest.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunctionTest.java
index 72b083e..5759c52 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunctionTest.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/table/JdbcRowDataLookupFunctionTest.java
@@ -18,7 +18,7 @@
package org.apache.flink.connector.jdbc.table;
-import org.apache.flink.connector.jdbc.internal.options.JdbcConnectorOptions;
+import org.apache.flink.connector.jdbc.internal.options.InternalJdbcConnectionOptions;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.table.connector.source.lookup.LookupOptions;
import org.apache.flink.table.data.RowData;
@@ -84,8 +84,8 @@ class JdbcRowDataLookupFunctionTest extends JdbcLookupTestBase {
}
private JdbcRowDataLookupFunction buildRowDataLookupFunction(boolean withFailure) {
- JdbcConnectorOptions jdbcOptions =
- JdbcConnectorOptions.builder()
+ InternalJdbcConnectionOptions jdbcOptions =
+ InternalJdbcConnectionOptions.builder()
.setDriverName(DERBY_EBOOKSHOP_DB.getDriverClass())
.setDBUrl(DB_URL)
.setTableName(LOOKUP_TABLE)
[flink-connector-jdbc] 01/03: [FLINK-31649] Fix archunit ITCase needs minicluster
Posted by wa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wanglijie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git
commit 508b152bf7ee50643b6b3844f20289b6461e3c25
Author: Joao Boto <bo...@boto.pro>
AuthorDate: Tue Mar 28 17:18:35 2023 +0200
[FLINK-31649] Fix archunit ITCase needs minicluster
---
.../6b9ab1b0-c14d-4667-bab5-407b81fba98b | 36 ----------------------
.../apache/flink/connector/jdbc/JdbcITCase.java | 3 +-
.../jdbc/catalog/MySqlCatalogTestBase.java | 3 +-
.../jdbc/catalog/PostgresCatalogTestBase.java | 3 +-
...ProviderDriverClassConcurrentLoadingITCase.java | 3 +-
.../connector/jdbc/testutils/JdbcITCaseBase.java | 36 ++++++++++++++++++++++
6 files changed, 44 insertions(+), 40 deletions(-)
diff --git a/flink-connector-jdbc/archunit-violations/6b9ab1b0-c14d-4667-bab5-407b81fba98b b/flink-connector-jdbc/archunit-violations/6b9ab1b0-c14d-4667-bab5-407b81fba98b
index e54d3ff..e69de29 100644
--- a/flink-connector-jdbc/archunit-violations/6b9ab1b0-c14d-4667-bab5-407b81fba98b
+++ b/flink-connector-jdbc/archunit-violations/6b9ab1b0-c14d-4667-bab5-407b81fba98b
@@ -1,36 +0,0 @@
-org.apache.flink.connector.jdbc.JdbcITCase does not satisfy: only one of the following predicates match:\
-* reside in a package 'org.apache.flink.runtime.*' and contain any fields that are static, final, and of type InternalMiniClusterExtension and annotated with @RegisterExtension\
-* reside outside of package 'org.apache.flink.runtime.*' and contain any fields that are static, final, and of type MiniClusterExtension and annotated with @RegisterExtension\
-* reside in a package 'org.apache.flink.runtime.*' and is annotated with @ExtendWith with class InternalMiniClusterExtension\
-* reside outside of package 'org.apache.flink.runtime.*' and is annotated with @ExtendWith with class MiniClusterExtension\
- or contain any fields that are public, static, and of type MiniClusterWithClientResource and final and annotated with @ClassRule or contain any fields that is of type MiniClusterWithClientResource and public and final and not static and annotated with @Rule
-org.apache.flink.connector.jdbc.catalog.MySqlCatalogITCase does not satisfy: only one of the following predicates match:\
-* reside in a package 'org.apache.flink.runtime.*' and contain any fields that are static, final, and of type InternalMiniClusterExtension and annotated with @RegisterExtension\
-* reside outside of package 'org.apache.flink.runtime.*' and contain any fields that are static, final, and of type MiniClusterExtension and annotated with @RegisterExtension\
-* reside in a package 'org.apache.flink.runtime.*' and is annotated with @ExtendWith with class InternalMiniClusterExtension\
-* reside outside of package 'org.apache.flink.runtime.*' and is annotated with @ExtendWith with class MiniClusterExtension\
- or contain any fields that are public, static, and of type MiniClusterWithClientResource and final and annotated with @ClassRule or contain any fields that is of type MiniClusterWithClientResource and public and final and not static and annotated with @Rule
-org.apache.flink.connector.jdbc.catalog.MySql57CatalogITCase does not satisfy: only one of the following predicates match:\
-* reside in a package 'org.apache.flink.runtime.*' and contain any fields that are static, final, and of type InternalMiniClusterExtension and annotated with @RegisterExtension\
-* reside outside of package 'org.apache.flink.runtime.*' and contain any fields that are static, final, and of type MiniClusterExtension and annotated with @RegisterExtension\
-* reside in a package 'org.apache.flink.runtime.*' and is annotated with @ExtendWith with class InternalMiniClusterExtension\
-* reside outside of package 'org.apache.flink.runtime.*' and is annotated with @ExtendWith with class MiniClusterExtension\
- or contain any fields that are public, static, and of type MiniClusterWithClientResource and final and annotated with @ClassRule or contain any fields that is of type MiniClusterWithClientResource and public and final and not static and annotated with @Rule
-org.apache.flink.connector.jdbc.catalog.MySql56CatalogITCase does not satisfy: only one of the following predicates match:\
-* reside in a package 'org.apache.flink.runtime.*' and contain any fields that are static, final, and of type InternalMiniClusterExtension and annotated with @RegisterExtension\
-* reside outside of package 'org.apache.flink.runtime.*' and contain any fields that are static, final, and of type MiniClusterExtension and annotated with @RegisterExtension\
-* reside in a package 'org.apache.flink.runtime.*' and is annotated with @ExtendWith with class InternalMiniClusterExtension\
-* reside outside of package 'org.apache.flink.runtime.*' and is annotated with @ExtendWith with class MiniClusterExtension\
- or contain any fields that are public, static, and of type MiniClusterWithClientResource and final and annotated with @ClassRule or contain any fields that is of type MiniClusterWithClientResource and public and final and not static and annotated with @Rule
-org.apache.flink.connector.jdbc.catalog.PostgresCatalogITCase does not satisfy: only one of the following predicates match:\
-* reside in a package 'org.apache.flink.runtime.*' and contain any fields that are static, final, and of type InternalMiniClusterExtension and annotated with @RegisterExtension\
-* reside outside of package 'org.apache.flink.runtime.*' and contain any fields that are static, final, and of type MiniClusterExtension and annotated with @RegisterExtension\
-* reside in a package 'org.apache.flink.runtime.*' and is annotated with @ExtendWith with class InternalMiniClusterExtension\
-* reside outside of package 'org.apache.flink.runtime.*' and is annotated with @ExtendWith with class MiniClusterExtension\
- or contain any fields that are public, static, and of type MiniClusterWithClientResource and final and annotated with @ClassRule or contain any fields that is of type MiniClusterWithClientResource and public and final and not static and annotated with @Rule
-org.apache.flink.connector.jdbc.internal.connection.SimpleJdbcConnectionProviderDriverClassConcurrentLoadingITCase does not satisfy: only one of the following predicates match:\
-* reside in a package 'org.apache.flink.runtime.*' and contain any fields that are static, final, and of type InternalMiniClusterExtension and annotated with @RegisterExtension\
-* reside outside of package 'org.apache.flink.runtime.*' and contain any fields that are static, final, and of type MiniClusterExtension and annotated with @RegisterExtension\
-* reside in a package 'org.apache.flink.runtime.*' and is annotated with @ExtendWith with class InternalMiniClusterExtension\
-* reside outside of package 'org.apache.flink.runtime.*' and is annotated with @ExtendWith with class MiniClusterExtension\
- or contain any fields that are public, static, and of type MiniClusterWithClientResource and final and annotated with @ClassRule or contain any fields that is of type MiniClusterWithClientResource and public and final and not static and annotated with @Rule
\ No newline at end of file
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcITCase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcITCase.java
index 8c521dc..7dfc03f 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcITCase.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/JdbcITCase.java
@@ -20,6 +20,7 @@ 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.databases.DatabaseMetadata;
+import org.apache.flink.connector.jdbc.testutils.JdbcITCaseBase;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.util.function.FunctionWithException;
@@ -48,7 +49,7 @@ 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. */
-public class JdbcITCase extends JdbcTestBase {
+public class JdbcITCase extends JdbcTestBase implements JdbcITCaseBase {
public static final JdbcStatementBuilder<TestEntry> TEST_ENTRY_JDBC_STATEMENT_BUILDER =
(ps, t) -> {
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/MySqlCatalogTestBase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/MySqlCatalogTestBase.java
index e46b029..a521d90 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/MySqlCatalogTestBase.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/MySqlCatalogTestBase.java
@@ -18,6 +18,7 @@
package org.apache.flink.connector.jdbc.catalog;
+import org.apache.flink.connector.jdbc.testutils.JdbcITCaseBase;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.table.api.EnvironmentSettings;
import org.apache.flink.table.api.Schema;
@@ -56,7 +57,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
/** Test base for {@link MySqlCatalog}. */
-abstract class MySqlCatalogTestBase {
+abstract class MySqlCatalogTestBase implements JdbcITCaseBase {
public static final Logger LOG = LoggerFactory.getLogger(MySqlCatalogTestBase.class);
protected static final String TEST_CATALOG_NAME = "mysql_catalog";
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/PostgresCatalogTestBase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/PostgresCatalogTestBase.java
index bd3b982..f5a5e34 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/PostgresCatalogTestBase.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/PostgresCatalogTestBase.java
@@ -19,6 +19,7 @@
package org.apache.flink.connector.jdbc.catalog;
import org.apache.flink.connector.jdbc.databases.postgres.PostgresDatabase;
+import org.apache.flink.connector.jdbc.testutils.JdbcITCaseBase;
import org.apache.flink.table.api.DataTypes;
import org.apache.flink.table.api.Schema;
import org.apache.flink.table.types.logical.DecimalType;
@@ -33,7 +34,7 @@ import java.sql.SQLException;
import java.sql.Statement;
/** Test base for {@link PostgresCatalog}. */
-class PostgresCatalogTestBase implements PostgresDatabase {
+class PostgresCatalogTestBase implements PostgresDatabase, JdbcITCaseBase {
public static final Logger LOG = LoggerFactory.getLogger(PostgresCatalogTestBase.class);
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/connection/SimpleJdbcConnectionProviderDriverClassConcurrentLoadingITCase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/connection/SimpleJdbcConnectionProviderDriverClassConcurrentLoadingITCase.java
index 5fb3676..da66317 100644
--- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/connection/SimpleJdbcConnectionProviderDriverClassConcurrentLoadingITCase.java
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/internal/connection/SimpleJdbcConnectionProviderDriverClassConcurrentLoadingITCase.java
@@ -20,6 +20,7 @@ package org.apache.flink.connector.jdbc.internal.connection;
import org.apache.flink.connector.jdbc.JdbcConnectionOptions;
import org.apache.flink.connector.jdbc.fakedb.FakeDBUtils;
+import org.apache.flink.connector.jdbc.testutils.JdbcITCaseBase;
import org.apache.flink.core.testutils.CheckedThread;
import org.junit.jupiter.api.Test;
@@ -37,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* This test deals with sql driver class loading issues; run as an ITCase so it won't be interfered
* with by other tests.
*/
-class SimpleJdbcConnectionProviderDriverClassConcurrentLoadingITCase {
+class SimpleJdbcConnectionProviderDriverClassConcurrentLoadingITCase implements JdbcITCaseBase {
private static boolean isClassLoaded(ClassLoader classLoader, String className)
throws Exception {
do {
diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/JdbcITCaseBase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/JdbcITCaseBase.java
new file mode 100644
index 0000000..0ce74f4
--- /dev/null
+++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/testutils/JdbcITCaseBase.java
@@ -0,0 +1,36 @@
+/*
+ * 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.testutils;
+
+import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration;
+import org.apache.flink.test.junit5.MiniClusterExtension;
+
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+/** A base for ITCase implementations. */
+public interface JdbcITCaseBase {
+
+ @RegisterExtension
+ MiniClusterExtension MINI_CLUSTER =
+ new MiniClusterExtension(
+ new MiniClusterResourceConfiguration.Builder()
+ .setNumberTaskManagers(2)
+ .setNumberSlotsPerTaskManager(2)
+ .build());
+}
[flink-connector-jdbc] 02/03: [FLINK-31649] Fix archunit returning public(evolving) methods
Posted by wa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wanglijie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git
commit 6397c637e8d2b5c5223b769b453692b8f03ae927
Author: Joao Boto <bo...@boto.pro>
AuthorDate: Mon Apr 17 11:35:23 2023 +0200
[FLINK-31649] Fix archunit returning public(evolving) methods
---
.../archunit-violations/d45c3af5-52c6-45fd-9926-75e75e77473a | 7 -------
.../org/apache/flink/connector/jdbc/JdbcExactlyOnceOptions.java | 1 +
.../java/org/apache/flink/connector/jdbc/JdbcExecutionOptions.java | 1 +
.../java/org/apache/flink/connector/jdbc/catalog/JdbcCatalog.java | 2 ++
.../org/apache/flink/connector/jdbc/dialect/AbstractDialect.java | 1 +
.../apache/flink/connector/jdbc/xa/JdbcXaSinkFunctionState.java | 3 +++
.../org/apache/flink/connector/jdbc/xa/XaSinkStateHandler.java | 4 ++--
7 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/flink-connector-jdbc/archunit-violations/d45c3af5-52c6-45fd-9926-75e75e77473a b/flink-connector-jdbc/archunit-violations/d45c3af5-52c6-45fd-9926-75e75e77473a
index 4f453d5..e69de29 100644
--- a/flink-connector-jdbc/archunit-violations/d45c3af5-52c6-45fd-9926-75e75e77473a
+++ b/flink-connector-jdbc/archunit-violations/d45c3af5-52c6-45fd-9926-75e75e77473a
@@ -1,7 +0,0 @@
-org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions.builder(): Returned leaf type org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions$JDBCExactlyOnceOptionsBuilder does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated
-org.apache.flink.connector.jdbc.JdbcExecutionOptions.builder(): Returned leaf type org.apache.flink.connector.jdbc.JdbcExecutionOptions$Builder does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated
-org.apache.flink.connector.jdbc.catalog.JdbcCatalog.getInternal(): Returned leaf type org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated
-org.apache.flink.connector.jdbc.dialect.AbstractDialect.decimalPrecisionRange(): Returned leaf type org.apache.flink.connector.jdbc.dialect.AbstractDialect$Range does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated
-org.apache.flink.connector.jdbc.dialect.AbstractDialect.timestampPrecisionRange(): Returned leaf type org.apache.flink.connector.jdbc.dialect.AbstractDialect$Range does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated
-org.apache.flink.connector.jdbc.xa.XaSinkStateHandler.load(org.apache.flink.runtime.state.FunctionInitializationContext): Returned leaf type org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunctionState does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated
-org.apache.flink.connector.jdbc.xa.XaSinkStateHandler.store(org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunctionState): Argument leaf type org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunctionState does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated
\ No newline at end of file
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcExactlyOnceOptions.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcExactlyOnceOptions.java
index c17ed17..47332d4 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcExactlyOnceOptions.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcExactlyOnceOptions.java
@@ -104,6 +104,7 @@ public class JdbcExactlyOnceOptions implements Serializable {
}
/** JDBCExactlyOnceOptionsBuilder. */
+ @PublicEvolving
public static class JDBCExactlyOnceOptionsBuilder {
private boolean recoveredAndRollback = DEFAULT_RECOVERED_AND_ROLLBACK;
private int maxCommitAttempts = DEFAULT_MAX_COMMIT_ATTEMPTS;
diff --git a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcExecutionOptions.java b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcExecutionOptions.java
index 137fb7c..c19677b 100644
--- a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcExecutionOptions.java
+++ b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcExecutionOptions.java
@@ -81,6 +81,7 @@ public class JdbcExecutionOptions implements Serializable {
}
/** Builder for {@link JdbcExecutionOptions}. */
+ @PublicEvolving
public static final class Builder {
private long intervalMs = DEFAULT_INTERVAL_MILLIS;
private int size = DEFAULT_SIZE;
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 fd8a6b5..8bab2be 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
@@ -18,6 +18,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.table.catalog.CatalogBaseTable;
@@ -120,6 +121,7 @@ public class JdbcCatalog extends AbstractJdbcCatalog {
// ------ getters ------
@VisibleForTesting
+ @Internal
public AbstractJdbcCatalog getInternal() {
return internal;
}
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 181fa67..d838ebe 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
@@ -246,6 +246,7 @@ public abstract class AbstractDialect implements JdbcDialect {
public abstract Set<LogicalTypeRoot> supportedTypes();
/** A range from [min,max] where min <= max. */
+ @PublicEvolving
public static class Range {
private final int min;
diff --git a/flink-connector-jdbc/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
index 931e935..8bcde5c 100644
--- a/flink-connector-jdbc/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
@@ -17,6 +17,8 @@
package org.apache.flink.connector.jdbc.xa;
+import org.apache.flink.annotation.Internal;
+
import javax.annotation.concurrent.ThreadSafe;
import javax.transaction.xa.Xid;
@@ -28,6 +30,7 @@ import static java.util.Collections.unmodifiableCollection;
/** Thread-safe (assuming immutable {@link Xid} implementation). */
@ThreadSafe
+@Internal
class JdbcXaSinkFunctionState {
private final Collection<CheckpointAndXid> prepared;
private final Collection<Xid> hanging;
diff --git a/flink-connector-jdbc/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
index 1bf022c..90c6e6e 100644
--- a/flink-connector-jdbc/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
@@ -17,12 +17,12 @@
package org.apache.flink.connector.jdbc.xa;
-import org.apache.flink.annotation.PublicEvolving;
+import org.apache.flink.annotation.Internal;
import org.apache.flink.runtime.state.FunctionInitializationContext;
import java.io.Serializable;
-@PublicEvolving
+@Internal
interface XaSinkStateHandler extends Serializable {
JdbcXaSinkFunctionState load(FunctionInitializationContext context) throws Exception;