Repository: flink Updated Branches: refs/heads/master 152f6c9af -> c568aed1e
[hotfix] Remove redundant FutureUtils#getFailedFuture FutureUtils#completedExceptionally does exactly the same. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/747cf821 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/747cf821 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/747cf821 Branch: refs/heads/master Commit: 747cf821f96eb559c28af39e2150a134224214b1 Parents: 152f6c9 Author: Till Rohrmann <[email protected]> Authored: Sun Oct 29 16:01:18 2017 +0100 Committer: Till Rohrmann <[email protected]> Committed: Tue Oct 31 00:08:52 2017 +0100 ---------------------------------------------------------------------- .../client/proxy/KvStateClientProxyHandler.java | 2 +- .../client/proxy/KvStateClientProxyImpl.java | 2 +- .../flink/runtime/concurrent/FutureUtils.java | 16 ---------------- 3 files changed, 2 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/747cf821/flink-queryable-state/flink-queryable-state-runtime/src/main/java/org/apache/flink/queryablestate/client/proxy/KvStateClientProxyHandler.java ---------------------------------------------------------------------- diff --git a/flink-queryable-state/flink-queryable-state-runtime/src/main/java/org/apache/flink/queryablestate/client/proxy/KvStateClientProxyHandler.java b/flink-queryable-state/flink-queryable-state-runtime/src/main/java/org/apache/flink/queryablestate/client/proxy/KvStateClientProxyHandler.java index d434336..73ef7f3 100644 --- a/flink-queryable-state/flink-queryable-state-runtime/src/main/java/org/apache/flink/queryablestate/client/proxy/KvStateClientProxyHandler.java +++ b/flink-queryable-state/flink-queryable-state-runtime/src/main/java/org/apache/flink/queryablestate/client/proxy/KvStateClientProxyHandler.java @@ -169,7 +169,7 @@ public class KvStateClientProxyHandler extends AbstractServerHandler<KvStateRequ final InetSocketAddress serverAddress = location.getKvStateServerAddress(keyGroupIndex); if (serverAddress == null) { - return FutureUtils.getFailedFuture(new UnknownKvStateKeyGroupLocationException(getServerName())); + return FutureUtils.completedExceptionally(new UnknownKvStateKeyGroupLocationException(getServerName())); } else { // Query server final KvStateID kvStateId = location.getKvStateID(keyGroupIndex); http://git-wip-us.apache.org/repos/asf/flink/blob/747cf821/flink-queryable-state/flink-queryable-state-runtime/src/main/java/org/apache/flink/queryablestate/client/proxy/KvStateClientProxyImpl.java ---------------------------------------------------------------------- diff --git a/flink-queryable-state/flink-queryable-state-runtime/src/main/java/org/apache/flink/queryablestate/client/proxy/KvStateClientProxyImpl.java b/flink-queryable-state/flink-queryable-state-runtime/src/main/java/org/apache/flink/queryablestate/client/proxy/KvStateClientProxyImpl.java index f473443..6fcaf40 100644 --- a/flink-queryable-state/flink-queryable-state-runtime/src/main/java/org/apache/flink/queryablestate/client/proxy/KvStateClientProxyImpl.java +++ b/flink-queryable-state/flink-queryable-state-runtime/src/main/java/org/apache/flink/queryablestate/client/proxy/KvStateClientProxyImpl.java @@ -43,7 +43,7 @@ import java.util.concurrent.CompletableFuture; public class KvStateClientProxyImpl extends AbstractServerBase<KvStateRequest, KvStateResponse> implements KvStateClientProxy { private static final CompletableFuture<ActorGateway> UNKNOWN_JOB_MANAGER = - FutureUtils.getFailedFuture(new UnknownJobManagerException()); + FutureUtils.completedExceptionally(new UnknownJobManagerException()); /** Number of threads used to process incoming requests. */ private final int queryExecutorThreads; http://git-wip-us.apache.org/repos/asf/flink/blob/747cf821/flink-runtime/src/main/java/org/apache/flink/runtime/concurrent/FutureUtils.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/concurrent/FutureUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/concurrent/FutureUtils.java index 50ef543..b982c8e 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/concurrent/FutureUtils.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/concurrent/FutureUtils.java @@ -445,20 +445,4 @@ public class FutureUtils { return result; } - - // ------------------------------------------------------------------------ - // Future Completed with an exception. - // ------------------------------------------------------------------------ - - /** - * Returns a {@link CompletableFuture} that has failed with the exception - * provided as argument. - * @param throwable the exception to fail the future with. - * @return The failed future. - */ - public static <T> CompletableFuture<T> getFailedFuture(Throwable throwable) { - CompletableFuture<T> failedAttempt = new CompletableFuture<>(); - failedAttempt.completeExceptionally(throwable); - return failedAttempt; - } }
