[hbase] branch branch-2 updated: HBASE-22065 Add listTableDescriptors(List) method in AsyncAdmin

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new ffcc003  HBASE-22065 Add listTableDescriptors(List<TableName>) method in AsyncAdmin
ffcc003 is described below

commit ffcc003f853303f321d3c8a3d0915dd3639feaa5
Author: niuyulin <ni...@xiaomi.com>
AuthorDate: Wed Mar 20 15:27:59 2019 +0800

    HBASE-22065 Add listTableDescriptors(List<TableName>) method in AsyncAdmin
    
    Signed-off-by: zhangduo <zh...@apache.org>
---
 .../org/apache/hadoop/hbase/client/AsyncAdmin.java     |  7 +++++++
 .../apache/hadoop/hbase/client/AsyncHBaseAdmin.java    |  5 +++++
 .../apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java | 10 ++++++++++
 .../hadoop/hbase/client/TestAsyncTableAdminApi3.java   | 18 ++++++++++++++++++
 4 files changed, 40 insertions(+)

diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncAdmin.java
index 2df18fe..682ae62 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncAdmin.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncAdmin.java
@@ -84,6 +84,13 @@ public interface AsyncAdmin {
       boolean includeSysTables);
 
   /**
+   * List specific tables including system tables.
+   * @param tableNames the table list to match against
+   * @return - returns a list of TableDescriptors wrapped by a {@link CompletableFuture}.
+   */
+  CompletableFuture<List<TableDescriptor>> listTableDescriptors(List<TableName> tableNames);
+
+  /**
    * Get list of table descriptors by namespace.
    * @param name namespace name
    * @return returns a list of TableDescriptors wrapped by a {@link CompletableFuture}.
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.java
index e62f3bb..f037b4e 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.java
@@ -88,6 +88,11 @@ class AsyncHBaseAdmin implements AsyncAdmin {
   }
 
   @Override
+  public CompletableFuture<List<TableDescriptor>> listTableDescriptors(List<TableName> tableNames) {
+    return wrap(rawAdmin.listTableDescriptors(tableNames));
+  }
+
+  @Override
   public CompletableFuture<List<TableDescriptor>> listTableDescriptorsByNamespace(String name) {
     return wrap(rawAdmin.listTableDescriptorsByNamespace(name));
   }
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java
index 0eba0fd..f00a38d 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java
@@ -470,6 +470,16 @@ class RawAsyncHBaseAdmin implements AsyncAdmin {
       includeSysTables));
   }
 
+  @Override
+  public CompletableFuture<List<TableDescriptor>> listTableDescriptors(List<TableName> tableNames) {
+    Preconditions.checkNotNull(tableNames,
+      "tableNames is null. If you don't specify tableNames, " + "use listTables(boolean) instead");
+    if (tableNames.isEmpty()) {
+      return CompletableFuture.completedFuture(Collections.emptyList());
+    }
+    return getTableDescriptors(RequestConverter.buildGetTableDescriptorsRequest(tableNames));
+  }
+
   private CompletableFuture<List<TableDescriptor>>
       getTableDescriptors(GetTableDescriptorsRequest request) {
     return this.<List<TableDescriptor>> newMasterCaller()
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi3.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi3.java
index 750749d..d4bb3be 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi3.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi3.java
@@ -25,6 +25,8 @@ import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
@@ -110,6 +112,22 @@ public class TestAsyncTableAdminApi3 extends TestAsyncAdminBase {
       assertTrue("Not found: " + tables[i], found);
     }
 
+    tableNames = new ArrayList<TableName>(tables.length + 1);
+    tableDescs = admin.listTableDescriptors(tableNames).get();
+    size = tableDescs.size();
+    assertEquals(0, size);
+
+    Collections.addAll(tableNames, tables);
+    tableNames.add(TableName.META_TABLE_NAME);
+    tableDescs = admin.listTableDescriptors(tableNames).get();
+    size = tableDescs.size();
+    assertEquals(tables.length + 1, size);
+    for (int i = 0, j = 0; i < tables.length && j < size; i++, j++) {
+      assertTrue("tableName should be equal in order",
+          tableDescs.get(j).getTableName().equals(tables[i]));
+    }
+    assertTrue(tableDescs.get(size - 1).getTableName().equals(TableName.META_TABLE_NAME));
+
     for (int i = 0; i < tables.length; i++) {
       admin.disableTable(tables[i]).join();
       admin.deleteTable(tables[i]).join();