This is an automated email from the ASF dual-hosted git repository. gaoyunhaii pushed a commit to branch test1.13 in repository https://gitbox.apache.org/repos/asf/flink-benchmarks.git
commit 0a6b4fca6e73edc04237b711e2ec7c9e99e0be84 Author: Yun Gao <[email protected]> AuthorDate: Wed Sep 22 14:19:46 2021 +0800 Fix some compile error test with release-1.13 --- pom.xml | 2 +- .../org/apache/flink/benchmark/SortingBoundedInputBenchmarks.java | 4 ---- src/main/java/org/apache/flink/benchmark/StreamGraphUtils.java | 4 ++-- .../DeployingDownstreamTasksInBatchJobBenchmarkExecutor.java | 2 +- .../deploying/DeployingTasksInStreamingJobBenchmarkExecutor.java | 2 +- .../scheduler/benchmark/e2e/CreateSchedulerBenchmarkExecutor.java | 2 +- .../benchmark/e2e/SchedulingAndDeployingBenchmarkExecutor.java | 2 +- .../failover/RegionToRestartInBatchJobBenchmarkExecutor.java | 2 +- .../failover/RegionToRestartInStreamingJobBenchmarkExecutor.java | 2 +- .../partitionrelease/PartitionReleaseInBatchJobBenchmarkExecutor.java | 2 +- .../benchmark/scheduling/InitSchedulingStrategyBenchmarkExecutor.java | 2 +- .../SchedulingDownstreamTasksInBatchJobBenchmarkExecutor.java | 2 +- .../benchmark/topology/BuildExecutionGraphBenchmarkExecutor.java | 3 +-- 13 files changed, 13 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index f92f166..c9d2ce0 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ under the License. <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <flink.version>1.15-SNAPSHOT</flink.version> + <flink.version>1.13.2</flink.version> <flink.shaded.version>14.0</flink.shaded.version> <netty.tcnative.version>2.0.39.Final</netty.tcnative.version> <java.version>1.8</java.version> diff --git a/src/main/java/org/apache/flink/benchmark/SortingBoundedInputBenchmarks.java b/src/main/java/org/apache/flink/benchmark/SortingBoundedInputBenchmarks.java index 3a0af48..d4285cc 100644 --- a/src/main/java/org/apache/flink/benchmark/SortingBoundedInputBenchmarks.java +++ b/src/main/java/org/apache/flink/benchmark/SortingBoundedInputBenchmarks.java @@ -44,7 +44,6 @@ import org.apache.flink.streaming.api.operators.TwoInputStreamOperator; import org.apache.flink.streaming.api.transformations.KeyedMultipleInputTransformation; import org.apache.flink.streaming.runtime.streamrecord.LatencyMarker; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; -import org.apache.flink.streaming.runtime.watermarkstatus.WatermarkStatus; import org.apache.flink.util.SplittableIterator; import org.junit.Assert; @@ -345,9 +344,6 @@ public class SortingBoundedInputBenchmarks extends BenchmarkBase { @Override public void setKeyContextElement(StreamRecord<Integer> record) {} - - @Override - public void processWatermarkStatus(WatermarkStatus watermarkStatus) throws Exception {} } private static class InputGenerator extends SplittableIterator<Integer> { diff --git a/src/main/java/org/apache/flink/benchmark/StreamGraphUtils.java b/src/main/java/org/apache/flink/benchmark/StreamGraphUtils.java index 0746193..43d1fba 100644 --- a/src/main/java/org/apache/flink/benchmark/StreamGraphUtils.java +++ b/src/main/java/org/apache/flink/benchmark/StreamGraphUtils.java @@ -23,7 +23,7 @@ import org.apache.flink.runtime.jobgraph.JobType; import org.apache.flink.streaming.api.datastream.DataStreamSource; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.functions.sink.DiscardingSink; -import org.apache.flink.streaming.api.graph.GlobalStreamExchangeMode; +import org.apache.flink.streaming.api.graph.GlobalDataExchangeMode; import org.apache.flink.streaming.api.graph.StreamGraph; /** @@ -37,7 +37,7 @@ public class StreamGraphUtils { StreamGraph streamGraph = env.getStreamGraph(); streamGraph.setChaining(false); - streamGraph.setGlobalStreamExchangeMode(GlobalStreamExchangeMode.ALL_EDGES_BLOCKING); + streamGraph.setGlobalDataExchangeMode(GlobalDataExchangeMode.ALL_EDGES_BLOCKING); streamGraph.setJobType(JobType.BATCH); return streamGraph; diff --git a/src/main/java/org/apache/flink/scheduler/benchmark/deploying/DeployingDownstreamTasksInBatchJobBenchmarkExecutor.java b/src/main/java/org/apache/flink/scheduler/benchmark/deploying/DeployingDownstreamTasksInBatchJobBenchmarkExecutor.java index 89a46f7..4f9df53 100644 --- a/src/main/java/org/apache/flink/scheduler/benchmark/deploying/DeployingDownstreamTasksInBatchJobBenchmarkExecutor.java +++ b/src/main/java/org/apache/flink/scheduler/benchmark/deploying/DeployingDownstreamTasksInBatchJobBenchmarkExecutor.java @@ -61,6 +61,6 @@ public class DeployingDownstreamTasksInBatchJobBenchmarkExecutor extends Schedul @TearDown(Level.Trial) public void teardown() { - benchmark.teardown(); + // benchmark.teardown(); } } diff --git a/src/main/java/org/apache/flink/scheduler/benchmark/deploying/DeployingTasksInStreamingJobBenchmarkExecutor.java b/src/main/java/org/apache/flink/scheduler/benchmark/deploying/DeployingTasksInStreamingJobBenchmarkExecutor.java index bbabaf4..0c05a7d 100644 --- a/src/main/java/org/apache/flink/scheduler/benchmark/deploying/DeployingTasksInStreamingJobBenchmarkExecutor.java +++ b/src/main/java/org/apache/flink/scheduler/benchmark/deploying/DeployingTasksInStreamingJobBenchmarkExecutor.java @@ -61,6 +61,6 @@ public class DeployingTasksInStreamingJobBenchmarkExecutor extends SchedulerBenc @TearDown(Level.Trial) public void teardown() { - benchmark.teardown(); + // benchmark.teardown(); } } diff --git a/src/main/java/org/apache/flink/scheduler/benchmark/e2e/CreateSchedulerBenchmarkExecutor.java b/src/main/java/org/apache/flink/scheduler/benchmark/e2e/CreateSchedulerBenchmarkExecutor.java index b14a6df..8191d00 100644 --- a/src/main/java/org/apache/flink/scheduler/benchmark/e2e/CreateSchedulerBenchmarkExecutor.java +++ b/src/main/java/org/apache/flink/scheduler/benchmark/e2e/CreateSchedulerBenchmarkExecutor.java @@ -60,6 +60,6 @@ public class CreateSchedulerBenchmarkExecutor extends SchedulerBenchmarkExecutor @TearDown(Level.Trial) public void teardown() { - benchmark.teardown(); + // benchmark.teardown(); } } diff --git a/src/main/java/org/apache/flink/scheduler/benchmark/e2e/SchedulingAndDeployingBenchmarkExecutor.java b/src/main/java/org/apache/flink/scheduler/benchmark/e2e/SchedulingAndDeployingBenchmarkExecutor.java index 153c3d8..04d25ad 100644 --- a/src/main/java/org/apache/flink/scheduler/benchmark/e2e/SchedulingAndDeployingBenchmarkExecutor.java +++ b/src/main/java/org/apache/flink/scheduler/benchmark/e2e/SchedulingAndDeployingBenchmarkExecutor.java @@ -59,6 +59,6 @@ public class SchedulingAndDeployingBenchmarkExecutor extends SchedulerBenchmarkE @TearDown(Level.Trial) public void teardown() { - benchmark.teardown(); + // benchmark.teardown(); } } diff --git a/src/main/java/org/apache/flink/scheduler/benchmark/failover/RegionToRestartInBatchJobBenchmarkExecutor.java b/src/main/java/org/apache/flink/scheduler/benchmark/failover/RegionToRestartInBatchJobBenchmarkExecutor.java index c8504b9..bfcca07 100644 --- a/src/main/java/org/apache/flink/scheduler/benchmark/failover/RegionToRestartInBatchJobBenchmarkExecutor.java +++ b/src/main/java/org/apache/flink/scheduler/benchmark/failover/RegionToRestartInBatchJobBenchmarkExecutor.java @@ -60,6 +60,6 @@ public class RegionToRestartInBatchJobBenchmarkExecutor extends SchedulerBenchma @TearDown(Level.Trial) public void teardown() { - benchmark.teardown(); + // benchmark.teardown(); } } diff --git a/src/main/java/org/apache/flink/scheduler/benchmark/failover/RegionToRestartInStreamingJobBenchmarkExecutor.java b/src/main/java/org/apache/flink/scheduler/benchmark/failover/RegionToRestartInStreamingJobBenchmarkExecutor.java index 2b1543e..aa8bdd3 100644 --- a/src/main/java/org/apache/flink/scheduler/benchmark/failover/RegionToRestartInStreamingJobBenchmarkExecutor.java +++ b/src/main/java/org/apache/flink/scheduler/benchmark/failover/RegionToRestartInStreamingJobBenchmarkExecutor.java @@ -60,6 +60,6 @@ public class RegionToRestartInStreamingJobBenchmarkExecutor extends SchedulerBen @TearDown(Level.Trial) public void teardown() { - benchmark.teardown(); + // benchmark.teardown(); } } diff --git a/src/main/java/org/apache/flink/scheduler/benchmark/partitionrelease/PartitionReleaseInBatchJobBenchmarkExecutor.java b/src/main/java/org/apache/flink/scheduler/benchmark/partitionrelease/PartitionReleaseInBatchJobBenchmarkExecutor.java index 3657874..d355087 100644 --- a/src/main/java/org/apache/flink/scheduler/benchmark/partitionrelease/PartitionReleaseInBatchJobBenchmarkExecutor.java +++ b/src/main/java/org/apache/flink/scheduler/benchmark/partitionrelease/PartitionReleaseInBatchJobBenchmarkExecutor.java @@ -60,6 +60,6 @@ public class PartitionReleaseInBatchJobBenchmarkExecutor extends SchedulerBenchm @TearDown(Level.Trial) public void teardown() { - benchmark.teardown(); + // benchmark.teardown(); } } diff --git a/src/main/java/org/apache/flink/scheduler/benchmark/scheduling/InitSchedulingStrategyBenchmarkExecutor.java b/src/main/java/org/apache/flink/scheduler/benchmark/scheduling/InitSchedulingStrategyBenchmarkExecutor.java index 21c66d8..9c9ce1f 100644 --- a/src/main/java/org/apache/flink/scheduler/benchmark/scheduling/InitSchedulingStrategyBenchmarkExecutor.java +++ b/src/main/java/org/apache/flink/scheduler/benchmark/scheduling/InitSchedulingStrategyBenchmarkExecutor.java @@ -61,6 +61,6 @@ public class InitSchedulingStrategyBenchmarkExecutor extends SchedulerBenchmarkE @TearDown(Level.Trial) public void teardown() { - benchmark.teardown(); + // benchmark.teardown(); } } diff --git a/src/main/java/org/apache/flink/scheduler/benchmark/scheduling/SchedulingDownstreamTasksInBatchJobBenchmarkExecutor.java b/src/main/java/org/apache/flink/scheduler/benchmark/scheduling/SchedulingDownstreamTasksInBatchJobBenchmarkExecutor.java index 7968ff9..4661666 100644 --- a/src/main/java/org/apache/flink/scheduler/benchmark/scheduling/SchedulingDownstreamTasksInBatchJobBenchmarkExecutor.java +++ b/src/main/java/org/apache/flink/scheduler/benchmark/scheduling/SchedulingDownstreamTasksInBatchJobBenchmarkExecutor.java @@ -60,6 +60,6 @@ public class SchedulingDownstreamTasksInBatchJobBenchmarkExecutor extends Schedu @TearDown(Level.Trial) public void teardown() { - benchmark.teardown(); + // benchmark.teardown(); } } diff --git a/src/main/java/org/apache/flink/scheduler/benchmark/topology/BuildExecutionGraphBenchmarkExecutor.java b/src/main/java/org/apache/flink/scheduler/benchmark/topology/BuildExecutionGraphBenchmarkExecutor.java index cf97809..104e3b4 100644 --- a/src/main/java/org/apache/flink/scheduler/benchmark/topology/BuildExecutionGraphBenchmarkExecutor.java +++ b/src/main/java/org/apache/flink/scheduler/benchmark/topology/BuildExecutionGraphBenchmarkExecutor.java @@ -19,7 +19,6 @@ package org.apache.flink.scheduler.benchmark.topology; import org.apache.flink.runtime.scheduler.benchmark.JobConfiguration; -import org.apache.flink.runtime.scheduler.benchmark.SchedulerBenchmarkUtils; import org.apache.flink.runtime.scheduler.benchmark.topology.BuildExecutionGraphBenchmark; import org.apache.flink.scheduler.benchmark.SchedulerBenchmarkExecutorBase; @@ -60,6 +59,6 @@ public class BuildExecutionGraphBenchmarkExecutor extends SchedulerBenchmarkExec @TearDown(Level.Trial) public void teardown() { - benchmark.teardown(); + // benchmark.teardown(); } }
