You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by pn...@apache.org on 2021/08/11 18:55:19 UTC
[flink] 01/09: [hotfix][runtime] setThroughputMeter renamed to
setThroughputCalculator according to name of the set object.
This is an automated email from the ASF dual-hosted git repository.
pnowojski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit e6996cd0b1bb7059ab32f63f051ebdedf93bcc9d
Author: Anton Kalashnikov <ka...@yandex.ru>
AuthorDate: Thu Aug 5 13:16:50 2021 +0200
[hotfix][runtime] setThroughputMeter renamed to setThroughputCalculator according to name of the set object.
---
.../org/apache/flink/state/api/runtime/SavepointEnvironment.java | 2 +-
.../main/java/org/apache/flink/runtime/execution/Environment.java | 2 +-
.../org/apache/flink/runtime/taskmanager/RuntimeEnvironment.java | 2 +-
.../apache/flink/runtime/operators/testutils/DummyEnvironment.java | 2 +-
.../apache/flink/runtime/operators/testutils/MockEnvironment.java | 2 +-
.../flink/runtime/operators/testutils/MockEnvironmentBuilder.java | 3 ++-
.../java/org/apache/flink/streaming/runtime/tasks/StreamTask.java | 2 +-
.../apache/flink/streaming/runtime/tasks/StreamMockEnvironment.java | 2 +-
.../runtime/tasks/StreamTaskMailboxTestHarnessBuilder.java | 2 +-
.../org/apache/flink/streaming/runtime/tasks/StreamTaskTest.java | 6 +++---
10 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/runtime/SavepointEnvironment.java b/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/runtime/SavepointEnvironment.java
index 73a2756..62e0250 100644
--- a/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/runtime/SavepointEnvironment.java
+++ b/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/runtime/SavepointEnvironment.java
@@ -288,7 +288,7 @@ public class SavepointEnvironment implements Environment {
}
@Override
- public ThroughputCalculator getThroughputMeter() {
+ public ThroughputCalculator getThroughputCalculator() {
// The throughput calculator doesn't make sense for savepoint but the not null value is
// preferable when StreamTask is instantiated.
return new ThroughputCalculator(SystemClock.getInstance(), 10);
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/execution/Environment.java b/flink-runtime/src/main/java/org/apache/flink/runtime/execution/Environment.java
index caf8e0f..c6ab128 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/execution/Environment.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/execution/Environment.java
@@ -241,7 +241,7 @@ public interface Environment {
*
* @return the throughput calculation service.
*/
- ThroughputCalculator getThroughputMeter();
+ ThroughputCalculator getThroughputCalculator();
// --------------------------------------------------------------------------------------------
// Fields set in the StreamTask to provide access to mailbox and other runtime resources
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/RuntimeEnvironment.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/RuntimeEnvironment.java
index d78b972..8ad2798 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/RuntimeEnvironment.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/RuntimeEnvironment.java
@@ -345,7 +345,7 @@ public class RuntimeEnvironment implements Environment {
}
@Override
- public ThroughputCalculator getThroughputMeter() {
+ public ThroughputCalculator getThroughputCalculator() {
return throughputCalculator;
}
}
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DummyEnvironment.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DummyEnvironment.java
index 55da6301..f5faead 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DummyEnvironment.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DummyEnvironment.java
@@ -252,7 +252,7 @@ public class DummyEnvironment implements Environment {
}
@Override
- public ThroughputCalculator getThroughputMeter() {
+ public ThroughputCalculator getThroughputCalculator() {
return new ThroughputCalculator(SystemClock.getInstance(), 10);
}
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/MockEnvironment.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/MockEnvironment.java
index 4dc92c5..0331d07 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/MockEnvironment.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/MockEnvironment.java
@@ -318,7 +318,7 @@ public class MockEnvironment implements Environment, AutoCloseable {
}
@Override
- public ThroughputCalculator getThroughputMeter() {
+ public ThroughputCalculator getThroughputCalculator() {
return throughputCalculator;
}
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/MockEnvironmentBuilder.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/MockEnvironmentBuilder.java
index 32fed2d..b126130 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/MockEnvironmentBuilder.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/MockEnvironmentBuilder.java
@@ -163,7 +163,8 @@ public class MockEnvironmentBuilder {
return this;
}
- public MockEnvironmentBuilder setThroughputMeter(ThroughputCalculator throughputCalculator) {
+ public MockEnvironmentBuilder setThroughputCalculator(
+ ThroughputCalculator throughputCalculator) {
this.throughputCalculator = throughputCalculator;
return this;
}
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamTask.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamTask.java
index 1132c34..47c9dff 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamTask.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/StreamTask.java
@@ -405,7 +405,7 @@ public abstract class StreamTask<OUT, OP extends StreamOperator<OUT>> extends Ab
injectChannelStateWriterIntoChannels();
environment.getMetricGroup().getIOMetricGroup().setEnableBusyTime(true);
- this.throughputCalculator = environment.getThroughputMeter();
+ this.throughputCalculator = environment.getThroughputCalculator();
this.bufferDebloatPeriod = getTaskConfiguration().get(BUFFER_DEBLOAT_PERIOD).toMillis();
if (getTaskConfiguration().get(TaskManagerOptions.BUFFER_DEBLOAT_ENABLED)) {
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamMockEnvironment.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamMockEnvironment.java
index 5cad561..ab1eff0 100644
--- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamMockEnvironment.java
+++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamMockEnvironment.java
@@ -309,7 +309,7 @@ public class StreamMockEnvironment implements Environment {
}
@Override
- public ThroughputCalculator getThroughputMeter() {
+ public ThroughputCalculator getThroughputCalculator() {
return throughputCalculator;
}
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskMailboxTestHarnessBuilder.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskMailboxTestHarnessBuilder.java
index ded2d24..c92bb9c 100644
--- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskMailboxTestHarnessBuilder.java
+++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskMailboxTestHarnessBuilder.java
@@ -126,7 +126,7 @@ public class StreamTaskMailboxTestHarnessBuilder<OUT> {
return this;
}
- public <T> StreamTaskMailboxTestHarnessBuilder<OUT> setThroughputMeter(
+ public <T> StreamTaskMailboxTestHarnessBuilder<OUT> setThroughputCalculator(
ThroughputCalculator throughputCalculator) {
this.throughputCalculator = throughputCalculator;
return this;
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTest.java
index 0d8558e..d5e149b 100644
--- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTest.java
+++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTest.java
@@ -1510,7 +1510,7 @@ public class StreamTaskTest extends TestLogger {
.build();
TaskIOMetricGroup ioMetricGroup =
task.getEnvironment().getMetricGroup().getIOMetricGroup();
- ThroughputCalculator throughputCalculator = environment.getThroughputMeter();
+ ThroughputCalculator throughputCalculator = environment.getThroughputCalculator();
final MailboxExecutor executor = task.mailboxProcessor.getMainMailboxExecutor();
final RunnableWithException completeFutureTask =
@@ -1791,7 +1791,7 @@ public class StreamTaskTest extends TestLogger {
.addInput(STRING_TYPE_INFO)
.setupOutputForSingletonOperatorChain(
new TestBoundedOneInputStreamOperator())
- .setThroughputMeter(
+ .setThroughputCalculator(
new ThroughputCalculator(SystemClock.getInstance(), 10) {
@Override
public long calculateThroughput() {
@@ -1864,7 +1864,7 @@ public class StreamTaskTest extends TestLogger {
.addInput(STRING_TYPE_INFO, inputChannels)
.setupOutputForSingletonOperatorChain(
new TestBoundedOneInputStreamOperator())
- .setThroughputMeter(
+ .setThroughputCalculator(
new ThroughputCalculator(SystemClock.getInstance(), 10) {
@Override
public long calculateThroughput() {