[FLINK-19032] Remove deprecated RuntimeContext#getAllAcumullators

zhengcanbin · Aug 26, 2020 · 5361713 · 5361713
1 parent d2d898b
commit 5361713
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 49 deletions.
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/functions/RuntimeContext.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/RuntimeContext.java
@@ -42,7 +42,6 @@
 
 import java.io.Serializable;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -143,15 +142,6 @@ public interface RuntimeContext {
 	 */
 	<V, A extends Serializable> Accumulator<V, A> getAccumulator(String name);
 
-	/**
-	 * Returns a map of all registered accumulators for this task.
-	 * The returned map must not be modified.
-	 * @deprecated Use getAccumulator(..) to obtain the value of an accumulator.
-	 */
-	@Deprecated
-	@PublicEvolving
-	Map<String, Accumulator<?, ?>> getAllAccumulators();
-
 	/**
 	 * Convenience function to create a counter object for integers.
 	 */

diff --git a/...e/src/main/java/org/apache/flink/api/common/functions/util/AbstractRuntimeUDFContext.java b/...e/src/main/java/org/apache/flink/api/common/functions/util/AbstractRuntimeUDFContext.java
@@ -45,7 +45,6 @@
 import org.apache.flink.metrics.MetricGroup;
 
 import java.io.Serializable;
-import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.Future;
 
@@ -158,11 +157,6 @@ public <V, A extends Serializable> Accumulator<V, A> getAccumulator(String name)
 		return (Accumulator<V, A>) accumulators.get(name);
 	}
 
-	@Override
-	public Map<String, Accumulator<?, ?>> getAllAccumulators() {
-		return Collections.unmodifiableMap(this.accumulators);
-	}
-
 	@Override
 	public ClassLoader getUserCodeClassLoader() {
 		return this.userCodeClassLoader;

diff --git a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/operator/CepRuntimeContext.java b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/operator/CepRuntimeContext.java
@@ -43,7 +43,6 @@
 
 import java.io.Serializable;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import static org.apache.flink.util.Preconditions.checkNotNull;
@@ -136,11 +135,6 @@ public <V, A extends Serializable> Accumulator<V, A> getAccumulator(final String
 		throw new UnsupportedOperationException("Accumulators are not supported.");
 	}
 
-	@Override
-	public Map<String, Accumulator<?, ?>> getAllAccumulators() {
-		throw new UnsupportedOperationException("Accumulators are not supported.");
-	}
-
 	@Override
 	public IntCounter getIntCounter(final String name) {
 		throw new UnsupportedOperationException("Int counters are not supported.");

diff --git a/...ibraries/flink-cep/src/test/java/org/apache/flink/cep/operator/CepRuntimeContextTest.java b/...ibraries/flink-cep/src/test/java/org/apache/flink/cep/operator/CepRuntimeContextTest.java
@@ -197,13 +197,6 @@ public void testCepRuntimeContext() {
 			// expected
 		}
 
-		try {
-			runtimeContext.getAllAccumulators();
-			fail("Expected getAllAccumulators to fail with unsupported operation exception.");
-		} catch (UnsupportedOperationException e) {
-			// expected
-		}
-
 		try {
 			runtimeContext.getIntCounter("foobar");
 			fail("Expected getIntCounter to fail with unsupported operation exception.");

diff --git a/...cessing-api/src/main/java/org/apache/flink/state/api/runtime/SavepointRuntimeContext.java b/...cessing-api/src/main/java/org/apache/flink/state/api/runtime/SavepointRuntimeContext.java
@@ -48,7 +48,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -135,12 +134,6 @@ public <V, A extends Serializable> Accumulator<V, A> getAccumulator(String name)
 		return ctx.getAccumulator(name);
 	}
 
-	@Override
-	@Deprecated
-	public Map<String, Accumulator<?, ?>> getAllAccumulators() {
-		return ctx.getAllAccumulators();
-	}
-
 	@Override
 	public IntCounter getIntCounter(String name) {
 		return ctx.getIntCounter(name);

diff --git a/...-java/src/main/java/org/apache/flink/streaming/api/functions/async/RichAsyncFunction.java b/...-java/src/main/java/org/apache/flink/streaming/api/functions/async/RichAsyncFunction.java
@@ -49,7 +49,6 @@
 
 import java.io.Serializable;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -198,11 +197,6 @@ public <V, A extends Serializable> Accumulator<V, A> getAccumulator(String name)
 			throw new UnsupportedOperationException("Accumulators are not supported in rich async functions.");
 		}
 
-		@Override
-		public Map<String, Accumulator<?, ?>> getAllAccumulators() {
-			throw new UnsupportedOperationException("Accumulators are not supported in rich async functions.");
-		}
-
 		@Override
 		public IntCounter getIntCounter(String name) {
 			throw new UnsupportedOperationException("Int counters are not supported in rich async functions.");

diff --git a/...a/src/test/java/org/apache/flink/streaming/api/functions/async/RichAsyncFunctionTest.java b/...a/src/test/java/org/apache/flink/streaming/api/functions/async/RichAsyncFunctionTest.java
@@ -241,13 +241,6 @@ public Accumulator<Integer, Integer> clone() {
 			// expected
 		}
 
-		try {
-			runtimeContext.getAllAccumulators();
-			fail("Expected getAllAccumulators to fail with unsupported operation exception.");
-		} catch (UnsupportedOperationException e) {
-			// expected
-		}
-
 		try {
 			runtimeContext.getIntCounter("foobar");
 			fail("Expected getIntCounter to fail with unsupported operation exception.");