Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1820C200B6D for ; Mon, 18 Jul 2016 13:23:00 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 16B5E160A90; Mon, 18 Jul 2016 11:23:00 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C33FA160A6D for ; Mon, 18 Jul 2016 13:22:57 +0200 (CEST) Received: (qmail 45441 invoked by uid 500); 18 Jul 2016 11:22:51 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 43798 invoked by uid 99); 18 Jul 2016 11:22:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Jul 2016 11:22:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7E108E9645; Mon, 18 Jul 2016 11:22:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: busbey@apache.org To: commits@hbase.apache.org Date: Mon, 18 Jul 2016 11:23:05 -0000 Message-Id: <0f67f543a30c4c178cd8510d2cfbdaa1@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [16/52] [partial] hbase-site git commit: Published site at 9bc7ecfb9dec6bfe14a12b6d3bfd11392d7752b8. archived-at: Mon, 18 Jul 2016 11:23:00 -0000 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5f066b2e/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.html ---------------------------------------------------------------------- diff --git a/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.html b/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.html index bef66b9..3ddb78e 100644 --- a/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.html +++ b/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.html @@ -101,7 +101,7 @@ 
@InterfaceAudience.Private
 @InterfaceStability.Evolving
-public class HBaseAdmin
+public class HBaseAdmin
 extends Object
 implements Admin
HBaseAdmin is no longer a client API. It is marked InterfaceAudience.Private indicating that @@ -161,41 +161,45 @@ implements private static class  -HBaseAdmin.EnableTableFuture  +HBaseAdmin.DispatchMergingRegionsFuture  private static class  -HBaseAdmin.ModifyColumnFamilyFuture  +HBaseAdmin.EnableTableFuture  private static class  -HBaseAdmin.ModifyTableFuture  +HBaseAdmin.ModifyColumnFamilyFuture  +private static class  +HBaseAdmin.ModifyTableFuture  + + protected static class  HBaseAdmin.NamespaceFuture  - + protected static class  HBaseAdmin.ProcedureFuture<V>
Future that waits on a procedure result.
- + private static class  HBaseAdmin.RestoreSnapshotFuture  - + protected static class  HBaseAdmin.TableFuture<V>  - + private static class  HBaseAdmin.ThrowableAbortable
Simple Abortable, throwing RuntimeException on abort.
- + private static class  HBaseAdmin.TruncateTableFuture  @@ -1175,6 +1179,25 @@ implements mergeRegions(byte[] nameOfRegionA, byte[] nameOfRegionB, boolean forcible) +
Deprecated.  +
Since 2.0. Will be removed in 3.0. Use + mergeRegionsAsync(byte[], byte[], boolean) instead.
+
+ + + +Future<Void> +mergeRegionsAsync(byte[] nameOfRegionA, + byte[] nameOfRegionB, + boolean forcible) +
Merge two regions.
+ + + +void +mergeRegionsSync(byte[] nameOfRegionA, + byte[] nameOfRegionB, + boolean forcible)
Merge two regions.
@@ -1478,7 +1501,7 @@ implements

  • LOG

    -
    private static final org.apache.commons.logging.Log LOG
    +
    private static final org.apache.commons.logging.Log LOG
    • @@ -1487,7 +1510,7 @@ implements

  • ZK_IDENTIFIER_PREFIX

    -
    private static final String ZK_IDENTIFIER_PREFIX
    +
    private static final String ZK_IDENTIFIER_PREFIX
    See Also:
    Constant Field Values
    • @@ -1497,7 +1520,7 @@ implements

  • connection

    -
    private ClusterConnection connection
    +
    private ClusterConnection connection
    • @@ -1506,7 +1529,7 @@ implements

  • conf

    -
    private volatile org.apache.hadoop.conf.Configuration conf
    +
    private volatile org.apache.hadoop.conf.Configuration conf
    • @@ -1515,7 +1538,7 @@ implements

  • pause

    -
    private final long pause
    +
    private final long pause
    • @@ -1524,7 +1547,7 @@ implements

  • numRetries

    -
    private final int numRetries
    +
    private final int numRetries
    • @@ -1533,7 +1556,7 @@ implements

  • retryLongerMultiplier

    -
    private final int retryLongerMultiplier
    +
    private final int retryLongerMultiplier
    • @@ -1542,7 +1565,7 @@ implements

  • syncWaitTimeout

    -
    private final int syncWaitTimeout
    +
    private final int syncWaitTimeout
    • @@ -1551,7 +1574,7 @@ implements

  • aborted

    -
    private boolean aborted
    +
    private boolean aborted
    • @@ -1560,7 +1583,7 @@ implements

  • operationTimeout

    -
    private int operationTimeout
    +
    private int operationTimeout
    • @@ -1569,7 +1592,7 @@ implements

  • rpcTimeout

    -
    private int rpcTimeout
    +
    private int rpcTimeout
    • @@ -1578,7 +1601,7 @@ implements

  • rpcCallerFactory

    -
    private RpcRetryingCallerFactory rpcCallerFactory
    +
    private RpcRetryingCallerFactory rpcCallerFactory
    • @@ -1587,7 +1610,7 @@ implements

  • rpcControllerFactory

    -
    private RpcControllerFactory rpcControllerFactory
    +
    private RpcControllerFactory rpcControllerFactory
    • @@ -1596,7 +1619,7 @@ implements

  • ng

    -
    private NonceGenerator ng
    +
    private NonceGenerator ng
    • @@ -1613,7 +1636,7 @@ implements

  • HBaseAdmin

    -
    HBaseAdmin(ClusterConnection connection)
+
    HBaseAdmin(ClusterConnection connection)
      throws IOException
    
 
    Throws:
    
 
    IOException
    
@@ -1633,7 +1656,7 @@ implements 
 
  • 
 
    getOperationTimeout
    
-
    public int getOperationTimeout()
    
+
    public int getOperationTimeout()
    
 
    
 
    Specified by:
    
 
    getOperationTimeout in interface Admin
    
@@ -1646,7 +1669,7 @@ implements 
 
  • 
 
    abort
    
-
    public void abort(String why,
+
    public void abort(String why,
          Throwable e)
    
 
    Description copied from interface: Abortable
    
 
    Abort the server or client.
    
@@ -1664,7 +1687,7 @@ implements 
 
  • 
 
    isAborted
    
-
    public boolean isAborted()
    
+
    public boolean isAborted()
    
 
    Description copied from interface: Abortable
    
 
    Check if the server or client was aborted.
    
 
    
@@ -1681,7 +1704,7 @@ implements 
 
  • 
 
    abortProcedure
    
-
    public boolean abortProcedure(long procId,
+
    public boolean abortProcedure(long procId,
                      boolean mayInterruptIfRunning)
                        throws IOException
    
 
    Description copied from interface: Admin
    
@@ -1701,7 +1724,7 @@ implements 
 
  • 
 
    abortProcedureAsync
    
-
    public Future<Boolean> abortProcedureAsync(long procId,
+
    public Future<Boolean> abortProcedureAsync(long procId,
                                   boolean mayInterruptIfRunning)
                                     throws IOException
    
 
    Description copied from interface: Admin
    
@@ -1725,7 +1748,7 @@ implements 
 
  • 
 
    getConnection
    
-
    public Connection getConnection()
    
+
    public Connection getConnection()
    
 
    
 
    Specified by:
    
 
    getConnection in interface Admin
    
@@ -1738,7 +1761,7 @@ implements 
 
  • 
 
    tableExists
    
-
    public boolean tableExists(TableName tableName)
+
    public boolean tableExists(TableName tableName)
                     throws IOException
    
 
    
 
    Specified by:
    
@@ -1755,7 +1778,7 @@ implements 
 
  • 
 
    listTables
    
-
    public HTableDescriptor[] listTables()
+
    public HTableDescriptor[] listTables()
                               throws IOException
    
 
    Description copied from interface: Admin
    
 
    List all the userspace tables.
    
@@ -1773,7 +1796,7 @@ implements 
 
  • 
 
    listTables
    
-
    public HTableDescriptor[] listTables(Pattern pattern)
+
    public HTableDescriptor[] listTables(Pattern pattern)
                               throws IOException
    
 
    Description copied from interface: Admin
    
 
    List all the userspace tables matching the given pattern.
    
@@ -1792,7 +1815,7 @@ implements 
 
  • 
 
    listTables
    
-
    public HTableDescriptor[] listTables(String regex)
+
    public HTableDescriptor[] listTables(String regex)
                               throws IOException
    
 
    Description copied from interface: Admin
    
 
    List all the userspace tables matching the given regular expression.
    
@@ -1811,7 +1834,7 @@ implements 
 
  • 
 
    listTables
    
-
    public HTableDescriptor[] listTables(Pattern pattern,
+
    public HTableDescriptor[] listTables(Pattern pattern,
                             boolean includeSysTables)
                               throws IOException
    
 
    Description copied from interface: Admin
    
@@ -1831,7 +1854,7 @@ implements 
 
  • 
 
    listTables
    
-
    public HTableDescriptor[] listTables(String regex,
+
    public HTableDescriptor[] listTables(String regex,
                             boolean includeSysTables)
                               throws IOException
    
 
    Description copied from interface: Admin
    
@@ -1851,7 +1874,7 @@ implements 
 
  • 
 
    listTableNames
    
-
    public TableName[] listTableNames()
+
    public TableName[] listTableNames()
                            throws IOException
    
 
    Description copied from interface: Admin
    
 
    List all of the names of userspace tables.
    
@@ -1869,7 +1892,7 @@ implements 
 
  • 
 
    listTableNames
    
-
    public TableName[] listTableNames(Pattern pattern)
+
    public TableName[] listTableNames(Pattern pattern)
                            throws IOException
    
 
    Description copied from interface: Admin
    
 
    List all of the names of userspace tables.
    
@@ -1888,7 +1911,7 @@ implements 
 
  • 
 
    listTableNames
    
-
    public TableName[] listTableNames(String regex)
+
    public TableName[] listTableNames(String regex)
                            throws IOException
    
 
    Description copied from interface: Admin
    
 
    List all of the names of userspace tables.
    
@@ -1907,7 +1930,7 @@ implements 
 
  • 
 
    listTableNames
    
-
    public TableName[] listTableNames(Pattern pattern,
+
    public TableName[] listTableNames(Pattern pattern,
                          boolean includeSysTables)
                            throws IOException
    
 
    Description copied from interface: Admin
    
@@ -1927,7 +1950,7 @@ implements 
 
  • 
 
    listTableNames
    
-
    public TableName[] listTableNames(String regex,
+
    public TableName[] listTableNames(String regex,
                          boolean includeSysTables)
                            throws IOException
    
 
    Description copied from interface: Admin
    
@@ -1947,7 +1970,7 @@ implements 
 
  • 
 
    getTableDescriptor
    
-
    public HTableDescriptor getTableDescriptor(TableName tableName)
+
    public HTableDescriptor getTableDescriptor(TableName tableName)
                                     throws IOException
    
 
    Description copied from interface: Admin
    
 
    Method for getting the tableDescriptor
    
@@ -1967,7 +1990,7 @@ implements 
 
  • 
 
    getTableDescriptor
    
-
    static HTableDescriptor getTableDescriptor(TableName tableName,
+
    static HTableDescriptor getTableDescriptor(TableName tableName,
                                   Connection connection,
                                   RpcRetryingCallerFactory rpcCallerFactory,
                                   RpcControllerFactory rpcControllerFactory,
@@ -1984,7 +2007,7 @@ implements 
 
  • 
 
    getPauseTime
    
-
    private long getPauseTime(int tries)
    
+
    private long getPauseTime(int tries)
    
 
    • 
 
 
@@ -1993,7 +2016,7 @@ implements 
 
  • 
 
    createTable
    
-
    public void createTable(HTableDescriptor desc)
+
    public void createTable(HTableDescriptor desc)
                  throws IOException
    
 
    Description copied from interface: Admin
    
 
    Creates a new table. Synchronous operation.
    
@@ -2014,7 +2037,7 @@ implements 
 
  • 
 
    createTable
    
-
    public void createTable(HTableDescriptor desc,
+
    public void createTable(HTableDescriptor desc,
                byte[] startKey,
                byte[] endKey,
                int numRegions)
@@ -2042,7 +2065,7 @@ implements 
 
  • 
 
    createTable
    
-
    public void createTable(HTableDescriptor desc,
+
    public void createTable(HTableDescriptor desc,
                byte[][] splitKeys)
                  throws IOException
    
 
    Description copied from interface: Admin
    
@@ -2066,7 +2089,7 @@ implements 
 
  • 
 
    createTableAsync
    
-
    public Future<Void> createTableAsync(HTableDescriptor desc,
+
    public Future<Void> createTableAsync(HTableDescriptor desc,
                             byte[][] splitKeys)
                               throws IOException
    
 
    Description copied from interface: Admin
    
@@ -2093,7 +2116,7 @@ implements 
 
  • 
 
    deleteTable
    
-
    public void deleteTable(TableName tableName)
+
    public void deleteTable(TableName tableName)
                  throws IOException
    
 
    Description copied from interface: Admin
    
 
    Deletes a table. Synchronous operation.
    
@@ -2111,7 +2134,7 @@ implements 
 
  • 
 
    deleteTableAsync
    
-
    public Future<Void> deleteTableAsync(TableName tableName)
+
    public Future<Void> deleteTableAsync(TableName tableName)
                               throws IOException
    
 
    Description copied from interface: Admin
    
 
    Deletes the table but does not block and wait for it be completely removed.
@@ -2135,7 +2158,7 @@ implements 
 
  • 
 
    deleteTables
    
-
    public HTableDescriptor[] deleteTables(String regex)
+
    public HTableDescriptor[] deleteTables(String regex)
                                 throws IOException
    
 
    Description copied from interface: Admin
    
 
    Deletes tables matching the passed in pattern and wait on completion. Warning: Use this method
@@ -2156,7 +2179,7 @@ implements 
 
  • 
 
    deleteTables
    
-
    public HTableDescriptor[] deleteTables(Pattern pattern)
+
    public HTableDescriptor[] deleteTables(Pattern pattern)
                                 throws IOException
    
 
    Delete tables matching the passed in pattern and wait on completion.
 
@@ -2178,7 +2201,7 @@ implements 
 
  • 
 
    truncateTable
    
-
    public void truncateTable(TableName tableName,
+
    public void truncateTable(TableName tableName,
                  boolean preserveSplits)
                    throws IOException
    
 
    Description copied from interface: Admin
    
@@ -2198,7 +2221,7 @@ implements 
 
  • 
 
    truncateTableAsync
    
-
    public Future<Void> truncateTableAsync(TableName tableName,
+
    public Future<Void> truncateTableAsync(TableName tableName,
                               boolean preserveSplits)
                                 throws IOException
    
 
    Description copied from interface: Admin
    
@@ -2222,7 +2245,7 @@ implements 
 
  • 
 
    getTableSplits
    
-
    private byte[][] getTableSplits(TableName tableName)
+
    private byte[][] getTableSplits(TableName tableName)
                          throws IOException
    
 
    Throws:
    
 
    IOException
    
@@ -2234,7 +2257,7 @@ implements 
 
  • 
 
    enableTable
    
-
    public void enableTable(TableName tableName)
+
    public void enableTable(TableName tableName)
                  throws IOException
    
 
    Description copied from interface: Admin
    
 
    Enable a table.  May timeout.  Use Admin.enableTableAsync(org.apache.hadoop.hbase.TableName)
@@ -2258,7 +2281,7 @@ implements 
 
  • 
 
    enableTableAsync
    
-
    public Future<Void> enableTableAsync(TableName tableName)
+
    public Future<Void> enableTableAsync(TableName tableName)
                               throws IOException
    
 
    Description copied from interface: Admin
    
 
    Enable the table but does not block and wait for it be completely enabled.
@@ -2282,7 +2305,7 @@ implements 
 
  • 
 
    enableTables
    
-
    public HTableDescriptor[] enableTables(String regex)
+
    public HTableDescriptor[] enableTables(String regex)
                                 throws IOException
    
 
    Description copied from interface: Admin
    
 
    Enable tables matching the passed in pattern and wait on completion. Warning: Use this method
@@ -2302,7 +2325,7 @@ implements 
 
  • 
 
    enableTables
    
-
    public HTableDescriptor[] enableTables(Pattern pattern)
+
    public HTableDescriptor[] enableTables(Pattern pattern)
                                 throws IOException
    
 
    Description copied from interface: Admin
    
 
    Enable tables matching the passed in pattern and wait on completion. Warning: Use this method
@@ -2322,7 +2345,7 @@ implements 
 
  • 
 
    disableTable
    
-
    public void disableTable(TableName tableName)
+
    public void disableTable(TableName tableName)
                   throws IOException
    
 
    Description copied from interface: Admin
    
 
    Disable table and wait on completion.  May timeout eventually.  Use Admin.disableTableAsync(org.apache.hadoop.hbase.TableName) and
@@ -2342,7 +2365,7 @@ implements 
 
  • 
 
    disableTableAsync
    
-
    public Future<Void> disableTableAsync(TableName tableName)
+
    public Future<Void> disableTableAsync(TableName tableName)
                                throws IOException
    
 
    Description copied from interface: Admin
    
 
    Disable the table but does not block and wait for it be completely disabled.
@@ -2366,7 +2389,7 @@ implements 
 
  • 
 
    disableTables
    
-
    public HTableDescriptor[] disableTables(String regex)
+
    public HTableDescriptor[] disableTables(String regex)
                                  throws IOException
    
 
    Description copied from interface: Admin
    
 
    Disable tables matching the passed in pattern and wait on completion. Warning: Use this method
@@ -2387,7 +2410,7 @@ implements 
 
  • 
 
    disableTables
    
-
    public HTableDescriptor[] disableTables(Pattern pattern)
+
    public HTableDescriptor[] disableTables(Pattern pattern)
                                  throws IOException
    
 
    Description copied from interface: Admin
    
 
    Disable tables matching the passed in pattern and wait on completion. Warning: Use this method
@@ -2408,7 +2431,7 @@ implements 
 
  • 
 
    isTableEnabled
    
-
    public boolean isTableEnabled(TableName tableName)
+
    public boolean isTableEnabled(TableName tableName)
                        throws IOException
    
 
    
 
    Specified by:
    
@@ -2425,7 +2448,7 @@ implements 
 
  • 
 
    isTableDisabled
    
-
    public boolean isTableDisabled(TableName tableName)
+
    public boolean isTableDisabled(TableName tableName)
                         throws IOException
    
 
    
 
    Specified by:
    
@@ -2442,7 +2465,7 @@ implements 
 
  • 
 
    isTableAvailable
    
-
    public boolean isTableAvailable(TableName tableName)
+
    public boolean isTableAvailable(TableName tableName)
                          throws IOException
    
 
    
 
    Specified by:
    
@@ -2459,7 +2482,7 @@ implements 
 
  • 
 
    isTableAvailable
    
-
    public boolean isTableAvailable(TableName tableName,
+
    public boolean isTableAvailable(TableName tableName,
                        byte[][] splitKeys)
                          throws IOException
    
 
    Description copied from interface: Admin
    
@@ -2480,7 +2503,7 @@ implements 
 
  • 
 
    getAlterStatus
    
-
    public Pair<Integer,Integer> getAlterStatus(TableName tableName)
+
    public Pair<Integer,Integer> getAlterStatus(TableName tableName)
                                      throws IOException
    
 
    Description copied from interface: Admin
    
 
    Get the status of alter command - indicates how many regions have received the updated schema
@@ -2501,7 +2524,7 @@ implements 
 
  • 
 
    getAlterStatus
    
-
    public Pair<Integer,Integer> getAlterStatus(byte[] tableName)
+
    public Pair<Integer,Integer> getAlterStatus(byte[] tableName)
                                      throws IOException
    
 
    Description copied from interface: Admin
    
 
    Get the status of alter command - indicates how many regions have received the updated schema
@@ -2523,7 +2546,7 @@ implements 
 
    addColumn
    
 
    @Deprecated
-public void addColumn(TableName tableName,
+public void addColumn(TableName tableName,
                         HColumnDescriptor columnFamily)
                throws IOException
    
 
    Deprecated. Since 2.0. Will be removed in 3.0. Use
@@ -2543,7 +2566,7 @@ public void 
 
  • 
 
    addColumnFamily
    
-
    public Future<Void> addColumnFamily(TableName tableName,
+
    public Future<Void> addColumnFamily(TableName tableName,
                            HColumnDescriptor columnFamily)
                              throws IOException
    
 
    Description copied from interface: Admin
    
@@ -2569,7 +2592,7 @@ public void 
 
    deleteColumn
    
 
    @Deprecated
-public void deleteColumn(TableName tableName,
+public void deleteColumn(TableName tableName,
                            byte[] columnFamily)
                   throws IOException
    
 
    Deprecated. Since 2.0. Will be removed in 3.0. Use
@@ -2589,7 +2612,7 @@ public void 
 
  • 
 
    deleteColumnFamily
    
-
    public Future<Void> deleteColumnFamily(TableName tableName,
+
    public Future<Void> deleteColumnFamily(TableName tableName,
                               byte[] columnFamily)
                                 throws IOException
    
 
    Description copied from interface: Admin
    
@@ -2615,7 +2638,7 @@ public void 
 
    modifyColumn
    
 
    @Deprecated
-public void modifyColumn(TableName tableName,
+public void modifyColumn(TableName tableName,
                            HColumnDescriptor columnFamily)
                   throws IOException
    
 
    Deprecated. As of 2.0. Will be removed in 3.0. Use
@@ -2639,7 +2662,7 @@ public void 
 
  • 
 
    modifyColumnFamily
    
-
    public Future<Void> modifyColumnFamily(TableName tableName,
+
    public Future<Void> modifyColumnFamily(TableName tableName,
                               HColumnDescriptor columnFamily)
                                 throws IOException
    
 
    Description copied from interface: Admin
    
@@ -2660,7 +2683,7 @@ public void 
 
  • 
 
    closeRegion
    
-
    public void closeRegion(String regionname,
+
    public void closeRegion(String regionname,
                String serverName)
                  throws