You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/04/12 14:49:42 UTC
[28/51] [partial] hbase-site git commit: Published site at
2912c953551bedbfbf30c32c156ed7bb187d54c3.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d220bc5e/devapidocs/src-html/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.TableOperator.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.TableOperator.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.TableOperator.html
index e63cd50..d8c0d2b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.TableOperator.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.TableOperator.html
@@ -422,7 +422,7 @@
<span class="sourceLineNo">414</span> }<a name="line.414"></a>
<span class="sourceLineNo">415</span><a name="line.415"></a>
<span class="sourceLineNo">416</span> /**<a name="line.416"></a>
-<span class="sourceLineNo">417</span> * {@link #listTables(boolean)}<a name="line.417"></a>
+<span class="sourceLineNo">417</span> * {@link #listTableDescriptors(boolean)}<a name="line.417"></a>
<span class="sourceLineNo">418</span> */<a name="line.418"></a>
<span class="sourceLineNo">419</span> @Override<a name="line.419"></a>
<span class="sourceLineNo">420</span> public CompletableFuture<List<TableDescriptor>> listTableDescriptors(Pattern pattern,<a name="line.420"></a>
@@ -3476,16 +3476,79 @@
<span class="sourceLineNo">3468</span> return future;<a name="line.3468"></a>
<span class="sourceLineNo">3469</span> }<a name="line.3469"></a>
<span class="sourceLineNo">3470</span><a name="line.3470"></a>
-<span class="sourceLineNo">3471</span> private CompletableFuture<CacheEvictionStats> clearBlockCache(ServerName serverName,<a name="line.3471"></a>
-<span class="sourceLineNo">3472</span> List<RegionInfo> hris) {<a name="line.3472"></a>
-<span class="sourceLineNo">3473</span> return this.<CacheEvictionStats> newAdminCaller().action((controller, stub) -> this<a name="line.3473"></a>
-<span class="sourceLineNo">3474</span> .<ClearRegionBlockCacheRequest, ClearRegionBlockCacheResponse, CacheEvictionStats> adminCall(<a name="line.3474"></a>
-<span class="sourceLineNo">3475</span> controller, stub, RequestConverter.buildClearRegionBlockCacheRequest(hris),<a name="line.3475"></a>
-<span class="sourceLineNo">3476</span> (s, c, req, done) -> s.clearRegionBlockCache(controller, req, done),<a name="line.3476"></a>
-<span class="sourceLineNo">3477</span> resp -> ProtobufUtil.toCacheEvictionStats(resp.getStats())))<a name="line.3477"></a>
-<span class="sourceLineNo">3478</span> .serverName(serverName).call();<a name="line.3478"></a>
-<span class="sourceLineNo">3479</span> }<a name="line.3479"></a>
-<span class="sourceLineNo">3480</span>}<a name="line.3480"></a>
+<span class="sourceLineNo">3471</span> @Override<a name="line.3471"></a>
+<span class="sourceLineNo">3472</span> public CompletableFuture<Void> cloneTableSchema(TableName tableName, TableName newTableName,<a name="line.3472"></a>
+<span class="sourceLineNo">3473</span> boolean preserveSplits) {<a name="line.3473"></a>
+<span class="sourceLineNo">3474</span> CompletableFuture<Void> future = new CompletableFuture<>();<a name="line.3474"></a>
+<span class="sourceLineNo">3475</span> tableExists(tableName).whenComplete(<a name="line.3475"></a>
+<span class="sourceLineNo">3476</span> (exist, err) -> {<a name="line.3476"></a>
+<span class="sourceLineNo">3477</span> if (err != null) {<a name="line.3477"></a>
+<span class="sourceLineNo">3478</span> future.completeExceptionally(err);<a name="line.3478"></a>
+<span class="sourceLineNo">3479</span> return;<a name="line.3479"></a>
+<span class="sourceLineNo">3480</span> }<a name="line.3480"></a>
+<span class="sourceLineNo">3481</span> if (!exist) {<a name="line.3481"></a>
+<span class="sourceLineNo">3482</span> future.completeExceptionally(new TableNotFoundException(tableName));<a name="line.3482"></a>
+<span class="sourceLineNo">3483</span> return;<a name="line.3483"></a>
+<span class="sourceLineNo">3484</span> }<a name="line.3484"></a>
+<span class="sourceLineNo">3485</span> tableExists(newTableName).whenComplete(<a name="line.3485"></a>
+<span class="sourceLineNo">3486</span> (exist1, err1) -> {<a name="line.3486"></a>
+<span class="sourceLineNo">3487</span> if (err1 != null) {<a name="line.3487"></a>
+<span class="sourceLineNo">3488</span> future.completeExceptionally(err1);<a name="line.3488"></a>
+<span class="sourceLineNo">3489</span> return;<a name="line.3489"></a>
+<span class="sourceLineNo">3490</span> }<a name="line.3490"></a>
+<span class="sourceLineNo">3491</span> if (exist1) {<a name="line.3491"></a>
+<span class="sourceLineNo">3492</span> future.completeExceptionally(new TableExistsException(newTableName));<a name="line.3492"></a>
+<span class="sourceLineNo">3493</span> return;<a name="line.3493"></a>
+<span class="sourceLineNo">3494</span> }<a name="line.3494"></a>
+<span class="sourceLineNo">3495</span> getDescriptor(tableName).whenComplete(<a name="line.3495"></a>
+<span class="sourceLineNo">3496</span> (tableDesc, err2) -> {<a name="line.3496"></a>
+<span class="sourceLineNo">3497</span> if (err2 != null) {<a name="line.3497"></a>
+<span class="sourceLineNo">3498</span> future.completeExceptionally(err2);<a name="line.3498"></a>
+<span class="sourceLineNo">3499</span> return;<a name="line.3499"></a>
+<span class="sourceLineNo">3500</span> }<a name="line.3500"></a>
+<span class="sourceLineNo">3501</span> TableDescriptor newTableDesc<a name="line.3501"></a>
+<span class="sourceLineNo">3502</span> = TableDescriptorBuilder.copy(newTableName, tableDesc);<a name="line.3502"></a>
+<span class="sourceLineNo">3503</span> if (preserveSplits) {<a name="line.3503"></a>
+<span class="sourceLineNo">3504</span> getTableSplits(tableName).whenComplete((splits, err3) -> {<a name="line.3504"></a>
+<span class="sourceLineNo">3505</span> if (err3 != null) {<a name="line.3505"></a>
+<span class="sourceLineNo">3506</span> future.completeExceptionally(err3);<a name="line.3506"></a>
+<span class="sourceLineNo">3507</span> } else {<a name="line.3507"></a>
+<span class="sourceLineNo">3508</span> createTable(newTableDesc, splits).whenComplete(<a name="line.3508"></a>
+<span class="sourceLineNo">3509</span> (result, err4) -> {<a name="line.3509"></a>
+<span class="sourceLineNo">3510</span> if (err4 != null) {<a name="line.3510"></a>
+<span class="sourceLineNo">3511</span> future.completeExceptionally(err4);<a name="line.3511"></a>
+<span class="sourceLineNo">3512</span> } else {<a name="line.3512"></a>
+<span class="sourceLineNo">3513</span> future.complete(result);<a name="line.3513"></a>
+<span class="sourceLineNo">3514</span> }<a name="line.3514"></a>
+<span class="sourceLineNo">3515</span> });<a name="line.3515"></a>
+<span class="sourceLineNo">3516</span> }<a name="line.3516"></a>
+<span class="sourceLineNo">3517</span> });<a name="line.3517"></a>
+<span class="sourceLineNo">3518</span> } else {<a name="line.3518"></a>
+<span class="sourceLineNo">3519</span> createTable(newTableDesc).whenComplete(<a name="line.3519"></a>
+<span class="sourceLineNo">3520</span> (result, err5) -> {<a name="line.3520"></a>
+<span class="sourceLineNo">3521</span> if (err5 != null) {<a name="line.3521"></a>
+<span class="sourceLineNo">3522</span> future.completeExceptionally(err5);<a name="line.3522"></a>
+<span class="sourceLineNo">3523</span> } else {<a name="line.3523"></a>
+<span class="sourceLineNo">3524</span> future.complete(result);<a name="line.3524"></a>
+<span class="sourceLineNo">3525</span> }<a name="line.3525"></a>
+<span class="sourceLineNo">3526</span> });<a name="line.3526"></a>
+<span class="sourceLineNo">3527</span> }<a name="line.3527"></a>
+<span class="sourceLineNo">3528</span> });<a name="line.3528"></a>
+<span class="sourceLineNo">3529</span> });<a name="line.3529"></a>
+<span class="sourceLineNo">3530</span> });<a name="line.3530"></a>
+<span class="sourceLineNo">3531</span> return future;<a name="line.3531"></a>
+<span class="sourceLineNo">3532</span> }<a name="line.3532"></a>
+<span class="sourceLineNo">3533</span><a name="line.3533"></a>
+<span class="sourceLineNo">3534</span> private CompletableFuture<CacheEvictionStats> clearBlockCache(ServerName serverName,<a name="line.3534"></a>
+<span class="sourceLineNo">3535</span> List<RegionInfo> hris) {<a name="line.3535"></a>
+<span class="sourceLineNo">3536</span> return this.<CacheEvictionStats> newAdminCaller().action((controller, stub) -> this<a name="line.3536"></a>
+<span class="sourceLineNo">3537</span> .<ClearRegionBlockCacheRequest, ClearRegionBlockCacheResponse, CacheEvictionStats> adminCall(<a name="line.3537"></a>
+<span class="sourceLineNo">3538</span> controller, stub, RequestConverter.buildClearRegionBlockCacheRequest(hris),<a name="line.3538"></a>
+<span class="sourceLineNo">3539</span> (s, c, req, done) -> s.clearRegionBlockCache(controller, req, done),<a name="line.3539"></a>
+<span class="sourceLineNo">3540</span> resp -> ProtobufUtil.toCacheEvictionStats(resp.getStats())))<a name="line.3540"></a>
+<span class="sourceLineNo">3541</span> .serverName(serverName).call();<a name="line.3541"></a>
+<span class="sourceLineNo">3542</span> }<a name="line.3542"></a>
+<span class="sourceLineNo">3543</span>}<a name="line.3543"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d220bc5e/devapidocs/src-html/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.TableProcedureBiConsumer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.TableProcedureBiConsumer.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.TableProcedureBiConsumer.html
index e63cd50..d8c0d2b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.TableProcedureBiConsumer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.TableProcedureBiConsumer.html
@@ -422,7 +422,7 @@
<span class="sourceLineNo">414</span> }<a name="line.414"></a>
<span class="sourceLineNo">415</span><a name="line.415"></a>
<span class="sourceLineNo">416</span> /**<a name="line.416"></a>
-<span class="sourceLineNo">417</span> * {@link #listTables(boolean)}<a name="line.417"></a>
+<span class="sourceLineNo">417</span> * {@link #listTableDescriptors(boolean)}<a name="line.417"></a>
<span class="sourceLineNo">418</span> */<a name="line.418"></a>
<span class="sourceLineNo">419</span> @Override<a name="line.419"></a>
<span class="sourceLineNo">420</span> public CompletableFuture<List<TableDescriptor>> listTableDescriptors(Pattern pattern,<a name="line.420"></a>
@@ -3476,16 +3476,79 @@
<span class="sourceLineNo">3468</span> return future;<a name="line.3468"></a>
<span class="sourceLineNo">3469</span> }<a name="line.3469"></a>
<span class="sourceLineNo">3470</span><a name="line.3470"></a>
-<span class="sourceLineNo">3471</span> private CompletableFuture<CacheEvictionStats> clearBlockCache(ServerName serverName,<a name="line.3471"></a>
-<span class="sourceLineNo">3472</span> List<RegionInfo> hris) {<a name="line.3472"></a>
-<span class="sourceLineNo">3473</span> return this.<CacheEvictionStats> newAdminCaller().action((controller, stub) -> this<a name="line.3473"></a>
-<span class="sourceLineNo">3474</span> .<ClearRegionBlockCacheRequest, ClearRegionBlockCacheResponse, CacheEvictionStats> adminCall(<a name="line.3474"></a>
-<span class="sourceLineNo">3475</span> controller, stub, RequestConverter.buildClearRegionBlockCacheRequest(hris),<a name="line.3475"></a>
-<span class="sourceLineNo">3476</span> (s, c, req, done) -> s.clearRegionBlockCache(controller, req, done),<a name="line.3476"></a>
-<span class="sourceLineNo">3477</span> resp -> ProtobufUtil.toCacheEvictionStats(resp.getStats())))<a name="line.3477"></a>
-<span class="sourceLineNo">3478</span> .serverName(serverName).call();<a name="line.3478"></a>
-<span class="sourceLineNo">3479</span> }<a name="line.3479"></a>
-<span class="sourceLineNo">3480</span>}<a name="line.3480"></a>
+<span class="sourceLineNo">3471</span> @Override<a name="line.3471"></a>
+<span class="sourceLineNo">3472</span> public CompletableFuture<Void> cloneTableSchema(TableName tableName, TableName newTableName,<a name="line.3472"></a>
+<span class="sourceLineNo">3473</span> boolean preserveSplits) {<a name="line.3473"></a>
+<span class="sourceLineNo">3474</span> CompletableFuture<Void> future = new CompletableFuture<>();<a name="line.3474"></a>
+<span class="sourceLineNo">3475</span> tableExists(tableName).whenComplete(<a name="line.3475"></a>
+<span class="sourceLineNo">3476</span> (exist, err) -> {<a name="line.3476"></a>
+<span class="sourceLineNo">3477</span> if (err != null) {<a name="line.3477"></a>
+<span class="sourceLineNo">3478</span> future.completeExceptionally(err);<a name="line.3478"></a>
+<span class="sourceLineNo">3479</span> return;<a name="line.3479"></a>
+<span class="sourceLineNo">3480</span> }<a name="line.3480"></a>
+<span class="sourceLineNo">3481</span> if (!exist) {<a name="line.3481"></a>
+<span class="sourceLineNo">3482</span> future.completeExceptionally(new TableNotFoundException(tableName));<a name="line.3482"></a>
+<span class="sourceLineNo">3483</span> return;<a name="line.3483"></a>
+<span class="sourceLineNo">3484</span> }<a name="line.3484"></a>
+<span class="sourceLineNo">3485</span> tableExists(newTableName).whenComplete(<a name="line.3485"></a>
+<span class="sourceLineNo">3486</span> (exist1, err1) -> {<a name="line.3486"></a>
+<span class="sourceLineNo">3487</span> if (err1 != null) {<a name="line.3487"></a>
+<span class="sourceLineNo">3488</span> future.completeExceptionally(err1);<a name="line.3488"></a>
+<span class="sourceLineNo">3489</span> return;<a name="line.3489"></a>
+<span class="sourceLineNo">3490</span> }<a name="line.3490"></a>
+<span class="sourceLineNo">3491</span> if (exist1) {<a name="line.3491"></a>
+<span class="sourceLineNo">3492</span> future.completeExceptionally(new TableExistsException(newTableName));<a name="line.3492"></a>
+<span class="sourceLineNo">3493</span> return;<a name="line.3493"></a>
+<span class="sourceLineNo">3494</span> }<a name="line.3494"></a>
+<span class="sourceLineNo">3495</span> getDescriptor(tableName).whenComplete(<a name="line.3495"></a>
+<span class="sourceLineNo">3496</span> (tableDesc, err2) -> {<a name="line.3496"></a>
+<span class="sourceLineNo">3497</span> if (err2 != null) {<a name="line.3497"></a>
+<span class="sourceLineNo">3498</span> future.completeExceptionally(err2);<a name="line.3498"></a>
+<span class="sourceLineNo">3499</span> return;<a name="line.3499"></a>
+<span class="sourceLineNo">3500</span> }<a name="line.3500"></a>
+<span class="sourceLineNo">3501</span> TableDescriptor newTableDesc<a name="line.3501"></a>
+<span class="sourceLineNo">3502</span> = TableDescriptorBuilder.copy(newTableName, tableDesc);<a name="line.3502"></a>
+<span class="sourceLineNo">3503</span> if (preserveSplits) {<a name="line.3503"></a>
+<span class="sourceLineNo">3504</span> getTableSplits(tableName).whenComplete((splits, err3) -> {<a name="line.3504"></a>
+<span class="sourceLineNo">3505</span> if (err3 != null) {<a name="line.3505"></a>
+<span class="sourceLineNo">3506</span> future.completeExceptionally(err3);<a name="line.3506"></a>
+<span class="sourceLineNo">3507</span> } else {<a name="line.3507"></a>
+<span class="sourceLineNo">3508</span> createTable(newTableDesc, splits).whenComplete(<a name="line.3508"></a>
+<span class="sourceLineNo">3509</span> (result, err4) -> {<a name="line.3509"></a>
+<span class="sourceLineNo">3510</span> if (err4 != null) {<a name="line.3510"></a>
+<span class="sourceLineNo">3511</span> future.completeExceptionally(err4);<a name="line.3511"></a>
+<span class="sourceLineNo">3512</span> } else {<a name="line.3512"></a>
+<span class="sourceLineNo">3513</span> future.complete(result);<a name="line.3513"></a>
+<span class="sourceLineNo">3514</span> }<a name="line.3514"></a>
+<span class="sourceLineNo">3515</span> });<a name="line.3515"></a>
+<span class="sourceLineNo">3516</span> }<a name="line.3516"></a>
+<span class="sourceLineNo">3517</span> });<a name="line.3517"></a>
+<span class="sourceLineNo">3518</span> } else {<a name="line.3518"></a>
+<span class="sourceLineNo">3519</span> createTable(newTableDesc).whenComplete(<a name="line.3519"></a>
+<span class="sourceLineNo">3520</span> (result, err5) -> {<a name="line.3520"></a>
+<span class="sourceLineNo">3521</span> if (err5 != null) {<a name="line.3521"></a>
+<span class="sourceLineNo">3522</span> future.completeExceptionally(err5);<a name="line.3522"></a>
+<span class="sourceLineNo">3523</span> } else {<a name="line.3523"></a>
+<span class="sourceLineNo">3524</span> future.complete(result);<a name="line.3524"></a>
+<span class="sourceLineNo">3525</span> }<a name="line.3525"></a>
+<span class="sourceLineNo">3526</span> });<a name="line.3526"></a>
+<span class="sourceLineNo">3527</span> }<a name="line.3527"></a>
+<span class="sourceLineNo">3528</span> });<a name="line.3528"></a>
+<span class="sourceLineNo">3529</span> });<a name="line.3529"></a>
+<span class="sourceLineNo">3530</span> });<a name="line.3530"></a>
+<span class="sourceLineNo">3531</span> return future;<a name="line.3531"></a>
+<span class="sourceLineNo">3532</span> }<a name="line.3532"></a>
+<span class="sourceLineNo">3533</span><a name="line.3533"></a>
+<span class="sourceLineNo">3534</span> private CompletableFuture<CacheEvictionStats> clearBlockCache(ServerName serverName,<a name="line.3534"></a>
+<span class="sourceLineNo">3535</span> List<RegionInfo> hris) {<a name="line.3535"></a>
+<span class="sourceLineNo">3536</span> return this.<CacheEvictionStats> newAdminCaller().action((controller, stub) -> this<a name="line.3536"></a>
+<span class="sourceLineNo">3537</span> .<ClearRegionBlockCacheRequest, ClearRegionBlockCacheResponse, CacheEvictionStats> adminCall(<a name="line.3537"></a>
+<span class="sourceLineNo">3538</span> controller, stub, RequestConverter.buildClearRegionBlockCacheRequest(hris),<a name="line.3538"></a>
+<span class="sourceLineNo">3539</span> (s, c, req, done) -> s.clearRegionBlockCache(controller, req, done),<a name="line.3539"></a>
+<span class="sourceLineNo">3540</span> resp -> ProtobufUtil.toCacheEvictionStats(resp.getStats())))<a name="line.3540"></a>
+<span class="sourceLineNo">3541</span> .serverName(serverName).call();<a name="line.3541"></a>
+<span class="sourceLineNo">3542</span> }<a name="line.3542"></a>
+<span class="sourceLineNo">3543</span>}<a name="line.3543"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d220bc5e/devapidocs/src-html/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.TruncateTableProcedureBiConsumer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.TruncateTableProcedureBiConsumer.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.TruncateTableProcedureBiConsumer.html
index e63cd50..d8c0d2b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.TruncateTableProcedureBiConsumer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.TruncateTableProcedureBiConsumer.html
@@ -422,7 +422,7 @@
<span class="sourceLineNo">414</span> }<a name="line.414"></a>
<span class="sourceLineNo">415</span><a name="line.415"></a>
<span class="sourceLineNo">416</span> /**<a name="line.416"></a>
-<span class="sourceLineNo">417</span> * {@link #listTables(boolean)}<a name="line.417"></a>
+<span class="sourceLineNo">417</span> * {@link #listTableDescriptors(boolean)}<a name="line.417"></a>
<span class="sourceLineNo">418</span> */<a name="line.418"></a>
<span class="sourceLineNo">419</span> @Override<a name="line.419"></a>
<span class="sourceLineNo">420</span> public CompletableFuture<List<TableDescriptor>> listTableDescriptors(Pattern pattern,<a name="line.420"></a>
@@ -3476,16 +3476,79 @@
<span class="sourceLineNo">3468</span> return future;<a name="line.3468"></a>
<span class="sourceLineNo">3469</span> }<a name="line.3469"></a>
<span class="sourceLineNo">3470</span><a name="line.3470"></a>
-<span class="sourceLineNo">3471</span> private CompletableFuture<CacheEvictionStats> clearBlockCache(ServerName serverName,<a name="line.3471"></a>
-<span class="sourceLineNo">3472</span> List<RegionInfo> hris) {<a name="line.3472"></a>
-<span class="sourceLineNo">3473</span> return this.<CacheEvictionStats> newAdminCaller().action((controller, stub) -> this<a name="line.3473"></a>
-<span class="sourceLineNo">3474</span> .<ClearRegionBlockCacheRequest, ClearRegionBlockCacheResponse, CacheEvictionStats> adminCall(<a name="line.3474"></a>
-<span class="sourceLineNo">3475</span> controller, stub, RequestConverter.buildClearRegionBlockCacheRequest(hris),<a name="line.3475"></a>
-<span class="sourceLineNo">3476</span> (s, c, req, done) -> s.clearRegionBlockCache(controller, req, done),<a name="line.3476"></a>
-<span class="sourceLineNo">3477</span> resp -> ProtobufUtil.toCacheEvictionStats(resp.getStats())))<a name="line.3477"></a>
-<span class="sourceLineNo">3478</span> .serverName(serverName).call();<a name="line.3478"></a>
-<span class="sourceLineNo">3479</span> }<a name="line.3479"></a>
-<span class="sourceLineNo">3480</span>}<a name="line.3480"></a>
+<span class="sourceLineNo">3471</span> @Override<a name="line.3471"></a>
+<span class="sourceLineNo">3472</span> public CompletableFuture<Void> cloneTableSchema(TableName tableName, TableName newTableName,<a name="line.3472"></a>
+<span class="sourceLineNo">3473</span> boolean preserveSplits) {<a name="line.3473"></a>
+<span class="sourceLineNo">3474</span> CompletableFuture<Void> future = new CompletableFuture<>();<a name="line.3474"></a>
+<span class="sourceLineNo">3475</span> tableExists(tableName).whenComplete(<a name="line.3475"></a>
+<span class="sourceLineNo">3476</span> (exist, err) -> {<a name="line.3476"></a>
+<span class="sourceLineNo">3477</span> if (err != null) {<a name="line.3477"></a>
+<span class="sourceLineNo">3478</span> future.completeExceptionally(err);<a name="line.3478"></a>
+<span class="sourceLineNo">3479</span> return;<a name="line.3479"></a>
+<span class="sourceLineNo">3480</span> }<a name="line.3480"></a>
+<span class="sourceLineNo">3481</span> if (!exist) {<a name="line.3481"></a>
+<span class="sourceLineNo">3482</span> future.completeExceptionally(new TableNotFoundException(tableName));<a name="line.3482"></a>
+<span class="sourceLineNo">3483</span> return;<a name="line.3483"></a>
+<span class="sourceLineNo">3484</span> }<a name="line.3484"></a>
+<span class="sourceLineNo">3485</span> tableExists(newTableName).whenComplete(<a name="line.3485"></a>
+<span class="sourceLineNo">3486</span> (exist1, err1) -> {<a name="line.3486"></a>
+<span class="sourceLineNo">3487</span> if (err1 != null) {<a name="line.3487"></a>
+<span class="sourceLineNo">3488</span> future.completeExceptionally(err1);<a name="line.3488"></a>
+<span class="sourceLineNo">3489</span> return;<a name="line.3489"></a>
+<span class="sourceLineNo">3490</span> }<a name="line.3490"></a>
+<span class="sourceLineNo">3491</span> if (exist1) {<a name="line.3491"></a>
+<span class="sourceLineNo">3492</span> future.completeExceptionally(new TableExistsException(newTableName));<a name="line.3492"></a>
+<span class="sourceLineNo">3493</span> return;<a name="line.3493"></a>
+<span class="sourceLineNo">3494</span> }<a name="line.3494"></a>
+<span class="sourceLineNo">3495</span> getDescriptor(tableName).whenComplete(<a name="line.3495"></a>
+<span class="sourceLineNo">3496</span> (tableDesc, err2) -> {<a name="line.3496"></a>
+<span class="sourceLineNo">3497</span> if (err2 != null) {<a name="line.3497"></a>
+<span class="sourceLineNo">3498</span> future.completeExceptionally(err2);<a name="line.3498"></a>
+<span class="sourceLineNo">3499</span> return;<a name="line.3499"></a>
+<span class="sourceLineNo">3500</span> }<a name="line.3500"></a>
+<span class="sourceLineNo">3501</span> TableDescriptor newTableDesc<a name="line.3501"></a>
+<span class="sourceLineNo">3502</span> = TableDescriptorBuilder.copy(newTableName, tableDesc);<a name="line.3502"></a>
+<span class="sourceLineNo">3503</span> if (preserveSplits) {<a name="line.3503"></a>
+<span class="sourceLineNo">3504</span> getTableSplits(tableName).whenComplete((splits, err3) -> {<a name="line.3504"></a>
+<span class="sourceLineNo">3505</span> if (err3 != null) {<a name="line.3505"></a>
+<span class="sourceLineNo">3506</span> future.completeExceptionally(err3);<a name="line.3506"></a>
+<span class="sourceLineNo">3507</span> } else {<a name="line.3507"></a>
+<span class="sourceLineNo">3508</span> createTable(newTableDesc, splits).whenComplete(<a name="line.3508"></a>
+<span class="sourceLineNo">3509</span> (result, err4) -> {<a name="line.3509"></a>
+<span class="sourceLineNo">3510</span> if (err4 != null) {<a name="line.3510"></a>
+<span class="sourceLineNo">3511</span> future.completeExceptionally(err4);<a name="line.3511"></a>
+<span class="sourceLineNo">3512</span> } else {<a name="line.3512"></a>
+<span class="sourceLineNo">3513</span> future.complete(result);<a name="line.3513"></a>
+<span class="sourceLineNo">3514</span> }<a name="line.3514"></a>
+<span class="sourceLineNo">3515</span> });<a name="line.3515"></a>
+<span class="sourceLineNo">3516</span> }<a name="line.3516"></a>
+<span class="sourceLineNo">3517</span> });<a name="line.3517"></a>
+<span class="sourceLineNo">3518</span> } else {<a name="line.3518"></a>
+<span class="sourceLineNo">3519</span> createTable(newTableDesc).whenComplete(<a name="line.3519"></a>
+<span class="sourceLineNo">3520</span> (result, err5) -> {<a name="line.3520"></a>
+<span class="sourceLineNo">3521</span> if (err5 != null) {<a name="line.3521"></a>
+<span class="sourceLineNo">3522</span> future.completeExceptionally(err5);<a name="line.3522"></a>
+<span class="sourceLineNo">3523</span> } else {<a name="line.3523"></a>
+<span class="sourceLineNo">3524</span> future.complete(result);<a name="line.3524"></a>
+<span class="sourceLineNo">3525</span> }<a name="line.3525"></a>
+<span class="sourceLineNo">3526</span> });<a name="line.3526"></a>
+<span class="sourceLineNo">3527</span> }<a name="line.3527"></a>
+<span class="sourceLineNo">3528</span> });<a name="line.3528"></a>
+<span class="sourceLineNo">3529</span> });<a name="line.3529"></a>
+<span class="sourceLineNo">3530</span> });<a name="line.3530"></a>
+<span class="sourceLineNo">3531</span> return future;<a name="line.3531"></a>
+<span class="sourceLineNo">3532</span> }<a name="line.3532"></a>
+<span class="sourceLineNo">3533</span><a name="line.3533"></a>
+<span class="sourceLineNo">3534</span> private CompletableFuture<CacheEvictionStats> clearBlockCache(ServerName serverName,<a name="line.3534"></a>
+<span class="sourceLineNo">3535</span> List<RegionInfo> hris) {<a name="line.3535"></a>
+<span class="sourceLineNo">3536</span> return this.<CacheEvictionStats> newAdminCaller().action((controller, stub) -> this<a name="line.3536"></a>
+<span class="sourceLineNo">3537</span> .<ClearRegionBlockCacheRequest, ClearRegionBlockCacheResponse, CacheEvictionStats> adminCall(<a name="line.3537"></a>
+<span class="sourceLineNo">3538</span> controller, stub, RequestConverter.buildClearRegionBlockCacheRequest(hris),<a name="line.3538"></a>
+<span class="sourceLineNo">3539</span> (s, c, req, done) -> s.clearRegionBlockCache(controller, req, done),<a name="line.3539"></a>
+<span class="sourceLineNo">3540</span> resp -> ProtobufUtil.toCacheEvictionStats(resp.getStats())))<a name="line.3540"></a>
+<span class="sourceLineNo">3541</span> .serverName(serverName).call();<a name="line.3541"></a>
+<span class="sourceLineNo">3542</span> }<a name="line.3542"></a>
+<span class="sourceLineNo">3543</span>}<a name="line.3543"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d220bc5e/devapidocs/src-html/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.html
index e63cd50..d8c0d2b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.html
@@ -422,7 +422,7 @@
<span class="sourceLineNo">414</span> }<a name="line.414"></a>
<span class="sourceLineNo">415</span><a name="line.415"></a>
<span class="sourceLineNo">416</span> /**<a name="line.416"></a>
-<span class="sourceLineNo">417</span> * {@link #listTables(boolean)}<a name="line.417"></a>
+<span class="sourceLineNo">417</span> * {@link #listTableDescriptors(boolean)}<a name="line.417"></a>
<span class="sourceLineNo">418</span> */<a name="line.418"></a>
<span class="sourceLineNo">419</span> @Override<a name="line.419"></a>
<span class="sourceLineNo">420</span> public CompletableFuture<List<TableDescriptor>> listTableDescriptors(Pattern pattern,<a name="line.420"></a>
@@ -3476,16 +3476,79 @@
<span class="sourceLineNo">3468</span> return future;<a name="line.3468"></a>
<span class="sourceLineNo">3469</span> }<a name="line.3469"></a>
<span class="sourceLineNo">3470</span><a name="line.3470"></a>
-<span class="sourceLineNo">3471</span> private CompletableFuture<CacheEvictionStats> clearBlockCache(ServerName serverName,<a name="line.3471"></a>
-<span class="sourceLineNo">3472</span> List<RegionInfo> hris) {<a name="line.3472"></a>
-<span class="sourceLineNo">3473</span> return this.<CacheEvictionStats> newAdminCaller().action((controller, stub) -> this<a name="line.3473"></a>
-<span class="sourceLineNo">3474</span> .<ClearRegionBlockCacheRequest, ClearRegionBlockCacheResponse, CacheEvictionStats> adminCall(<a name="line.3474"></a>
-<span class="sourceLineNo">3475</span> controller, stub, RequestConverter.buildClearRegionBlockCacheRequest(hris),<a name="line.3475"></a>
-<span class="sourceLineNo">3476</span> (s, c, req, done) -> s.clearRegionBlockCache(controller, req, done),<a name="line.3476"></a>
-<span class="sourceLineNo">3477</span> resp -> ProtobufUtil.toCacheEvictionStats(resp.getStats())))<a name="line.3477"></a>
-<span class="sourceLineNo">3478</span> .serverName(serverName).call();<a name="line.3478"></a>
-<span class="sourceLineNo">3479</span> }<a name="line.3479"></a>
-<span class="sourceLineNo">3480</span>}<a name="line.3480"></a>
+<span class="sourceLineNo">3471</span> @Override<a name="line.3471"></a>
+<span class="sourceLineNo">3472</span> public CompletableFuture<Void> cloneTableSchema(TableName tableName, TableName newTableName,<a name="line.3472"></a>
+<span class="sourceLineNo">3473</span> boolean preserveSplits) {<a name="line.3473"></a>
+<span class="sourceLineNo">3474</span> CompletableFuture<Void> future = new CompletableFuture<>();<a name="line.3474"></a>
+<span class="sourceLineNo">3475</span> tableExists(tableName).whenComplete(<a name="line.3475"></a>
+<span class="sourceLineNo">3476</span> (exist, err) -> {<a name="line.3476"></a>
+<span class="sourceLineNo">3477</span> if (err != null) {<a name="line.3477"></a>
+<span class="sourceLineNo">3478</span> future.completeExceptionally(err);<a name="line.3478"></a>
+<span class="sourceLineNo">3479</span> return;<a name="line.3479"></a>
+<span class="sourceLineNo">3480</span> }<a name="line.3480"></a>
+<span class="sourceLineNo">3481</span> if (!exist) {<a name="line.3481"></a>
+<span class="sourceLineNo">3482</span> future.completeExceptionally(new TableNotFoundException(tableName));<a name="line.3482"></a>
+<span class="sourceLineNo">3483</span> return;<a name="line.3483"></a>
+<span class="sourceLineNo">3484</span> }<a name="line.3484"></a>
+<span class="sourceLineNo">3485</span> tableExists(newTableName).whenComplete(<a name="line.3485"></a>
+<span class="sourceLineNo">3486</span> (exist1, err1) -> {<a name="line.3486"></a>
+<span class="sourceLineNo">3487</span> if (err1 != null) {<a name="line.3487"></a>
+<span class="sourceLineNo">3488</span> future.completeExceptionally(err1);<a name="line.3488"></a>
+<span class="sourceLineNo">3489</span> return;<a name="line.3489"></a>
+<span class="sourceLineNo">3490</span> }<a name="line.3490"></a>
+<span class="sourceLineNo">3491</span> if (exist1) {<a name="line.3491"></a>
+<span class="sourceLineNo">3492</span> future.completeExceptionally(new TableExistsException(newTableName));<a name="line.3492"></a>
+<span class="sourceLineNo">3493</span> return;<a name="line.3493"></a>
+<span class="sourceLineNo">3494</span> }<a name="line.3494"></a>
+<span class="sourceLineNo">3495</span> getDescriptor(tableName).whenComplete(<a name="line.3495"></a>
+<span class="sourceLineNo">3496</span> (tableDesc, err2) -> {<a name="line.3496"></a>
+<span class="sourceLineNo">3497</span> if (err2 != null) {<a name="line.3497"></a>
+<span class="sourceLineNo">3498</span> future.completeExceptionally(err2);<a name="line.3498"></a>
+<span class="sourceLineNo">3499</span> return;<a name="line.3499"></a>
+<span class="sourceLineNo">3500</span> }<a name="line.3500"></a>
+<span class="sourceLineNo">3501</span> TableDescriptor newTableDesc<a name="line.3501"></a>
+<span class="sourceLineNo">3502</span> = TableDescriptorBuilder.copy(newTableName, tableDesc);<a name="line.3502"></a>
+<span class="sourceLineNo">3503</span> if (preserveSplits) {<a name="line.3503"></a>
+<span class="sourceLineNo">3504</span> getTableSplits(tableName).whenComplete((splits, err3) -> {<a name="line.3504"></a>
+<span class="sourceLineNo">3505</span> if (err3 != null) {<a name="line.3505"></a>
+<span class="sourceLineNo">3506</span> future.completeExceptionally(err3);<a name="line.3506"></a>
+<span class="sourceLineNo">3507</span> } else {<a name="line.3507"></a>
+<span class="sourceLineNo">3508</span> createTable(newTableDesc, splits).whenComplete(<a name="line.3508"></a>
+<span class="sourceLineNo">3509</span> (result, err4) -> {<a name="line.3509"></a>
+<span class="sourceLineNo">3510</span> if (err4 != null) {<a name="line.3510"></a>
+<span class="sourceLineNo">3511</span> future.completeExceptionally(err4);<a name="line.3511"></a>
+<span class="sourceLineNo">3512</span> } else {<a name="line.3512"></a>
+<span class="sourceLineNo">3513</span> future.complete(result);<a name="line.3513"></a>
+<span class="sourceLineNo">3514</span> }<a name="line.3514"></a>
+<span class="sourceLineNo">3515</span> });<a name="line.3515"></a>
+<span class="sourceLineNo">3516</span> }<a name="line.3516"></a>
+<span class="sourceLineNo">3517</span> });<a name="line.3517"></a>
+<span class="sourceLineNo">3518</span> } else {<a name="line.3518"></a>
+<span class="sourceLineNo">3519</span> createTable(newTableDesc).whenComplete(<a name="line.3519"></a>
+<span class="sourceLineNo">3520</span> (result, err5) -> {<a name="line.3520"></a>
+<span class="sourceLineNo">3521</span> if (err5 != null) {<a name="line.3521"></a>
+<span class="sourceLineNo">3522</span> future.completeExceptionally(err5);<a name="line.3522"></a>
+<span class="sourceLineNo">3523</span> } else {<a name="line.3523"></a>
+<span class="sourceLineNo">3524</span> future.complete(result);<a name="line.3524"></a>
+<span class="sourceLineNo">3525</span> }<a name="line.3525"></a>
+<span class="sourceLineNo">3526</span> });<a name="line.3526"></a>
+<span class="sourceLineNo">3527</span> }<a name="line.3527"></a>
+<span class="sourceLineNo">3528</span> });<a name="line.3528"></a>
+<span class="sourceLineNo">3529</span> });<a name="line.3529"></a>
+<span class="sourceLineNo">3530</span> });<a name="line.3530"></a>
+<span class="sourceLineNo">3531</span> return future;<a name="line.3531"></a>
+<span class="sourceLineNo">3532</span> }<a name="line.3532"></a>
+<span class="sourceLineNo">3533</span><a name="line.3533"></a>
+<span class="sourceLineNo">3534</span> private CompletableFuture<CacheEvictionStats> clearBlockCache(ServerName serverName,<a name="line.3534"></a>
+<span class="sourceLineNo">3535</span> List<RegionInfo> hris) {<a name="line.3535"></a>
+<span class="sourceLineNo">3536</span> return this.<CacheEvictionStats> newAdminCaller().action((controller, stub) -> this<a name="line.3536"></a>
+<span class="sourceLineNo">3537</span> .<ClearRegionBlockCacheRequest, ClearRegionBlockCacheResponse, CacheEvictionStats> adminCall(<a name="line.3537"></a>
+<span class="sourceLineNo">3538</span> controller, stub, RequestConverter.buildClearRegionBlockCacheRequest(hris),<a name="line.3538"></a>
+<span class="sourceLineNo">3539</span> (s, c, req, done) -> s.clearRegionBlockCache(controller, req, done),<a name="line.3539"></a>
+<span class="sourceLineNo">3540</span> resp -> ProtobufUtil.toCacheEvictionStats(resp.getStats())))<a name="line.3540"></a>
+<span class="sourceLineNo">3541</span> .serverName(serverName).call();<a name="line.3541"></a>
+<span class="sourceLineNo">3542</span> }<a name="line.3542"></a>
+<span class="sourceLineNo">3543</span>}<a name="line.3543"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d220bc5e/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.Counters.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.Counters.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.Counters.html
index 67249a1..6f1fc1b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.Counters.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.Counters.html
@@ -300,44 +300,49 @@
<span class="sourceLineNo">292</span> @Override<a name="line.292"></a>
<span class="sourceLineNo">293</span> public int run(String[] args) throws Exception {<a name="line.293"></a>
<span class="sourceLineNo">294</span> if (args.length < 2) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> System.err.println("ERROR: Wrong number of parameters: " + args.length);<a name="line.295"></a>
-<span class="sourceLineNo">296</span> System.err.println("Usage: CellCounter ");<a name="line.296"></a>
-<span class="sourceLineNo">297</span> System.err.println(" <tablename> <outputDir> <reportSeparator> [^[regex pattern] or " +<a name="line.297"></a>
-<span class="sourceLineNo">298</span> "[Prefix] for row filter]] --starttime=[starttime] --endtime=[endtime]");<a name="line.298"></a>
-<span class="sourceLineNo">299</span> System.err.println(" Note: -D properties will be applied to the conf used. ");<a name="line.299"></a>
-<span class="sourceLineNo">300</span> System.err.println(" Additionally, all of the SCAN properties from TableInputFormat");<a name="line.300"></a>
-<span class="sourceLineNo">301</span> System.err.println(" can be specified to get fine grained control on what is counted..");<a name="line.301"></a>
-<span class="sourceLineNo">302</span> System.err.println(" -D " + TableInputFormat.SCAN_ROW_START + "=<rowkey>");<a name="line.302"></a>
-<span class="sourceLineNo">303</span> System.err.println(" -D " + TableInputFormat.SCAN_ROW_STOP + "=<rowkey>");<a name="line.303"></a>
-<span class="sourceLineNo">304</span> System.err.println(" -D " + TableInputFormat.SCAN_COLUMNS + "=\"<col1> <col2>...\"");<a name="line.304"></a>
-<span class="sourceLineNo">305</span> System.err.println(" -D " + TableInputFormat.SCAN_COLUMN_FAMILY + "=<family1>,<family2>, ...");<a name="line.305"></a>
-<span class="sourceLineNo">306</span> System.err.println(" -D " + TableInputFormat.SCAN_TIMESTAMP + "=<timestamp>");<a name="line.306"></a>
-<span class="sourceLineNo">307</span> System.err.println(" -D " + TableInputFormat.SCAN_TIMERANGE_START + "=<timestamp>");<a name="line.307"></a>
-<span class="sourceLineNo">308</span> System.err.println(" -D " + TableInputFormat.SCAN_TIMERANGE_END + "=<timestamp>");<a name="line.308"></a>
-<span class="sourceLineNo">309</span> System.err.println(" -D " + TableInputFormat.SCAN_MAXVERSIONS + "=<count>");<a name="line.309"></a>
-<span class="sourceLineNo">310</span> System.err.println(" -D " + TableInputFormat.SCAN_CACHEDROWS + "=<count>");<a name="line.310"></a>
-<span class="sourceLineNo">311</span> System.err.println(" -D " + TableInputFormat.SCAN_BATCHSIZE + "=<count>");<a name="line.311"></a>
-<span class="sourceLineNo">312</span> System.err.println(" <reportSeparator> parameter can be used to override the default report separator " +<a name="line.312"></a>
-<span class="sourceLineNo">313</span> "string : used to separate the rowId/column family name and qualifier name.");<a name="line.313"></a>
-<span class="sourceLineNo">314</span> System.err.println(" [^[regex pattern] or [Prefix] parameter can be used to limit the cell counter count " +<a name="line.314"></a>
-<span class="sourceLineNo">315</span> "operation to a limited subset of rows from the table based on regex or prefix pattern.");<a name="line.315"></a>
-<span class="sourceLineNo">316</span> return -1;<a name="line.316"></a>
-<span class="sourceLineNo">317</span> }<a name="line.317"></a>
-<span class="sourceLineNo">318</span> Job job = createSubmittableJob(getConf(), args);<a name="line.318"></a>
-<span class="sourceLineNo">319</span> return (job.waitForCompletion(true) ? 0 : 1);<a name="line.319"></a>
-<span class="sourceLineNo">320</span> }<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> /**<a name="line.322"></a>
-<span class="sourceLineNo">323</span> * Main entry point.<a name="line.323"></a>
-<span class="sourceLineNo">324</span> * @param args The command line parameters.<a name="line.324"></a>
-<span class="sourceLineNo">325</span> * @throws Exception When running the job fails.<a name="line.325"></a>
-<span class="sourceLineNo">326</span> */<a name="line.326"></a>
-<span class="sourceLineNo">327</span> public static void main(String[] args) throws Exception {<a name="line.327"></a>
-<span class="sourceLineNo">328</span> int errCode = ToolRunner.run(HBaseConfiguration.create(), new CellCounter(), args);<a name="line.328"></a>
-<span class="sourceLineNo">329</span> System.exit(errCode);<a name="line.329"></a>
-<span class="sourceLineNo">330</span> }<a name="line.330"></a>
-<span class="sourceLineNo">331</span><a name="line.331"></a>
-<span class="sourceLineNo">332</span>}<a name="line.332"></a>
+<span class="sourceLineNo">295</span> printUsage(args.length);<a name="line.295"></a>
+<span class="sourceLineNo">296</span> return -1;<a name="line.296"></a>
+<span class="sourceLineNo">297</span> }<a name="line.297"></a>
+<span class="sourceLineNo">298</span> Job job = createSubmittableJob(getConf(), args);<a name="line.298"></a>
+<span class="sourceLineNo">299</span> return (job.waitForCompletion(true) ? 0 : 1);<a name="line.299"></a>
+<span class="sourceLineNo">300</span> }<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span> private void printUsage(int parameterCount) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span> System.err.println("ERROR: Wrong number of parameters: " + parameterCount);<a name="line.303"></a>
+<span class="sourceLineNo">304</span> System.err.println("Usage: hbase cellcounter <tablename> <outputDir> [reportSeparator] "<a name="line.304"></a>
+<span class="sourceLineNo">305</span> + "[^[regex pattern] or [Prefix]] [--starttime=<starttime> --endtime=<endtime>]");<a name="line.305"></a>
+<span class="sourceLineNo">306</span> System.err.println(" Note: -D properties will be applied to the conf used.");<a name="line.306"></a>
+<span class="sourceLineNo">307</span> System.err.println(" Additionally, all of the SCAN properties from TableInputFormat can be "<a name="line.307"></a>
+<span class="sourceLineNo">308</span> + "specified to get fine grained control on what is counted.");<a name="line.308"></a>
+<span class="sourceLineNo">309</span> System.err.println(" -D" + TableInputFormat.SCAN_ROW_START + "=<rowkey>");<a name="line.309"></a>
+<span class="sourceLineNo">310</span> System.err.println(" -D" + TableInputFormat.SCAN_ROW_STOP + "=<rowkey>");<a name="line.310"></a>
+<span class="sourceLineNo">311</span> System.err.println(" -D" + TableInputFormat.SCAN_COLUMNS + "=\"<col1> <col2>...\"");<a name="line.311"></a>
+<span class="sourceLineNo">312</span> System.err.println(" -D" + TableInputFormat.SCAN_COLUMN_FAMILY<a name="line.312"></a>
+<span class="sourceLineNo">313</span> + "=<family1>,<family2>, ...");<a name="line.313"></a>
+<span class="sourceLineNo">314</span> System.err.println(" -D" + TableInputFormat.SCAN_TIMESTAMP + "=<timestamp>");<a name="line.314"></a>
+<span class="sourceLineNo">315</span> System.err.println(" -D" + TableInputFormat.SCAN_TIMERANGE_START + "=<timestamp>");<a name="line.315"></a>
+<span class="sourceLineNo">316</span> System.err.println(" -D" + TableInputFormat.SCAN_TIMERANGE_END + "=<timestamp>");<a name="line.316"></a>
+<span class="sourceLineNo">317</span> System.err.println(" -D" + TableInputFormat.SCAN_MAXVERSIONS + "=<count>");<a name="line.317"></a>
+<span class="sourceLineNo">318</span> System.err.println(" -D" + TableInputFormat.SCAN_CACHEDROWS + "=<count>");<a name="line.318"></a>
+<span class="sourceLineNo">319</span> System.err.println(" -D" + TableInputFormat.SCAN_BATCHSIZE + "=<count>");<a name="line.319"></a>
+<span class="sourceLineNo">320</span> System.err.println(" <reportSeparator> parameter can be used to override the default report "<a name="line.320"></a>
+<span class="sourceLineNo">321</span> + "separator string : used to separate the rowId/column family name and qualifier name.");<a name="line.321"></a>
+<span class="sourceLineNo">322</span> System.err.println(" [^[regex pattern] or [Prefix] parameter can be used to limit the cell "<a name="line.322"></a>
+<span class="sourceLineNo">323</span> + "counter count operation to a limited subset of rows from the table based on regex or "<a name="line.323"></a>
+<span class="sourceLineNo">324</span> + "prefix pattern.");<a name="line.324"></a>
+<span class="sourceLineNo">325</span> }<a name="line.325"></a>
+<span class="sourceLineNo">326</span><a name="line.326"></a>
+<span class="sourceLineNo">327</span> /**<a name="line.327"></a>
+<span class="sourceLineNo">328</span> * Main entry point.<a name="line.328"></a>
+<span class="sourceLineNo">329</span> * @param args The command line parameters.<a name="line.329"></a>
+<span class="sourceLineNo">330</span> * @throws Exception When running the job fails.<a name="line.330"></a>
+<span class="sourceLineNo">331</span> */<a name="line.331"></a>
+<span class="sourceLineNo">332</span> public static void main(String[] args) throws Exception {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> int errCode = ToolRunner.run(HBaseConfiguration.create(), new CellCounter(), args);<a name="line.333"></a>
+<span class="sourceLineNo">334</span> System.exit(errCode);<a name="line.334"></a>
+<span class="sourceLineNo">335</span> }<a name="line.335"></a>
+<span class="sourceLineNo">336</span><a name="line.336"></a>
+<span class="sourceLineNo">337</span>}<a name="line.337"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d220bc5e/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.html
index 67249a1..6f1fc1b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.html
@@ -300,44 +300,49 @@
<span class="sourceLineNo">292</span> @Override<a name="line.292"></a>
<span class="sourceLineNo">293</span> public int run(String[] args) throws Exception {<a name="line.293"></a>
<span class="sourceLineNo">294</span> if (args.length < 2) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> System.err.println("ERROR: Wrong number of parameters: " + args.length);<a name="line.295"></a>
-<span class="sourceLineNo">296</span> System.err.println("Usage: CellCounter ");<a name="line.296"></a>
-<span class="sourceLineNo">297</span> System.err.println(" <tablename> <outputDir> <reportSeparator> [^[regex pattern] or " +<a name="line.297"></a>
-<span class="sourceLineNo">298</span> "[Prefix] for row filter]] --starttime=[starttime] --endtime=[endtime]");<a name="line.298"></a>
-<span class="sourceLineNo">299</span> System.err.println(" Note: -D properties will be applied to the conf used. ");<a name="line.299"></a>
-<span class="sourceLineNo">300</span> System.err.println(" Additionally, all of the SCAN properties from TableInputFormat");<a name="line.300"></a>
-<span class="sourceLineNo">301</span> System.err.println(" can be specified to get fine grained control on what is counted..");<a name="line.301"></a>
-<span class="sourceLineNo">302</span> System.err.println(" -D " + TableInputFormat.SCAN_ROW_START + "=<rowkey>");<a name="line.302"></a>
-<span class="sourceLineNo">303</span> System.err.println(" -D " + TableInputFormat.SCAN_ROW_STOP + "=<rowkey>");<a name="line.303"></a>
-<span class="sourceLineNo">304</span> System.err.println(" -D " + TableInputFormat.SCAN_COLUMNS + "=\"<col1> <col2>...\"");<a name="line.304"></a>
-<span class="sourceLineNo">305</span> System.err.println(" -D " + TableInputFormat.SCAN_COLUMN_FAMILY + "=<family1>,<family2>, ...");<a name="line.305"></a>
-<span class="sourceLineNo">306</span> System.err.println(" -D " + TableInputFormat.SCAN_TIMESTAMP + "=<timestamp>");<a name="line.306"></a>
-<span class="sourceLineNo">307</span> System.err.println(" -D " + TableInputFormat.SCAN_TIMERANGE_START + "=<timestamp>");<a name="line.307"></a>
-<span class="sourceLineNo">308</span> System.err.println(" -D " + TableInputFormat.SCAN_TIMERANGE_END + "=<timestamp>");<a name="line.308"></a>
-<span class="sourceLineNo">309</span> System.err.println(" -D " + TableInputFormat.SCAN_MAXVERSIONS + "=<count>");<a name="line.309"></a>
-<span class="sourceLineNo">310</span> System.err.println(" -D " + TableInputFormat.SCAN_CACHEDROWS + "=<count>");<a name="line.310"></a>
-<span class="sourceLineNo">311</span> System.err.println(" -D " + TableInputFormat.SCAN_BATCHSIZE + "=<count>");<a name="line.311"></a>
-<span class="sourceLineNo">312</span> System.err.println(" <reportSeparator> parameter can be used to override the default report separator " +<a name="line.312"></a>
-<span class="sourceLineNo">313</span> "string : used to separate the rowId/column family name and qualifier name.");<a name="line.313"></a>
-<span class="sourceLineNo">314</span> System.err.println(" [^[regex pattern] or [Prefix] parameter can be used to limit the cell counter count " +<a name="line.314"></a>
-<span class="sourceLineNo">315</span> "operation to a limited subset of rows from the table based on regex or prefix pattern.");<a name="line.315"></a>
-<span class="sourceLineNo">316</span> return -1;<a name="line.316"></a>
-<span class="sourceLineNo">317</span> }<a name="line.317"></a>
-<span class="sourceLineNo">318</span> Job job = createSubmittableJob(getConf(), args);<a name="line.318"></a>
-<span class="sourceLineNo">319</span> return (job.waitForCompletion(true) ? 0 : 1);<a name="line.319"></a>
-<span class="sourceLineNo">320</span> }<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> /**<a name="line.322"></a>
-<span class="sourceLineNo">323</span> * Main entry point.<a name="line.323"></a>
-<span class="sourceLineNo">324</span> * @param args The command line parameters.<a name="line.324"></a>
-<span class="sourceLineNo">325</span> * @throws Exception When running the job fails.<a name="line.325"></a>
-<span class="sourceLineNo">326</span> */<a name="line.326"></a>
-<span class="sourceLineNo">327</span> public static void main(String[] args) throws Exception {<a name="line.327"></a>
-<span class="sourceLineNo">328</span> int errCode = ToolRunner.run(HBaseConfiguration.create(), new CellCounter(), args);<a name="line.328"></a>
-<span class="sourceLineNo">329</span> System.exit(errCode);<a name="line.329"></a>
-<span class="sourceLineNo">330</span> }<a name="line.330"></a>
-<span class="sourceLineNo">331</span><a name="line.331"></a>
-<span class="sourceLineNo">332</span>}<a name="line.332"></a>
+<span class="sourceLineNo">295</span> printUsage(args.length);<a name="line.295"></a>
+<span class="sourceLineNo">296</span> return -1;<a name="line.296"></a>
+<span class="sourceLineNo">297</span> }<a name="line.297"></a>
+<span class="sourceLineNo">298</span> Job job = createSubmittableJob(getConf(), args);<a name="line.298"></a>
+<span class="sourceLineNo">299</span> return (job.waitForCompletion(true) ? 0 : 1);<a name="line.299"></a>
+<span class="sourceLineNo">300</span> }<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span> private void printUsage(int parameterCount) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span> System.err.println("ERROR: Wrong number of parameters: " + parameterCount);<a name="line.303"></a>
+<span class="sourceLineNo">304</span> System.err.println("Usage: hbase cellcounter <tablename> <outputDir> [reportSeparator] "<a name="line.304"></a>
+<span class="sourceLineNo">305</span> + "[^[regex pattern] or [Prefix]] [--starttime=<starttime> --endtime=<endtime>]");<a name="line.305"></a>
+<span class="sourceLineNo">306</span> System.err.println(" Note: -D properties will be applied to the conf used.");<a name="line.306"></a>
+<span class="sourceLineNo">307</span> System.err.println(" Additionally, all of the SCAN properties from TableInputFormat can be "<a name="line.307"></a>
+<span class="sourceLineNo">308</span> + "specified to get fine grained control on what is counted.");<a name="line.308"></a>
+<span class="sourceLineNo">309</span> System.err.println(" -D" + TableInputFormat.SCAN_ROW_START + "=<rowkey>");<a name="line.309"></a>
+<span class="sourceLineNo">310</span> System.err.println(" -D" + TableInputFormat.SCAN_ROW_STOP + "=<rowkey>");<a name="line.310"></a>
+<span class="sourceLineNo">311</span> System.err.println(" -D" + TableInputFormat.SCAN_COLUMNS + "=\"<col1> <col2>...\"");<a name="line.311"></a>
+<span class="sourceLineNo">312</span> System.err.println(" -D" + TableInputFormat.SCAN_COLUMN_FAMILY<a name="line.312"></a>
+<span class="sourceLineNo">313</span> + "=<family1>,<family2>, ...");<a name="line.313"></a>
+<span class="sourceLineNo">314</span> System.err.println(" -D" + TableInputFormat.SCAN_TIMESTAMP + "=<timestamp>");<a name="line.314"></a>
+<span class="sourceLineNo">315</span> System.err.println(" -D" + TableInputFormat.SCAN_TIMERANGE_START + "=<timestamp>");<a name="line.315"></a>
+<span class="sourceLineNo">316</span> System.err.println(" -D" + TableInputFormat.SCAN_TIMERANGE_END + "=<timestamp>");<a name="line.316"></a>
+<span class="sourceLineNo">317</span> System.err.println(" -D" + TableInputFormat.SCAN_MAXVERSIONS + "=<count>");<a name="line.317"></a>
+<span class="sourceLineNo">318</span> System.err.println(" -D" + TableInputFormat.SCAN_CACHEDROWS + "=<count>");<a name="line.318"></a>
+<span class="sourceLineNo">319</span> System.err.println(" -D" + TableInputFormat.SCAN_BATCHSIZE + "=<count>");<a name="line.319"></a>
+<span class="sourceLineNo">320</span> System.err.println(" <reportSeparator> parameter can be used to override the default report "<a name="line.320"></a>
+<span class="sourceLineNo">321</span> + "separator string : used to separate the rowId/column family name and qualifier name.");<a name="line.321"></a>
+<span class="sourceLineNo">322</span> System.err.println(" [^[regex pattern] or [Prefix] parameter can be used to limit the cell "<a name="line.322"></a>
+<span class="sourceLineNo">323</span> + "counter count operation to a limited subset of rows from the table based on regex or "<a name="line.323"></a>
+<span class="sourceLineNo">324</span> + "prefix pattern.");<a name="line.324"></a>
+<span class="sourceLineNo">325</span> }<a name="line.325"></a>
+<span class="sourceLineNo">326</span><a name="line.326"></a>
+<span class="sourceLineNo">327</span> /**<a name="line.327"></a>
+<span class="sourceLineNo">328</span> * Main entry point.<a name="line.328"></a>
+<span class="sourceLineNo">329</span> * @param args The command line parameters.<a name="line.329"></a>
+<span class="sourceLineNo">330</span> * @throws Exception When running the job fails.<a name="line.330"></a>
+<span class="sourceLineNo">331</span> */<a name="line.331"></a>
+<span class="sourceLineNo">332</span> public static void main(String[] args) throws Exception {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> int errCode = ToolRunner.run(HBaseConfiguration.create(), new CellCounter(), args);<a name="line.333"></a>
+<span class="sourceLineNo">334</span> System.exit(errCode);<a name="line.334"></a>
+<span class="sourceLineNo">335</span> }<a name="line.335"></a>
+<span class="sourceLineNo">336</span><a name="line.336"></a>
+<span class="sourceLineNo">337</span>}<a name="line.337"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d220bc5e/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.IntSumReducer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.IntSumReducer.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.IntSumReducer.html
index 67249a1..6f1fc1b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.IntSumReducer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.IntSumReducer.html
@@ -300,44 +300,49 @@
<span class="sourceLineNo">292</span> @Override<a name="line.292"></a>
<span class="sourceLineNo">293</span> public int run(String[] args) throws Exception {<a name="line.293"></a>
<span class="sourceLineNo">294</span> if (args.length < 2) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> System.err.println("ERROR: Wrong number of parameters: " + args.length);<a name="line.295"></a>
-<span class="sourceLineNo">296</span> System.err.println("Usage: CellCounter ");<a name="line.296"></a>
-<span class="sourceLineNo">297</span> System.err.println(" <tablename> <outputDir> <reportSeparator> [^[regex pattern] or " +<a name="line.297"></a>
-<span class="sourceLineNo">298</span> "[Prefix] for row filter]] --starttime=[starttime] --endtime=[endtime]");<a name="line.298"></a>
-<span class="sourceLineNo">299</span> System.err.println(" Note: -D properties will be applied to the conf used. ");<a name="line.299"></a>
-<span class="sourceLineNo">300</span> System.err.println(" Additionally, all of the SCAN properties from TableInputFormat");<a name="line.300"></a>
-<span class="sourceLineNo">301</span> System.err.println(" can be specified to get fine grained control on what is counted..");<a name="line.301"></a>
-<span class="sourceLineNo">302</span> System.err.println(" -D " + TableInputFormat.SCAN_ROW_START + "=<rowkey>");<a name="line.302"></a>
-<span class="sourceLineNo">303</span> System.err.println(" -D " + TableInputFormat.SCAN_ROW_STOP + "=<rowkey>");<a name="line.303"></a>
-<span class="sourceLineNo">304</span> System.err.println(" -D " + TableInputFormat.SCAN_COLUMNS + "=\"<col1> <col2>...\"");<a name="line.304"></a>
-<span class="sourceLineNo">305</span> System.err.println(" -D " + TableInputFormat.SCAN_COLUMN_FAMILY + "=<family1>,<family2>, ...");<a name="line.305"></a>
-<span class="sourceLineNo">306</span> System.err.println(" -D " + TableInputFormat.SCAN_TIMESTAMP + "=<timestamp>");<a name="line.306"></a>
-<span class="sourceLineNo">307</span> System.err.println(" -D " + TableInputFormat.SCAN_TIMERANGE_START + "=<timestamp>");<a name="line.307"></a>
-<span class="sourceLineNo">308</span> System.err.println(" -D " + TableInputFormat.SCAN_TIMERANGE_END + "=<timestamp>");<a name="line.308"></a>
-<span class="sourceLineNo">309</span> System.err.println(" -D " + TableInputFormat.SCAN_MAXVERSIONS + "=<count>");<a name="line.309"></a>
-<span class="sourceLineNo">310</span> System.err.println(" -D " + TableInputFormat.SCAN_CACHEDROWS + "=<count>");<a name="line.310"></a>
-<span class="sourceLineNo">311</span> System.err.println(" -D " + TableInputFormat.SCAN_BATCHSIZE + "=<count>");<a name="line.311"></a>
-<span class="sourceLineNo">312</span> System.err.println(" <reportSeparator> parameter can be used to override the default report separator " +<a name="line.312"></a>
-<span class="sourceLineNo">313</span> "string : used to separate the rowId/column family name and qualifier name.");<a name="line.313"></a>
-<span class="sourceLineNo">314</span> System.err.println(" [^[regex pattern] or [Prefix] parameter can be used to limit the cell counter count " +<a name="line.314"></a>
-<span class="sourceLineNo">315</span> "operation to a limited subset of rows from the table based on regex or prefix pattern.");<a name="line.315"></a>
-<span class="sourceLineNo">316</span> return -1;<a name="line.316"></a>
-<span class="sourceLineNo">317</span> }<a name="line.317"></a>
-<span class="sourceLineNo">318</span> Job job = createSubmittableJob(getConf(), args);<a name="line.318"></a>
-<span class="sourceLineNo">319</span> return (job.waitForCompletion(true) ? 0 : 1);<a name="line.319"></a>
-<span class="sourceLineNo">320</span> }<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> /**<a name="line.322"></a>
-<span class="sourceLineNo">323</span> * Main entry point.<a name="line.323"></a>
-<span class="sourceLineNo">324</span> * @param args The command line parameters.<a name="line.324"></a>
-<span class="sourceLineNo">325</span> * @throws Exception When running the job fails.<a name="line.325"></a>
-<span class="sourceLineNo">326</span> */<a name="line.326"></a>
-<span class="sourceLineNo">327</span> public static void main(String[] args) throws Exception {<a name="line.327"></a>
-<span class="sourceLineNo">328</span> int errCode = ToolRunner.run(HBaseConfiguration.create(), new CellCounter(), args);<a name="line.328"></a>
-<span class="sourceLineNo">329</span> System.exit(errCode);<a name="line.329"></a>
-<span class="sourceLineNo">330</span> }<a name="line.330"></a>
-<span class="sourceLineNo">331</span><a name="line.331"></a>
-<span class="sourceLineNo">332</span>}<a name="line.332"></a>
+<span class="sourceLineNo">295</span> printUsage(args.length);<a name="line.295"></a>
+<span class="sourceLineNo">296</span> return -1;<a name="line.296"></a>
+<span class="sourceLineNo">297</span> }<a name="line.297"></a>
+<span class="sourceLineNo">298</span> Job job = createSubmittableJob(getConf(), args);<a name="line.298"></a>
+<span class="sourceLineNo">299</span> return (job.waitForCompletion(true) ? 0 : 1);<a name="line.299"></a>
+<span class="sourceLineNo">300</span> }<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span> private void printUsage(int parameterCount) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span> System.err.println("ERROR: Wrong number of parameters: " + parameterCount);<a name="line.303"></a>
+<span class="sourceLineNo">304</span> System.err.println("Usage: hbase cellcounter <tablename> <outputDir> [reportSeparator] "<a name="line.304"></a>
+<span class="sourceLineNo">305</span> + "[^[regex pattern] or [Prefix]] [--starttime=<starttime> --endtime=<endtime>]");<a name="line.305"></a>
+<span class="sourceLineNo">306</span> System.err.println(" Note: -D properties will be applied to the conf used.");<a name="line.306"></a>
+<span class="sourceLineNo">307</span> System.err.println(" Additionally, all of the SCAN properties from TableInputFormat can be "<a name="line.307"></a>
+<span class="sourceLineNo">308</span> + "specified to get fine grained control on what is counted.");<a name="line.308"></a>
+<span class="sourceLineNo">309</span> System.err.println(" -D" + TableInputFormat.SCAN_ROW_START + "=<rowkey>");<a name="line.309"></a>
+<span class="sourceLineNo">310</span> System.err.println(" -D" + TableInputFormat.SCAN_ROW_STOP + "=<rowkey>");<a name="line.310"></a>
+<span class="sourceLineNo">311</span> System.err.println(" -D" + TableInputFormat.SCAN_COLUMNS + "=\"<col1> <col2>...\"");<a name="line.311"></a>
+<span class="sourceLineNo">312</span> System.err.println(" -D" + TableInputFormat.SCAN_COLUMN_FAMILY<a name="line.312"></a>
+<span class="sourceLineNo">313</span> + "=<family1>,<family2>, ...");<a name="line.313"></a>
+<span class="sourceLineNo">314</span> System.err.println(" -D" + TableInputFormat.SCAN_TIMESTAMP + "=<timestamp>");<a name="line.314"></a>
+<span class="sourceLineNo">315</span> System.err.println(" -D" + TableInputFormat.SCAN_TIMERANGE_START + "=<timestamp>");<a name="line.315"></a>
+<span class="sourceLineNo">316</span> System.err.println(" -D" + TableInputFormat.SCAN_TIMERANGE_END + "=<timestamp>");<a name="line.316"></a>
+<span class="sourceLineNo">317</span> System.err.println(" -D" + TableInputFormat.SCAN_MAXVERSIONS + "=<count>");<a name="line.317"></a>
+<span class="sourceLineNo">318</span> System.err.println(" -D" + TableInputFormat.SCAN_CACHEDROWS + "=<count>");<a name="line.318"></a>
+<span class="sourceLineNo">319</span> System.err.println(" -D" + TableInputFormat.SCAN_BATCHSIZE + "=<count>");<a name="line.319"></a>
+<span class="sourceLineNo">320</span> System.err.println(" <reportSeparator> parameter can be used to override the default report "<a name="line.320"></a>
+<span class="sourceLineNo">321</span> + "separator string : used to separate the rowId/column family name and qualifier name.");<a name="line.321"></a>
+<span class="sourceLineNo">322</span> System.err.println(" [^[regex pattern] or [Prefix] parameter can be used to limit the cell "<a name="line.322"></a>
+<span class="sourceLineNo">323</span> + "counter count operation to a limited subset of rows from the table based on regex or "<a name="line.323"></a>
+<span class="sourceLineNo">324</span> + "prefix pattern.");<a name="line.324"></a>
+<span class="sourceLineNo">325</span> }<a name="line.325"></a>
+<span class="sourceLineNo">326</span><a name="line.326"></a>
+<span class="sourceLineNo">327</span> /**<a name="line.327"></a>
+<span class="sourceLineNo">328</span> * Main entry point.<a name="line.328"></a>
+<span class="sourceLineNo">329</span> * @param args The command line parameters.<a name="line.329"></a>
+<span class="sourceLineNo">330</span> * @throws Exception When running the job fails.<a name="line.330"></a>
+<span class="sourceLineNo">331</span> */<a name="line.331"></a>
+<span class="sourceLineNo">332</span> public static void main(String[] args) throws Exception {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> int errCode = ToolRunner.run(HBaseConfiguration.create(), new CellCounter(), args);<a name="line.333"></a>
+<span class="sourceLineNo">334</span> System.exit(errCode);<a name="line.334"></a>
+<span class="sourceLineNo">335</span> }<a name="line.335"></a>
+<span class="sourceLineNo">336</span><a name="line.336"></a>
+<span class="sourceLineNo">337</span>}<a name="line.337"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d220bc5e/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html
index 67249a1..6f1fc1b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/CellCounter.html
@@ -300,44 +300,49 @@
<span class="sourceLineNo">292</span> @Override<a name="line.292"></a>
<span class="sourceLineNo">293</span> public int run(String[] args) throws Exception {<a name="line.293"></a>
<span class="sourceLineNo">294</span> if (args.length < 2) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> System.err.println("ERROR: Wrong number of parameters: " + args.length);<a name="line.295"></a>
-<span class="sourceLineNo">296</span> System.err.println("Usage: CellCounter ");<a name="line.296"></a>
-<span class="sourceLineNo">297</span> System.err.println(" <tablename> <outputDir> <reportSeparator> [^[regex pattern] or " +<a name="line.297"></a>
-<span class="sourceLineNo">298</span> "[Prefix] for row filter]] --starttime=[starttime] --endtime=[endtime]");<a name="line.298"></a>
-<span class="sourceLineNo">299</span> System.err.println(" Note: -D properties will be applied to the conf used. ");<a name="line.299"></a>
-<span class="sourceLineNo">300</span> System.err.println(" Additionally, all of the SCAN properties from TableInputFormat");<a name="line.300"></a>
-<span class="sourceLineNo">301</span> System.err.println(" can be specified to get fine grained control on what is counted..");<a name="line.301"></a>
-<span class="sourceLineNo">302</span> System.err.println(" -D " + TableInputFormat.SCAN_ROW_START + "=<rowkey>");<a name="line.302"></a>
-<span class="sourceLineNo">303</span> System.err.println(" -D " + TableInputFormat.SCAN_ROW_STOP + "=<rowkey>");<a name="line.303"></a>
-<span class="sourceLineNo">304</span> System.err.println(" -D " + TableInputFormat.SCAN_COLUMNS + "=\"<col1> <col2>...\"");<a name="line.304"></a>
-<span class="sourceLineNo">305</span> System.err.println(" -D " + TableInputFormat.SCAN_COLUMN_FAMILY + "=<family1>,<family2>, ...");<a name="line.305"></a>
-<span class="sourceLineNo">306</span> System.err.println(" -D " + TableInputFormat.SCAN_TIMESTAMP + "=<timestamp>");<a name="line.306"></a>
-<span class="sourceLineNo">307</span> System.err.println(" -D " + TableInputFormat.SCAN_TIMERANGE_START + "=<timestamp>");<a name="line.307"></a>
-<span class="sourceLineNo">308</span> System.err.println(" -D " + TableInputFormat.SCAN_TIMERANGE_END + "=<timestamp>");<a name="line.308"></a>
-<span class="sourceLineNo">309</span> System.err.println(" -D " + TableInputFormat.SCAN_MAXVERSIONS + "=<count>");<a name="line.309"></a>
-<span class="sourceLineNo">310</span> System.err.println(" -D " + TableInputFormat.SCAN_CACHEDROWS + "=<count>");<a name="line.310"></a>
-<span class="sourceLineNo">311</span> System.err.println(" -D " + TableInputFormat.SCAN_BATCHSIZE + "=<count>");<a name="line.311"></a>
-<span class="sourceLineNo">312</span> System.err.println(" <reportSeparator> parameter can be used to override the default report separator " +<a name="line.312"></a>
-<span class="sourceLineNo">313</span> "string : used to separate the rowId/column family name and qualifier name.");<a name="line.313"></a>
-<span class="sourceLineNo">314</span> System.err.println(" [^[regex pattern] or [Prefix] parameter can be used to limit the cell counter count " +<a name="line.314"></a>
-<span class="sourceLineNo">315</span> "operation to a limited subset of rows from the table based on regex or prefix pattern.");<a name="line.315"></a>
-<span class="sourceLineNo">316</span> return -1;<a name="line.316"></a>
-<span class="sourceLineNo">317</span> }<a name="line.317"></a>
-<span class="sourceLineNo">318</span> Job job = createSubmittableJob(getConf(), args);<a name="line.318"></a>
-<span class="sourceLineNo">319</span> return (job.waitForCompletion(true) ? 0 : 1);<a name="line.319"></a>
-<span class="sourceLineNo">320</span> }<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> /**<a name="line.322"></a>
-<span class="sourceLineNo">323</span> * Main entry point.<a name="line.323"></a>
-<span class="sourceLineNo">324</span> * @param args The command line parameters.<a name="line.324"></a>
-<span class="sourceLineNo">325</span> * @throws Exception When running the job fails.<a name="line.325"></a>
-<span class="sourceLineNo">326</span> */<a name="line.326"></a>
-<span class="sourceLineNo">327</span> public static void main(String[] args) throws Exception {<a name="line.327"></a>
-<span class="sourceLineNo">328</span> int errCode = ToolRunner.run(HBaseConfiguration.create(), new CellCounter(), args);<a name="line.328"></a>
-<span class="sourceLineNo">329</span> System.exit(errCode);<a name="line.329"></a>
-<span class="sourceLineNo">330</span> }<a name="line.330"></a>
-<span class="sourceLineNo">331</span><a name="line.331"></a>
-<span class="sourceLineNo">332</span>}<a name="line.332"></a>
+<span class="sourceLineNo">295</span> printUsage(args.length);<a name="line.295"></a>
+<span class="sourceLineNo">296</span> return -1;<a name="line.296"></a>
+<span class="sourceLineNo">297</span> }<a name="line.297"></a>
+<span class="sourceLineNo">298</span> Job job = createSubmittableJob(getConf(), args);<a name="line.298"></a>
+<span class="sourceLineNo">299</span> return (job.waitForCompletion(true) ? 0 : 1);<a name="line.299"></a>
+<span class="sourceLineNo">300</span> }<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span> private void printUsage(int parameterCount) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span> System.err.println("ERROR: Wrong number of parameters: " + parameterCount);<a name="line.303"></a>
+<span class="sourceLineNo">304</span> System.err.println("Usage: hbase cellcounter <tablename> <outputDir> [reportSeparator] "<a name="line.304"></a>
+<span class="sourceLineNo">305</span> + "[^[regex pattern] or [Prefix]] [--starttime=<starttime> --endtime=<endtime>]");<a name="line.305"></a>
+<span class="sourceLineNo">306</span> System.err.println(" Note: -D properties will be applied to the conf used.");<a name="line.306"></a>
+<span class="sourceLineNo">307</span> System.err.println(" Additionally, all of the SCAN properties from TableInputFormat can be "<a name="line.307"></a>
+<span class="sourceLineNo">308</span> + "specified to get fine grained control on what is counted.");<a name="line.308"></a>
+<span class="sourceLineNo">309</span> System.err.println(" -D" + TableInputFormat.SCAN_ROW_START + "=<rowkey>");<a name="line.309"></a>
+<span class="sourceLineNo">310</span> System.err.println(" -D" + TableInputFormat.SCAN_ROW_STOP + "=<rowkey>");<a name="line.310"></a>
+<span class="sourceLineNo">311</span> System.err.println(" -D" + TableInputFormat.SCAN_COLUMNS + "=\"<col1> <col2>...\"");<a name="line.311"></a>
+<span class="sourceLineNo">312</span> System.err.println(" -D" + TableInputFormat.SCAN_COLUMN_FAMILY<a name="line.312"></a>
+<span class="sourceLineNo">313</span> + "=<family1>,<family2>, ...");<a name="line.313"></a>
+<span class="sourceLineNo">314</span> System.err.println(" -D" + TableInputFormat.SCAN_TIMESTAMP + "=<timestamp>");<a name="line.314"></a>
+<span class="sourceLineNo">315</span> System.err.println(" -D" + TableInputFormat.SCAN_TIMERANGE_START + "=<timestamp>");<a name="line.315"></a>
+<span class="sourceLineNo">316</span> System.err.println(" -D" + TableInputFormat.SCAN_TIMERANGE_END + "=<timestamp>");<a name="line.316"></a>
+<span class="sourceLineNo">317</span> System.err.println(" -D" + TableInputFormat.SCAN_MAXVERSIONS + "=<count>");<a name="line.317"></a>
+<span class="sourceLineNo">318</span> System.err.println(" -D" + TableInputFormat.SCAN_CACHEDROWS + "=<count>");<a name="line.318"></a>
+<span class="sourceLineNo">319</span> System.err.println(" -D" + TableInputFormat.SCAN_BATCHSIZE + "=<count>");<a name="line.319"></a>
+<span class="sourceLineNo">320</span> System.err.println(" <reportSeparator> parameter can be used to override the default report "<a name="line.320"></a>
+<span class="sourceLineNo">321</span> + "separator string : used to separate the rowId/column family name and qualifier name.");<a name="line.321"></a>
+<span class="sourceLineNo">322</span> System.err.println(" [^[regex pattern] or [Prefix] parameter can be used to limit the cell "<a name="line.322"></a>
+<span class="sourceLineNo">323</span> + "counter count operation to a limited subset of rows from the table based on regex or "<a name="line.323"></a>
+<span class="sourceLineNo">324</span> + "prefix pattern.");<a name="line.324"></a>
+<span class="sourceLineNo">325</span> }<a name="line.325"></a>
+<span class="sourceLineNo">326</span><a name="line.326"></a>
+<span class="sourceLineNo">327</span> /**<a name="line.327"></a>
+<span class="sourceLineNo">328</span> * Main entry point.<a name="line.328"></a>
+<span class="sourceLineNo">329</span> * @param args The command line parameters.<a name="line.329"></a>
+<span class="sourceLineNo">330</span> * @throws Exception When running the job fails.<a name="line.330"></a>
+<span class="sourceLineNo">331</span> */<a name="line.331"></a>
+<span class="sourceLineNo">332</span> public static void main(String[] args) throws Exception {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> int errCode = ToolRunner.run(HBaseConfiguration.create(), new CellCounter(), args);<a name="line.333"></a>
+<span class="sourceLineNo">334</span> System.exit(errCode);<a name="line.334"></a>
+<span class="sourceLineNo">335</span> }<a name="line.335"></a>
+<span class="sourceLineNo">336</span><a name="line.336"></a>
+<span class="sourceLineNo">337</span>}<a name="line.337"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d220bc5e/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/RowCounter.RowCounterMapper.Counters.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/RowCounter.RowCounterMapper.Counters.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/RowCounter.RowCounterMapper.Counters.html
index 56ec3ac..8f4cacb 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/RowCounter.RowCounterMapper.Counters.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/RowCounter.RowCounterMapper.Counters.html
@@ -229,9 +229,9 @@
<span class="sourceLineNo">221</span> * Note that we don't document --expected-count, because it's intended for test.<a name="line.221"></a>
<span class="sourceLineNo">222</span> */<a name="line.222"></a>
<span class="sourceLineNo">223</span> private static void printUsage() {<a name="line.223"></a>
-<span class="sourceLineNo">224</span> System.err.println("Usage: RowCounter [options] <tablename> " +<a name="line.224"></a>
-<span class="sourceLineNo">225</span> "[--starttime=[start] --endtime=[end] " +<a name="line.225"></a>
-<span class="sourceLineNo">226</span> "[--range=[startKey],[endKey][;[startKey],[endKey]...]] [<column1> <column2>...]");<a name="line.226"></a>
+<span class="sourceLineNo">224</span> System.err.println("Usage: hbase rowcounter [options] <tablename> "<a name="line.224"></a>
+<span class="sourceLineNo">225</span> + "[--starttime=<start> --endtime=<end>] "<a name="line.225"></a>
+<span class="sourceLineNo">226</span> + "[--range=[startKey],[endKey][;[startKey],[endKey]...]] [<column1> <column2>...]");<a name="line.226"></a>
<span class="sourceLineNo">227</span> System.err.println("For performance consider the following options:\n"<a name="line.227"></a>
<span class="sourceLineNo">228</span> + "-Dhbase.client.scanner.caching=100\n"<a name="line.228"></a>
<span class="sourceLineNo">229</span> + "-Dmapreduce.map.speculative=false");<a name="line.229"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d220bc5e/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/RowCounter.RowCounterMapper.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/RowCounter.RowCounterMapper.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/RowCounter.RowCounterMapper.html
index 56ec3ac..8f4cacb 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/RowCounter.RowCounterMapper.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/RowCounter.RowCounterMapper.html
@@ -229,9 +229,9 @@
<span class="sourceLineNo">221</span> * Note that we don't document --expected-count, because it's intended for test.<a name="line.221"></a>
<span class="sourceLineNo">222</span> */<a name="line.222"></a>
<span class="sourceLineNo">223</span> private static void printUsage() {<a name="line.223"></a>
-<span class="sourceLineNo">224</span> System.err.println("Usage: RowCounter [options] <tablename> " +<a name="line.224"></a>
-<span class="sourceLineNo">225</span> "[--starttime=[start] --endtime=[end] " +<a name="line.225"></a>
-<span class="sourceLineNo">226</span> "[--range=[startKey],[endKey][;[startKey],[endKey]...]] [<column1> <column2>...]");<a name="line.226"></a>
+<span class="sourceLineNo">224</span> System.err.println("Usage: hbase rowcounter [options] <tablename> "<a name="line.224"></a>
+<span class="sourceLineNo">225</span> + "[--starttime=<start> --endtime=<end>] "<a name="line.225"></a>
+<span class="sourceLineNo">226</span> + "[--range=[startKey],[endKey][;[startKey],[endKey]...]] [<column1> <column2>...]");<a name="line.226"></a>
<span class="sourceLineNo">227</span> System.err.println("For performance consider the following options:\n"<a name="line.227"></a>
<span class="sourceLineNo">228</span> + "-Dhbase.client.scanner.caching=100\n"<a name="line.228"></a>
<span class="sourceLineNo">229</span> + "-Dmapreduce.map.speculative=false");<a name="line.229"></a>