Skip to content

Commit dd79a02

Browse files
czy006ConradJamruanhang1993
authored
[FLINK-36586][build] Update flink version to 1.19 (#3660)
Co-authored-by: ConradJam <czy006@apache.com> Co-authored-by: Hang Ruan <ruanhang1993@hotmail.com>
1 parent 8e6c361 commit dd79a02

File tree

46 files changed

+208
-221
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+208
-221
lines changed

.github/workflows/flink_cdc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
strategy:
7272
matrix:
7373
java-version: [ '8' ]
74-
flink-version: ['1.17.2', '1.18.1', '1.19.1', '1.20.0']
74+
flink-version: ['1.19.1', '1.20.0']
7575
module: [ 'pipeline_e2e' ]
7676
name: Pipeline E2E Tests
7777
uses: ./.github/workflows/flink_cdc_base.yml
@@ -83,7 +83,7 @@ jobs:
8383
strategy:
8484
matrix:
8585
java-version: [ '8' ]
86-
flink-version: ['1.16.3', '1.17.2', '1.18.1', '1.19.1', '1.20.0']
86+
flink-version: ['1.19.1', '1.20.0']
8787
module: [ 'source_e2e' ]
8888
name: Source E2E Tests
8989
uses: ./.github/workflows/flink_cdc_base.yml

.github/workflows/flink_cdc_migration_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
runs-on: ubuntu-latest
4040
strategy:
4141
matrix:
42-
flink-version: [ '1.18.1', '1.19.1', '1.20.0' ]
42+
flink-version: [ '1.19.1', '1.20.0' ]
4343

4444
steps:
4545
- uses: actions/checkout@v4
@@ -78,7 +78,7 @@ jobs:
7878
runs-on: ubuntu-latest
7979
strategy:
8080
matrix:
81-
flink-version: [ '1.18.1', '1.19.1', '1.20.0' ]
81+
flink-version: [ '1.19.1', '1.20.0' ]
8282

8383
steps:
8484
- uses: actions/checkout@v4

flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-elasticsearch/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ limitations under the License.
3636
<properties>
3737
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3838
<elasticsearch.version>8.12.1</elasticsearch.version>
39-
<flink.version>1.18.0</flink.version>
39+
<flink.version>1.19.1</flink.version>
4040
<scala.binary.version>4.0</scala.binary.version>
4141
<jackson.version>2.13.2</jackson.version>
4242
<surefire.module.config>--add-opens=java.base/java.util=ALL-UNNAMED</surefire.module.config>

flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-kafka/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ limitations under the License.
3535
<dependency>
3636
<groupId>org.apache.flink</groupId>
3737
<artifactId>flink-connector-kafka</artifactId>
38-
<version>3.0.2-${flink.major.version}</version>
38+
<version>3.3.0-${flink.major.version}</version>
3939
</dependency>
4040

4141
<dependency>

flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-paimon/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,13 @@ limitations under the License.
7272
<scope>test</scope>
7373
</dependency>
7474

75+
<dependency>
76+
<groupId>org.apache.commons</groupId>
77+
<artifactId>commons-compress</artifactId>
78+
<version>1.26.0</version>
79+
<scope>test</scope>
80+
</dependency>
81+
7582
<dependency>
7683
<groupId>org.mockito</groupId>
7784
<artifactId>mockito-inline</artifactId>

flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-paimon/src/test/java/org/apache/flink/cdc/connectors/paimon/sink/v2/PaimonSinkITCase.java

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
package org.apache.flink.cdc.connectors.paimon.sink.v2;
1919

2020
import org.apache.flink.api.common.JobID;
21+
import org.apache.flink.api.common.JobInfo;
22+
import org.apache.flink.api.common.TaskInfo;
2123
import org.apache.flink.api.common.operators.MailboxExecutor;
2224
import org.apache.flink.api.common.operators.ProcessingTimeService;
2325
import org.apache.flink.api.common.serialization.SerializationSchema;
@@ -40,6 +42,8 @@
4042
import org.apache.flink.cdc.runtime.typeutils.BinaryRecordDataGenerator;
4143
import org.apache.flink.metrics.MetricGroup;
4244
import org.apache.flink.metrics.groups.SinkWriterMetricGroup;
45+
import org.apache.flink.metrics.groups.UnregisteredMetricsGroup;
46+
import org.apache.flink.runtime.metrics.groups.InternalSinkCommitterMetricGroup;
4347
import org.apache.flink.streaming.runtime.operators.sink.committables.CommitRequestImpl;
4448
import org.apache.flink.table.api.EnvironmentSettings;
4549
import org.apache.flink.table.api.TableEnvironment;
@@ -572,7 +576,10 @@ private MultiTableCommittable correctCheckpointId(MultiTableCommittable committa
572576
private static class MockCommitRequestImpl<CommT> extends CommitRequestImpl<CommT> {
573577

574578
protected MockCommitRequestImpl(CommT committable) {
575-
super(committable);
579+
super(
580+
committable,
581+
InternalSinkCommitterMetricGroup.wrap(
582+
UnregisteredMetricsGroup.createOperatorMetricGroup()));
576583
}
577584
}
578585

@@ -633,5 +640,15 @@ public <IN> TypeSerializer<IN> createInputSerializer() {
633640
public JobID getJobId() {
634641
return null;
635642
}
643+
644+
@Override
645+
public JobInfo getJobInfo() {
646+
return null;
647+
}
648+
649+
@Override
650+
public TaskInfo getTaskInfo() {
651+
return null;
652+
}
636653
}
637654
}

flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/pom.xml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ limitations under the License.
2828
<artifactId>flink-cdc-pipeline-connector-starrocks</artifactId>
2929

3030
<properties>
31-
<starrocks.connector.version>1.2.9_flink-${flink.major.version}</starrocks.connector.version>
31+
<starrocks.connector.version>1.2.10_flink-${flink.major.version}</starrocks.connector.version>
3232
</properties>
3333

3434
<dependencies>
@@ -38,15 +38,6 @@ limitations under the License.
3838
<version>${starrocks.connector.version}</version>
3939
</dependency>
4040

41-
<dependency>
42-
<!-- TODO connector 1.2.9 depends on this, but not package it, so add this dependency here.
43-
This dependency can be removed after upgrading connector to 1.2.10 which will not use
44-
commons-compress anymore. -->
45-
<groupId>org.apache.commons</groupId>
46-
<artifactId>commons-compress</artifactId>
47-
<version>1.21</version>
48-
</dependency>
49-
5041
<dependency>
5142
<groupId>org.apache.flink</groupId>
5243
<artifactId>flink-cdc-composer</artifactId>

flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/test/java/com/starrocks/shade/org/apache/commons/compress/utils/Lists.java

Lines changed: 0 additions & 31 deletions
This file was deleted.

flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/test/java/org/apache/flink/cdc/connectors/starrocks/sink/EventRecordSerializationSchemaTest.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
package org.apache.flink.cdc.connectors.starrocks.sink;
1919

2020
import org.apache.flink.api.common.JobID;
21+
import org.apache.flink.api.common.JobInfo;
22+
import org.apache.flink.api.common.TaskInfo;
2123
import org.apache.flink.api.common.operators.MailboxExecutor;
2224
import org.apache.flink.api.common.operators.ProcessingTimeService;
2325
import org.apache.flink.api.common.serialization.SerializationSchema;
@@ -353,5 +355,15 @@ public <IN> TypeSerializer<IN> createInputSerializer() {
353355
public JobID getJobId() {
354356
throw new UnsupportedOperationException();
355357
}
358+
359+
@Override
360+
public JobInfo getJobInfo() {
361+
throw new UnsupportedOperationException();
362+
}
363+
364+
@Override
365+
public TaskInfo getTaskInfo() {
366+
throw new UnsupportedOperationException();
367+
}
356368
}
357369
}

flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/org/apache/flink/cdc/connectors/db2/table/Db2ConnectorITCase.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ public void testConsumingAllEvents()
209209
"spare tire,22.200"
210210
};
211211

212-
List<String> actual = TestValuesTableFactory.getResults("sink");
212+
List<String> actual = TestValuesTableFactory.getResultsAsStrings("sink");
213213
assertThat(actual, containsInAnyOrder(expected));
214214

215215
cancelJobIfRunning(result);
@@ -302,7 +302,7 @@ public void testAllTypes() throws Exception {
302302
Arrays.asList(
303303
"+I(1,32767,65535,2147483647,5.5,6.6,123.12345,404.4,Hello World,a,abc,2020-07-17T18:00:22.123,2020-07-17,18:00:22,500,2020-07-17T18:00:22.123456789)",
304304
"+U(1,0,65535,2147483647,5.5,6.6,123.12345,404.4,Hello World,a,abc,2020-07-17T18:00:22.123,2020-07-17,18:00:22,500,2020-07-17T18:00:22.123456789)");
305-
List<String> actual = TestValuesTableFactory.getRawResults("sink");
305+
List<String> actual = TestValuesTableFactory.getRawResultsAsStrings("sink");
306306
Collections.sort(expected);
307307
Collections.sort(actual);
308308
assertEquals(expected, actual);
@@ -373,7 +373,7 @@ public void testStartupFromLatestOffset() throws Exception {
373373
String[] expected =
374374
new String[] {"110,jacket,new water resistent white wind breaker,0.500"};
375375

376-
List<String> actual = TestValuesTableFactory.getResults("sink");
376+
List<String> actual = TestValuesTableFactory.getResultsAsStrings("sink");
377377
assertThat(actual, containsInAnyOrder(expected));
378378

379379
cancelJobIfRunning(result);
@@ -470,7 +470,7 @@ public void testMetadataColumns() throws Throwable {
470470
"+U(testdb,DB2INST1,PRODUCTS,111,scooter,Big 2-wheel scooter ,5.170)",
471471
"-D(testdb,DB2INST1,PRODUCTS,111,scooter,Big 2-wheel scooter ,5.170)");
472472

473-
List<String> actual = TestValuesTableFactory.getRawResults("sink");
473+
List<String> actual = TestValuesTableFactory.getRawResultsAsStrings("sink");
474474
Collections.sort(expected);
475475
Collections.sort(actual);
476476
assertEquals(expected, actual);
@@ -493,7 +493,7 @@ private static void waitForSinkSize(String sinkName, int expectedSize)
493493
private static int sinkSize(String sinkName) {
494494
synchronized (TestValuesTableFactory.class) {
495495
try {
496-
return TestValuesTableFactory.getRawResults(sinkName).size();
496+
return TestValuesTableFactory.getRawResultsAsStrings(sinkName).size();
497497
} catch (IllegalArgumentException e) {
498498
// job is not started yet
499499
return 0;

0 commit comments

Comments
 (0)