[hotfix][runtime] setThroughputMeter renamed to setThroughputCalculat…

…or according to name of the set object.
derekm · Aug 11, 2021 · e6996cd · e6996cd
1 parent f22b6dd
commit e6996cd
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 12 deletions.
diff --git a/...processing-api/src/main/java/org/apache/flink/state/api/runtime/SavepointEnvironment.java b/...processing-api/src/main/java/org/apache/flink/state/api/runtime/SavepointEnvironment.java
@@ -288,7 +288,7 @@ public TaskEventDispatcher getTaskEventDispatcher() {
     }
 
     @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
@@ -241,7 +241,7 @@ void acknowledgeCheckpoint(
      *
      * @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
@@ -345,7 +345,7 @@ public ExecutorService getAsyncOperationsThreadPool() {
     }
 
     @Override
-    public ThroughputCalculator getThroughputMeter() {
+    public ThroughputCalculator getThroughputCalculator() {
         return throughputCalculator;
     }
 }
diff --git a/...-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DummyEnvironment.java b/...-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DummyEnvironment.java
@@ -252,7 +252,7 @@ public TaskEventDispatcher getTaskEventDispatcher() {
     }
 
     @Override
-    public ThroughputCalculator getThroughputMeter() {
+    public ThroughputCalculator getThroughputCalculator() {
         return new ThroughputCalculator(SystemClock.getInstance(), 10);
     }
 

diff --git a/...k-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/MockEnvironment.java b/...k-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/MockEnvironment.java
@@ -318,7 +318,7 @@ public TaskEventDispatcher getTaskEventDispatcher() {
     }
 
     @Override
-    public ThroughputCalculator getThroughputMeter() {
+    public ThroughputCalculator getThroughputCalculator() {
         return throughputCalculator;
     }
 

diff --git a/...me/src/test/java/org/apache/flink/runtime/operators/testutils/MockEnvironmentBuilder.java b/...me/src/test/java/org/apache/flink/runtime/operators/testutils/MockEnvironmentBuilder.java
@@ -163,7 +163,8 @@ public MockEnvironmentBuilder setExternalResourceInfoProvider(
         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
@@ -405,7 +405,7 @@ protected StreamTask(
         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/...ng-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamMockEnvironment.java b/...ng-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamMockEnvironment.java
@@ -309,7 +309,7 @@ public TaskEventDispatcher getTaskEventDispatcher() {
     }
 
     @Override
-    public ThroughputCalculator getThroughputMeter() {
+    public ThroughputCalculator getThroughputCalculator() {
         return throughputCalculator;
     }
 

diff --git a/...st/java/org/apache/flink/streaming/runtime/tasks/StreamTaskMailboxTestHarnessBuilder.java b/...st/java/org/apache/flink/streaming/runtime/tasks/StreamTaskMailboxTestHarnessBuilder.java
@@ -126,7 +126,7 @@ public <T> StreamTaskMailboxTestHarnessBuilder<OUT> setCheckpointResponder(
         return this;
     }
 
-    public <T> StreamTaskMailboxTestHarnessBuilder<OUT> setThroughputMeter(
+    public <T> StreamTaskMailboxTestHarnessBuilder<OUT> setThroughputCalculator(
             ThroughputCalculator throughputCalculator) {
         this.throughputCalculator = throughputCalculator;
         return this;

diff --git a/...streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTest.java b/...streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTest.java
@@ -1510,7 +1510,7 @@ public void testProcessWithUnAvailableInput() throws Exception {
                             .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 void testThroughputSchedulerStartsOnInvoke() throws Exception {
                         .addInput(STRING_TYPE_INFO)
                         .setupOutputForSingletonOperatorChain(
                                 new TestBoundedOneInputStreamOperator())
-                        .setThroughputMeter(
+                        .setThroughputCalculator(
                                 new ThroughputCalculator(SystemClock.getInstance(), 10) {
                                     @Override
                                     public long calculateThroughput() {
@@ -1864,7 +1864,7 @@ public void testBufferSizeRecalculationStartSuccessfully() throws Exception {
                         .addInput(STRING_TYPE_INFO, inputChannels)
                         .setupOutputForSingletonOperatorChain(
                                 new TestBoundedOneInputStreamOperator())
-                        .setThroughputMeter(
+                        .setThroughputCalculator(
                                 new ThroughputCalculator(SystemClock.getInstance(), 10) {
                                     @Override
                                     public long calculateThroughput() {