HBASE-27207 ConnectionUtils.allOf should be moved to FutureUtils (#4627)

Signed-off-by: Duo Zhang <zhangduo@apache.org>
apache · Jul 15, 2022 · 02f2636 · 02f2636
1 parent 01b45e2
commit 02f2636
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTable.java
@@ -18,8 +18,8 @@
 package org.apache.hadoop.hbase.client;
 
 import static java.util.stream.Collectors.toList;
-import static org.apache.hadoop.hbase.client.ConnectionUtils.allOf;
 import static org.apache.hadoop.hbase.client.ConnectionUtils.toCheckExistenceOnly;
+import static org.apache.hadoop.hbase.util.FutureUtils.allOf;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;

diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java
@@ -306,11 +306,6 @@ static boolean noMoreResultsForReverseScan(Scan scan, RegionInfo info) {
     return Bytes.compareTo(info.getStartKey(), scan.getStopRow()) <= 0;
   }
 
-  static <T> CompletableFuture<List<T>> allOf(List<CompletableFuture<T>> futures) {
-    return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]))
-      .thenApply(v -> futures.stream().map(f -> f.getNow(null)).collect(toList()));
-  }
-
   public static ScanResultCache createScanResultCache(Scan scan) {
     if (scan.getAllowPartialResults()) {
       return new AllowPartialScanResultCache();

diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/FutureUtils.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/FutureUtils.java
@@ -17,8 +17,11 @@
  */
 package org.apache.hadoop.hbase.util;
 
+import static java.util.stream.Collectors.toList;
+
 import java.io.IOException;
 import java.io.InterruptedIOException;
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.ExecutionException;
@@ -197,4 +200,16 @@ public static <T> CompletableFuture<T> failedFuture(Throwable e) {
     future.completeExceptionally(e);
     return future;
   }
+
+  /**
+   * Returns a new CompletableFuture that is completed when all of the given CompletableFutures
+   * complete. If any of the given CompletableFutures complete exceptionally, then the returned
+   * CompletableFuture also does so, with a CompletionException holding this exception as its cause.
+   * Otherwise, the results of all given CompletableFutures could be obtained by the new returned
+   * CompletableFuture.
+   */
+  public static <T> CompletableFuture<List<T>> allOf(List<CompletableFuture<T>> futures) {
+    return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]))
+      .thenApply(v -> futures.stream().map(f -> f.getNow(null)).collect(toList()));
+  }
 }