HBASE-24827 BackPort HBASE-11554 Remove Reusable poolmap Rpc client t…

…ype. (#2208) Co-authored-by: niuyulin <[email protected]> Signed-off-by: stack <[email protected]>
apache · Aug 12, 2020 · 8646ac1 · 8646ac1
1 parent b9c415a
commit 8646ac1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 138 deletions.
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/util/PoolMap.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/util/PoolMap.java
@@ -228,7 +228,7 @@ protected interface Pool<R> {
   }
 
   public enum PoolType {
-    Reusable, ThreadLocal, RoundRobin;
+    ThreadLocal, RoundRobin;
 
     public static PoolType valueOf(String poolTypeName,
         PoolType defaultPoolType, PoolType... allowedPoolTypes) {
@@ -270,8 +270,6 @@ public static PoolType fuzzyMatch(String name) {
 
   protected Pool<V> createPool() {
     switch (poolType) {
-    case Reusable:
-      return new ReusablePool<>(poolMaxSize);
     case RoundRobin:
       return new RoundRobinPool<>(poolMaxSize);
     case ThreadLocal:
@@ -280,51 +278,6 @@ protected Pool<V> createPool() {
     return null;
   }
 
-  /**
-   * The <code>ReusablePool</code> represents a {@link PoolMap.Pool} that builds
-   * on the {@link java.util.LinkedList} class. It essentially allows resources to be
-   * checked out, at which point it is removed from this pool. When the resource
-   * is no longer required, it should be returned to the pool in order to be
-   * reused.
-   *
-   * <p>
-   * If {@link #maxSize} is set to {@link Integer#MAX_VALUE}, then the size of
-   * the pool is unbounded. Otherwise, it caps the number of consumers that can
-   * check out a resource from this pool to the (non-zero positive) value
-   * specified in {@link #maxSize}.
-   * </p>
-   *
-   * @param <R>
-   *          the type of the resource
-   */
-  @SuppressWarnings("serial")
-  public static class ReusablePool<R> extends ConcurrentLinkedQueue<R> implements Pool<R> {
-    private int maxSize;
-
-    public ReusablePool(int maxSize) {
-      this.maxSize = maxSize;
-
-    }
-
-    @Override
-    public R get() {
-      return poll();
-    }
-
-    @Override
-    public R put(R resource) {
-      if (super.size() < maxSize) {
-        add(resource);
-      }
-      return null;
-    }
-
-    @Override
-    public Collection<R> values() {
-      return this;
-    }
-  }
-
   /**
    * The <code>RoundRobinPool</code> represents a {@link PoolMap.Pool}, which
    * stores its resources in an {@link ArrayList}. It load-balances access to

diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/util/TestReusablePoolMap.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/util/TestReusablePoolMap.java