Skip to content

Commit e1a720c

Browse files
authored
Merge pull request #159 from shruti15kulkarni/flink-1.20-support
[cherry-pick] add support for flink 1.20 for Beam Flink Runner
2 parents 3748040 + cf82246 commit e1a720c

28 files changed

Lines changed: 2425 additions & 11 deletions

File tree

‎.github/actions/setup-default-test-properties/test-properties.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"JavaTestProperties": {
1616
"SUPPORTED_VERSIONS": ["8", "11", "17", "21"],
17-
"FLINK_VERSIONS": ["1.17", "1.18"],
17+
"FLINK_VERSIONS": ["1.17", "1.18", "1.20"],
1818
"SPARK_VERSIONS": ["2", "3"]
1919
},
2020
"GoTestProperties": {

‎buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ class BeamModulePlugin implements Plugin<Project> {
398398

399399
// Automatically use the official release version if we are performing a release
400400
// otherwise append '-SNAPSHOT'
401-
project.version = '2.45.50'
401+
project.version = '2.45.51'
402402
if (isLinkedin(project)) {
403403
project.ext.mavenGroupId = 'com.linkedin.beam'
404404
}

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ docker_image_default_repo_root=apache
3939
docker_image_default_repo_prefix=beam_
4040

4141
# supported flink versions
42-
flink_versions=1.17,1.18
42+
flink_versions=1.17,1.18,1.20
4343
# supported python versions
4444
python_versions=3.8,3.9,3.10,3.11

runners/flink/src/main/java/org/apache/beam/runners/flink/StreamingTranslatorsUtil.java renamed to runners/flink/1.17/src/main/java/org/apache/beam/runners/flink/StreamingTranslatorsUtil.java

File renamed without changes.

runners/flink/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/DoFnOperator.java renamed to runners/flink/1.17/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/DoFnOperator.java

File renamed without changes.

runners/flink/src/test/java/org/apache/beam/runners/flink/streaming/FlinkBroadcastStateInternalsTest.java renamed to runners/flink/1.17/src/test/java/org/apache/beam/runners/flink/streaming/FlinkBroadcastStateInternalsTest.java

File renamed without changes.

runners/flink/src/test/java/org/apache/beam/runners/flink/streaming/FlinkStateInternalsTest.java renamed to runners/flink/1.17/src/test/java/org/apache/beam/runners/flink/streaming/FlinkStateInternalsTest.java

File renamed without changes.

runners/flink/src/test/java/org/apache/beam/runners/flink/streaming/StreamSources.java renamed to runners/flink/1.17/src/test/java/org/apache/beam/runners/flink/streaming/StreamSources.java

File renamed without changes.

‎runners/flink/1.20/build.gradle‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* License); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an AS IS BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
*/
18+
19+
project.ext {
20+
flink_major = '1.20'
21+
flink_version = '1.20.3'
22+
}
23+
24+
// Load the main build script which contains all build logic.
25+
apply from: "../flink_runner.gradle"
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* License); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an AS IS BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
*/
18+
19+
def basePath = '../../job-server-container'
20+
21+
project.ext {
22+
resource_path = basePath
23+
}
24+
25+
// Load the main build script which contains all build logic.
26+
apply from: "$basePath/flink_job_server_container.gradle"

0 commit comments

Comments
 (0)