Skip to content

Commit 5fd7b4a

Browse files
committed
[Hotfix][JDBC/Connector] Correct the annotations be right
1 parent 9a107dc commit 5fd7b4a

20 files changed

+41
-17
lines changed

flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/datasource/connections/SimpleJdbcConnectionProvider.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.apache.flink.connector.jdbc.datasource.connections;
1919

20-
import org.apache.flink.annotation.PublicEvolving;
20+
import org.apache.flink.annotation.Experimental;
2121
import org.apache.flink.connector.jdbc.JdbcConnectionOptions;
2222
import org.apache.flink.util.Preconditions;
2323

@@ -37,7 +37,7 @@
3737

3838
/** Simple JDBC connection provider. */
3939
@NotThreadSafe
40-
@PublicEvolving
40+
@Experimental
4141
public class SimpleJdbcConnectionProvider implements JdbcConnectionProvider, Serializable {
4242

4343
private static final Logger LOG = LoggerFactory.getLogger(SimpleJdbcConnectionProvider.class);

flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSource.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
package org.apache.flink.connector.jdbc.source;
2020

21-
import org.apache.flink.annotation.PublicEvolving;
21+
import org.apache.flink.annotation.Experimental;
2222
import org.apache.flink.annotation.VisibleForTesting;
2323
import org.apache.flink.api.common.typeinfo.TypeInformation;
2424
import org.apache.flink.api.connector.source.Boundedness;
@@ -51,7 +51,7 @@
5151
import java.util.Objects;
5252

5353
/** JDBC source. */
54-
@PublicEvolving
54+
@Experimental
5555
public class JdbcSource<OUT>
5656
implements Source<OUT, JdbcSourceSplit, JdbcSourceEnumeratorState>,
5757
ResultTypeQueryable<OUT> {

flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceBuilder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
package org.apache.flink.connector.jdbc.source;
2020

21-
import org.apache.flink.annotation.PublicEvolving;
21+
import org.apache.flink.annotation.Experimental;
2222
import org.apache.flink.api.common.typeinfo.TypeInformation;
2323
import org.apache.flink.configuration.Configuration;
2424
import org.apache.flink.connector.base.DeliveryGuarantee;
@@ -95,7 +95,7 @@
9595
* @see DriverManager
9696
* @see JdbcSource
9797
*/
98-
@PublicEvolving
98+
@Experimental
9999
public class JdbcSourceBuilder<OUT> {
100100

101101
public static final Logger LOG = LoggerFactory.getLogger(JdbcSourceBuilder.class);

flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/JdbcSourceOptions.java

+2
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@
1818

1919
package org.apache.flink.connector.jdbc.source;
2020

21+
import org.apache.flink.annotation.Experimental;
2122
import org.apache.flink.configuration.ConfigOption;
2223
import org.apache.flink.configuration.ConfigOptions;
2324

2425
import java.io.Serializable;
2526
import java.sql.ResultSet;
2627

2728
/** JDBC source options. */
29+
@Experimental
2830
public class JdbcSourceOptions implements Serializable {
2931

3032
private JdbcSourceOptions() {}

flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumStateSerializer.java

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package org.apache.flink.connector.jdbc.source.enumerator;
2020

21+
import org.apache.flink.annotation.Experimental;
2122
import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit;
2223
import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplitSerializer;
2324
import org.apache.flink.core.io.SimpleVersionedSerializer;
@@ -36,6 +37,7 @@
3637
import static org.apache.flink.util.Preconditions.checkArgument;
3738

3839
/** The serializer for {@link JdbcSourceEnumeratorState}. */
40+
@Experimental
3941
public class JdbcSourceEnumStateSerializer
4042
implements SimpleVersionedSerializer<JdbcSourceEnumeratorState>, Serializable {
4143

flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumerator.java

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package org.apache.flink.connector.jdbc.source.enumerator;
2020

21+
import org.apache.flink.annotation.Experimental;
2122
import org.apache.flink.api.connector.source.Boundedness;
2223
import org.apache.flink.api.connector.source.SourceEvent;
2324
import org.apache.flink.api.connector.source.SplitEnumerator;
@@ -42,6 +43,7 @@
4243
import java.util.Optional;
4344

4445
/** JDBC source enumerator. */
46+
@Experimental
4547
public class JdbcSourceEnumerator
4648
implements SplitEnumerator<JdbcSourceSplit, JdbcSourceEnumeratorState> {
4749
private static final Logger LOG = LoggerFactory.getLogger(JdbcSourceEnumerator.class);

flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSourceEnumeratorState.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
package org.apache.flink.connector.jdbc.source.enumerator;
2020

21-
import org.apache.flink.annotation.PublicEvolving;
21+
import org.apache.flink.annotation.Experimental;
2222
import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit;
2323
import org.apache.flink.util.Preconditions;
2424

@@ -30,7 +30,7 @@
3030
import java.util.Objects;
3131

3232
/** Enumerator state class for {@link JdbcSourceEnumerator}. */
33-
@PublicEvolving
33+
@Experimental
3434
public class JdbcSourceEnumeratorState implements Serializable {
3535

3636
private final @Nonnull List<JdbcSourceSplit> completedSplits;

flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/JdbcSqlSplitEnumeratorBase.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
package org.apache.flink.connector.jdbc.source.enumerator;
2020

21-
import org.apache.flink.annotation.PublicEvolving;
21+
import org.apache.flink.annotation.Experimental;
2222
import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit;
2323

2424
import javax.annotation.Nonnull;
@@ -34,7 +34,7 @@
3434
*
3535
* @param <SplitT> JDBC split type.
3636
*/
37-
@PublicEvolving
37+
@Experimental
3838
public abstract class JdbcSqlSplitEnumeratorBase<SplitT> implements AutoCloseable, Serializable {
3939
private final char[] currentId = "0000000000".toCharArray();
4040

@@ -78,7 +78,7 @@ public abstract List<JdbcSourceSplit> enumerateSplits(@Nonnull Supplier<Boolean>
7878
*
7979
* @param <SplitT> Split type.
8080
*/
81-
@PublicEvolving
81+
@Experimental
8282
public interface Provider<SplitT> extends Serializable {
8383

8484
/**

flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/enumerator/SqlTemplateSplitEnumerator.java

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package org.apache.flink.connector.jdbc.source.enumerator;
2020

21+
import org.apache.flink.annotation.Experimental;
2122
import org.apache.flink.annotation.VisibleForTesting;
2223
import org.apache.flink.connector.jdbc.source.split.CheckpointedOffset;
2324
import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit;
@@ -38,6 +39,7 @@
3839
import java.util.function.Supplier;
3940

4041
/** A split enumerator based on sql-parameters grains. */
42+
@Experimental
4143
public final class SqlTemplateSplitEnumerator extends JdbcSqlSplitEnumeratorBase<JdbcSourceSplit> {
4244

4345
public static final Logger LOG = LoggerFactory.getLogger(SqlTemplateSplitEnumerator.class);

flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/JdbcRecordEmitter.java

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package org.apache.flink.connector.jdbc.source.reader;
2020

21+
import org.apache.flink.annotation.Experimental;
2122
import org.apache.flink.api.connector.source.SourceOutput;
2223
import org.apache.flink.connector.base.source.reader.RecordEmitter;
2324
import org.apache.flink.connector.jdbc.source.split.JdbcSourceSplit;
@@ -29,6 +30,7 @@
2930
* @param <T> The type of the record.
3031
* @param <SplitT> The type of JDBC split.
3132
*/
33+
@Experimental
3234
public class JdbcRecordEmitter<T, SplitT extends JdbcSourceSplit>
3335
implements RecordEmitter<RecordAndOffset<T>, T, JdbcSourceSplitState<SplitT>> {
3436

flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceReader.java

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package org.apache.flink.connector.jdbc.source.reader;
2020

21+
import org.apache.flink.annotation.Experimental;
2122
import org.apache.flink.api.connector.source.SourceReaderContext;
2223
import org.apache.flink.configuration.Configuration;
2324
import org.apache.flink.connector.base.source.reader.SingleThreadMultiplexSourceReaderBase;
@@ -33,6 +34,7 @@
3334
*
3435
* @param <OUT> The type of the record readed from the source.
3536
*/
37+
@Experimental
3638
public class JdbcSourceReader<OUT>
3739
extends SingleThreadMultiplexSourceReaderBase<
3840
RecordAndOffset<OUT>, OUT, JdbcSourceSplit, JdbcSourceSplitState<JdbcSourceSplit>> {

flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/JdbcSourceSplitReader.java

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package org.apache.flink.connector.jdbc.source.reader;
2020

21+
import org.apache.flink.annotation.Experimental;
2122
import org.apache.flink.annotation.VisibleForTesting;
2223
import org.apache.flink.api.common.typeinfo.TypeInformation;
2324
import org.apache.flink.api.connector.source.SourceReaderContext;
@@ -62,6 +63,7 @@
6263
*
6364
* @param <T> The type of the record read from the source.
6465
*/
66+
@Experimental
6567
public class JdbcSourceSplitReader<T>
6668
implements SplitReader<RecordAndOffset<T>, JdbcSourceSplit>, ResultTypeQueryable<T> {
6769

flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/RecordAndOffset.java

+2
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@
1818

1919
package org.apache.flink.connector.jdbc.source.reader;
2020

21+
import org.apache.flink.annotation.Experimental;
2122
import org.apache.flink.connector.jdbc.source.split.CheckpointedOffset;
2223

2324
/**
2425
* Util class to represent the record with the corresponding information.
2526
*
2627
* @param <E> The type of the record.
2728
*/
29+
@Experimental
2830
public class RecordAndOffset<E> {
2931

3032
public static final long NO_OFFSET = CheckpointedOffset.NO_OFFSET;

flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/ResultExtractor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
package org.apache.flink.connector.jdbc.source.reader.extractor;
2020

21-
import org.apache.flink.annotation.PublicEvolving;
21+
import org.apache.flink.annotation.Experimental;
2222
import org.apache.flink.types.Row;
2323

2424
import java.io.Serializable;
@@ -30,7 +30,7 @@
3030
*
3131
* @param <T> The target data type.
3232
*/
33-
@PublicEvolving
33+
@Experimental
3434
public interface ResultExtractor<T> extends Serializable {
3535

3636
/**

flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/reader/extractor/RowResultExtractor.java

+2
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@
1818

1919
package org.apache.flink.connector.jdbc.source.reader.extractor;
2020

21+
import org.apache.flink.annotation.Experimental;
2122
import org.apache.flink.types.Row;
2223
import org.apache.flink.util.Preconditions;
2324

2425
import java.sql.ResultSet;
2526
import java.sql.SQLException;
2627

2728
/** The extractor is used to extract the data from {@link ResultSet} into a {@link Row} object. */
29+
@Experimental
2830
public class RowResultExtractor implements ResultExtractor<Row> {
2931
@Override
3032
public Row extract(ResultSet resultSet) throws SQLException {

flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/split/CheckpointedOffset.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
package org.apache.flink.connector.jdbc.source.split;
2020

21-
import org.apache.flink.annotation.PublicEvolving;
21+
import org.apache.flink.annotation.Experimental;
2222

2323
import java.io.Serializable;
2424
import java.util.Objects;
@@ -27,7 +27,7 @@
2727
* The class to hold the offset for checkpointed state. Note: The current class is not enabled for
2828
* using.
2929
*/
30-
@PublicEvolving
30+
@Experimental
3131
public class CheckpointedOffset implements Serializable {
3232

3333
public static final int NO_OFFSET = 0;

flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplit.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
package org.apache.flink.connector.jdbc.source.split;
2020

21-
import org.apache.flink.annotation.PublicEvolving;
21+
import org.apache.flink.annotation.Experimental;
2222
import org.apache.flink.api.connector.source.SourceSplit;
2323
import org.apache.flink.util.Preconditions;
2424

@@ -30,7 +30,7 @@
3030
import java.util.Optional;
3131

3232
/** JdbcSourceSplit class. */
33-
@PublicEvolving
33+
@Experimental
3434
public class JdbcSourceSplit implements SourceSplit, Serializable {
3535

3636
private final String id;

flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplitSerializer.java

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package org.apache.flink.connector.jdbc.source.split;
2020

21+
import org.apache.flink.annotation.Experimental;
2122
import org.apache.flink.core.io.SimpleVersionedSerializer;
2223
import org.apache.flink.util.InstantiationUtil;
2324

@@ -31,6 +32,7 @@
3132
import static org.apache.flink.util.Preconditions.checkArgument;
3233

3334
/** The class is used to de/serialize the {@link JdbcSourceSplit}. */
35+
@Experimental
3436
public class JdbcSourceSplitSerializer implements SimpleVersionedSerializer<JdbcSourceSplit> {
3537

3638
private static final int CURRENT_VERSION = 0;

flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/source/split/JdbcSourceSplitState.java

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package org.apache.flink.connector.jdbc.source.split;
2020

21+
import org.apache.flink.annotation.Experimental;
2122
import org.apache.flink.util.FlinkRuntimeException;
2223

2324
import java.io.Serializable;
@@ -26,6 +27,7 @@
2627
import static org.apache.flink.util.Preconditions.checkNotNull;
2728

2829
/** The class is hold the state information of {@link JdbcSourceSplit}. */
30+
@Experimental
2931
public class JdbcSourceSplitState<SplitT extends JdbcSourceSplit> implements Serializable {
3032

3133
private final SplitT split;

flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/split/JdbcSlideTimingParameterProvider.java

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package org.apache.flink.connector.jdbc.split;
2020

21+
import org.apache.flink.annotation.Experimental;
2122
import org.apache.flink.util.Preconditions;
2223

2324
import javax.annotation.Nonnull;
@@ -27,6 +28,7 @@
2728
import java.util.List;
2829

2930
/** The parameters provider generate parameters by slide timing window strategy. */
31+
@Experimental
3032
public class JdbcSlideTimingParameterProvider implements JdbcParameterValuesProvider {
3133

3234
private final long slideStepMills;

0 commit comments

Comments
 (0)