Skip to content

Commit

Permalink
[BEAM-14139] Drop support for Flink 1.11.
Browse files Browse the repository at this point in the history
  • Loading branch information
ibzib committed Mar 24, 2022
1 parent 14862cc commit 12530a3
Show file tree
Hide file tree
Showing 18 changed files with 41 additions and 393 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ javaVersion=1.8
docker_image_default_repo_root=apache
docker_image_default_repo_prefix=beam_

flink_versions=1.11,1.12,1.13,1.14
flink_versions=1.12,1.13,1.14

33 changes: 0 additions & 33 deletions runners/flink/1.11/build.gradle

This file was deleted.

26 changes: 0 additions & 26 deletions runners/flink/1.11/job-server-container/build.gradle

This file was deleted.

31 changes: 0 additions & 31 deletions runners/flink/1.11/job-server/build.gradle

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

4 changes: 2 additions & 2 deletions runners/flink/1.12/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ project.ext {
// Set the version of all Flink-related dependencies here.
flink_version = '1.12.7'
// Version specific code overrides.
main_source_overrides = ["${basePath}/1.11/src/main/java", './src/main/java']
test_source_overrides = ["${basePath}/1.11/src/test/java", './src/test/java']
main_source_overrides = ['./src/main/java']
test_source_overrides = ['./src/test/java']
main_resources_overrides = []
test_resources_overrides = []
archives_base_name = 'beam-runners-flink-1.12'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,40 +17,20 @@
*/
package org.apache.beam.runners.flink.streaming;

import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables;
import org.apache.flink.api.dag.Transformation;
import org.apache.flink.runtime.operators.testutils.MockEnvironmentBuilder;
import org.apache.flink.streaming.api.functions.source.SourceFunction;
import org.apache.flink.streaming.api.operators.AbstractStreamOperator;
import org.apache.flink.streaming.api.operators.Output;
import org.apache.flink.streaming.api.operators.StreamSource;
import org.apache.flink.streaming.api.transformations.OneInputTransformation;
import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
import org.apache.flink.streaming.runtime.streamstatus.StreamStatus;
import org.apache.flink.streaming.runtime.streamstatus.StreamStatusMaintainer;
import org.apache.flink.streaming.runtime.tasks.OperatorChain;
import org.apache.flink.streaming.runtime.tasks.StreamTask;

/**
* {@link StreamSource} utilities, that bridge incompatibilities between Flink releases.
*
* <p>This change is becauses RecordWriter is wrapped in RecordWriterDelegate in 1.10, please refer
* to https://github.com/apache/flink/commit/2c8b4ef572f05bf4740b7e204af1e5e709cd945c for more
* details.
*/
/** {@link StreamSource} utilities, that bridge incompatibilities between Flink releases. */
public class StreamSources {

/**
* Backward compatibility helper for {@link OneInputTransformation} `getInput` method, that has
* been removed in Flink 1.12.
*
* @param source Source to get single input from.
* @return Input transformation.
*/
public static Transformation<?> getOnlyInput(OneInputTransformation<?, ?> source) {
return Iterables.getOnlyElement(source.getInputs());
}

public static <OutT, SrcT extends SourceFunction<OutT>> void run(
StreamSource<OutT, SrcT> streamSource,
Object lockingObject,
Expand Down
4 changes: 2 additions & 2 deletions runners/flink/1.13/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ project.ext {
// Set the version of all Flink-related dependencies here.
flink_version = '1.13.5'
// Version specific code overrides.
main_source_overrides = ["${basePath}/1.11/src/main/java", "${basePath}/1.12/src/main/java", './src/main/java']
test_source_overrides = ["${basePath}/1.11/src/test/java", "${basePath}/1.12/src/test/java", './src/test/java']
main_source_overrides = ["${basePath}/1.12/src/main/java", './src/main/java']
test_source_overrides = ["${basePath}/1.12/src/test/java", './src/test/java']
main_resources_overrides = []
test_resources_overrides = []
archives_base_name = 'beam-runners-flink-1.13'
Expand Down

This file was deleted.

Loading

0 comments on commit 12530a3

Please sign in to comment.