[14/50] [abbrv] hbase git commit: HBASE-20376 RowCounter and CellCounter documentations are incorrect

2018-04-17 Thread zhangduo 
HBASE-20376 RowCounter and CellCounter documentations are incorrect


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c4ebf666
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c4ebf666
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c4ebf666

Branch: refs/heads/HBASE-19064
Commit: c4ebf666b78f92a6d02652eece8dd95360bd0482
Parents: 5a69465
Author: Peter Somogyi 
Authored: Tue Apr 10 15:16:03 2018 +0200
Committer: Peter Somogyi 
Committed: Thu Apr 12 10:00:38 2018 +0200

--
 bin/hbase   |  6 +++
 .../hadoop/hbase/mapreduce/CellCounter.java | 47 +++-
 .../hadoop/hbase/mapreduce/RowCounter.java  |  6 +--
 .../hadoop/hbase/mapreduce/TestRowCounter.java  | 22 +
 src/main/asciidoc/_chapters/ops_mgt.adoc| 31 -
 5 files changed, 64 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/c4ebf666/bin/hbase
--
diff --git a/bin/hbase b/bin/hbase
index 8e37f5f..f1e2306 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -106,6 +106,8 @@ if [ $# = 0 ]; then
   echo "  backup  Backup tables for recovery"
   echo "  restore Restore tables from existing backup image"
   echo "  regionsplitter  Run RegionSplitter tool"
+  echo "  rowcounter  Run RowCounter tool"
+  echo "  cellcounter Run CellCounter tool"
   echo "  CLASSNAME   Run the class named CLASSNAME"
   exit 1
 fi
@@ -465,6 +467,10 @@ elif [ "$COMMAND" = "version" ] ; then
   CLASS='org.apache.hadoop.hbase.util.VersionInfo'
 elif [ "$COMMAND" = "regionsplitter" ] ; then
   CLASS='org.apache.hadoop.hbase.util.RegionSplitter'
+elif [ "$COMMAND" = "rowcounter" ] ; then
+  CLASS='org.apache.hadoop.hbase.mapreduce.RowCounter'
+elif [ "$COMMAND" = "cellcounter" ] ; then
+  CLASS='org.apache.hadoop.hbase.mapreduce.CellCounter'
 else
   CLASS=$COMMAND
 fi

http://git-wip-us.apache.org/repos/asf/hbase/blob/c4ebf666/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
--
diff --git 
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
 
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
index aa79aac..ff0f01c 100644
--- 
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
+++ 
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
@@ -292,33 +292,38 @@ public class CellCounter extends Configured implements 
Tool {
   @Override
   public int run(String[] args) throws Exception {
 if (args.length < 2) {
-  System.err.println("ERROR: Wrong number of parameters: " + args.length);
-  System.err.println("Usage: CellCounter ");
-  System.err.println("  
[^[regex pattern] or " +
-"[Prefix] for row filter]] --starttime=[starttime] 
--endtime=[endtime]");
-  System.err.println("  Note: -D properties will be applied to the conf 
used. ");
-  System.err.println("  Additionally, all of the SCAN properties from 
TableInputFormat");
-  System.err.println("  can be specified to get fine grained control on 
what is counted..");
-  System.err.println("   -D " + TableInputFormat.SCAN_ROW_START + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_ROW_STOP + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_COLUMNS + "=\" 
...\"");
-  System.err.println("   -D " + TableInputFormat.SCAN_COLUMN_FAMILY + 
"=,, ...");
-  System.err.println("   -D " + TableInputFormat.SCAN_TIMESTAMP + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_TIMERANGE_START + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_TIMERANGE_END + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_MAXVERSIONS + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_CACHEDROWS + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_BATCHSIZE + 
"=");
-  System.err.println("  parameter can be used to override 
the default report separator " +
-  "string : used to separate the rowId/column family name and 
qualifier name.");
-  System.err.println(" [^[regex pattern] or [Prefix] parameter can be used 
to limit the cell counter count " +
-  "operation to a limited subset of rows from the table based on regex 
or prefix pattern.");
+  printUsage(args.length);
   return -1;
 }
 Job job = createSubmittableJob(getConf(), args);
 return (job.waitForCompletion(true) ? 0 : 1);
   }
 
+  private void printUsage(int parameterCount) {
+System.err.println("ERROR: Wrong

hbase git commit: HBASE-20376 RowCounter and CellCounter documentations are incorrect

2018-04-12 Thread psomogyi 
Repository: hbase
Updated Branches:
  refs/heads/branch-2.0 e72a1c694 -> 263cc8d14


HBASE-20376 RowCounter and CellCounter documentations are incorrect


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/263cc8d1
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/263cc8d1
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/263cc8d1

Branch: refs/heads/branch-2.0
Commit: 263cc8d14371db4abeebcf2967393ee4a1ae614f
Parents: e72a1c6
Author: Peter Somogyi 
Authored: Thu Apr 12 10:05:17 2018 +0200
Committer: Peter Somogyi 
Committed: Thu Apr 12 10:06:42 2018 +0200

--
 bin/hbase   |  6 +++
 .../hadoop/hbase/mapreduce/CellCounter.java | 47 +++-
 .../hadoop/hbase/mapreduce/RowCounter.java  |  6 +--
 .../hadoop/hbase/mapreduce/TestRowCounter.java  | 22 +
 4 files changed, 45 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/263cc8d1/bin/hbase
--
diff --git a/bin/hbase b/bin/hbase
index 5087e59..78dbbdd 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -104,6 +104,8 @@ if [ $# = 0 ]; then
   echo "  canary  Run the Canary tool"
   echo "  version Print the version"
   echo "  regionsplitter  Run RegionSplitter tool"
+  echo "  rowcounter  Run RowCounter tool"
+  echo "  cellcounter Run CellCounter tool"
   echo "  CLASSNAME   Run the class named CLASSNAME"
   exit 1
 fi
@@ -459,6 +461,10 @@ elif [ "$COMMAND" = "version" ] ; then
   CLASS='org.apache.hadoop.hbase.util.VersionInfo'
 elif [ "$COMMAND" = "regionsplitter" ] ; then
   CLASS='org.apache.hadoop.hbase.util.RegionSplitter'
+elif [ "$COMMAND" = "rowcounter" ] ; then
+  CLASS='org.apache.hadoop.hbase.mapreduce.RowCounter'
+elif [ "$COMMAND" = "cellcounter" ] ; then
+  CLASS='org.apache.hadoop.hbase.mapreduce.CellCounter'
 else
   CLASS=$COMMAND
 fi

http://git-wip-us.apache.org/repos/asf/hbase/blob/263cc8d1/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
--
diff --git 
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
 
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
index aa79aac..ff0f01c 100644
--- 
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
+++ 
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
@@ -292,33 +292,38 @@ public class CellCounter extends Configured implements 
Tool {
   @Override
   public int run(String[] args) throws Exception {
 if (args.length < 2) {
-  System.err.println("ERROR: Wrong number of parameters: " + args.length);
-  System.err.println("Usage: CellCounter ");
-  System.err.println("  
[^[regex pattern] or " +
-"[Prefix] for row filter]] --starttime=[starttime] 
--endtime=[endtime]");
-  System.err.println("  Note: -D properties will be applied to the conf 
used. ");
-  System.err.println("  Additionally, all of the SCAN properties from 
TableInputFormat");
-  System.err.println("  can be specified to get fine grained control on 
what is counted..");
-  System.err.println("   -D " + TableInputFormat.SCAN_ROW_START + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_ROW_STOP + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_COLUMNS + "=\" 
...\"");
-  System.err.println("   -D " + TableInputFormat.SCAN_COLUMN_FAMILY + 
"=,, ...");
-  System.err.println("   -D " + TableInputFormat.SCAN_TIMESTAMP + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_TIMERANGE_START + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_TIMERANGE_END + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_MAXVERSIONS + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_CACHEDROWS + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_BATCHSIZE + 
"=");
-  System.err.println("  parameter can be used to override 
the default report separator " +
-  "string : used to separate the rowId/column family name and 
qualifier name.");
-  System.err.println(" [^[regex pattern] or [Prefix] parameter can be used 
to limit the cell counter count " +
-  "operation to a limited subset of rows from the table based on regex 
or prefix pattern.");
+  printUsage(args.length);
   return -1;
 }
 Job job = createSubmittableJob(getConf(), args);
 return (job.waitForCompletion(true) ? 0 : 1);
   }
 
+  private void printUsage(int parameterCount) {
+System.err.println("ERROR: Wrong number of

hbase git commit: HBASE-20376 RowCounter and CellCounter documentations are incorrect

2018-04-12 Thread psomogyi 
Repository: hbase
Updated Branches:
  refs/heads/branch-2 b0701434e -> e51ced4f1


HBASE-20376 RowCounter and CellCounter documentations are incorrect


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e51ced4f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e51ced4f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e51ced4f

Branch: refs/heads/branch-2
Commit: e51ced4f174759fd794a787ba82bf139875a6a96
Parents: b070143
Author: Peter Somogyi 
Authored: Thu Apr 12 10:05:17 2018 +0200
Committer: Peter Somogyi 
Committed: Thu Apr 12 10:05:45 2018 +0200

--
 bin/hbase   |  6 +++
 .../hadoop/hbase/mapreduce/CellCounter.java | 47 +++-
 .../hadoop/hbase/mapreduce/RowCounter.java  |  6 +--
 .../hadoop/hbase/mapreduce/TestRowCounter.java  | 22 +
 4 files changed, 45 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/e51ced4f/bin/hbase
--
diff --git a/bin/hbase b/bin/hbase
index 5087e59..78dbbdd 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -104,6 +104,8 @@ if [ $# = 0 ]; then
   echo "  canary  Run the Canary tool"
   echo "  version Print the version"
   echo "  regionsplitter  Run RegionSplitter tool"
+  echo "  rowcounter  Run RowCounter tool"
+  echo "  cellcounter Run CellCounter tool"
   echo "  CLASSNAME   Run the class named CLASSNAME"
   exit 1
 fi
@@ -459,6 +461,10 @@ elif [ "$COMMAND" = "version" ] ; then
   CLASS='org.apache.hadoop.hbase.util.VersionInfo'
 elif [ "$COMMAND" = "regionsplitter" ] ; then
   CLASS='org.apache.hadoop.hbase.util.RegionSplitter'
+elif [ "$COMMAND" = "rowcounter" ] ; then
+  CLASS='org.apache.hadoop.hbase.mapreduce.RowCounter'
+elif [ "$COMMAND" = "cellcounter" ] ; then
+  CLASS='org.apache.hadoop.hbase.mapreduce.CellCounter'
 else
   CLASS=$COMMAND
 fi

http://git-wip-us.apache.org/repos/asf/hbase/blob/e51ced4f/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
--
diff --git 
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
 
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
index aa79aac..ff0f01c 100644
--- 
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
+++ 
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
@@ -292,33 +292,38 @@ public class CellCounter extends Configured implements 
Tool {
   @Override
   public int run(String[] args) throws Exception {
 if (args.length < 2) {
-  System.err.println("ERROR: Wrong number of parameters: " + args.length);
-  System.err.println("Usage: CellCounter ");
-  System.err.println("  
[^[regex pattern] or " +
-"[Prefix] for row filter]] --starttime=[starttime] 
--endtime=[endtime]");
-  System.err.println("  Note: -D properties will be applied to the conf 
used. ");
-  System.err.println("  Additionally, all of the SCAN properties from 
TableInputFormat");
-  System.err.println("  can be specified to get fine grained control on 
what is counted..");
-  System.err.println("   -D " + TableInputFormat.SCAN_ROW_START + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_ROW_STOP + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_COLUMNS + "=\" 
...\"");
-  System.err.println("   -D " + TableInputFormat.SCAN_COLUMN_FAMILY + 
"=,, ...");
-  System.err.println("   -D " + TableInputFormat.SCAN_TIMESTAMP + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_TIMERANGE_START + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_TIMERANGE_END + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_MAXVERSIONS + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_CACHEDROWS + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_BATCHSIZE + 
"=");
-  System.err.println("  parameter can be used to override 
the default report separator " +
-  "string : used to separate the rowId/column family name and 
qualifier name.");
-  System.err.println(" [^[regex pattern] or [Prefix] parameter can be used 
to limit the cell counter count " +
-  "operation to a limited subset of rows from the table based on regex 
or prefix pattern.");
+  printUsage(args.length);
   return -1;
 }
 Job job = createSubmittableJob(getConf(), args);
 return (job.waitForCompletion(true) ? 0 : 1);
   }
 
+  private void printUsage(int parameterCount) {
+System.err.println("ERROR: Wrong number of parameters: "

hbase git commit: HBASE-20376 RowCounter and CellCounter documentations are incorrect

2018-04-12 Thread psomogyi 
Repository: hbase
Updated Branches:
  refs/heads/master 5a69465ea -> c4ebf666b


HBASE-20376 RowCounter and CellCounter documentations are incorrect


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c4ebf666
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c4ebf666
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c4ebf666

Branch: refs/heads/master
Commit: c4ebf666b78f92a6d02652eece8dd95360bd0482
Parents: 5a69465
Author: Peter Somogyi 
Authored: Tue Apr 10 15:16:03 2018 +0200
Committer: Peter Somogyi 
Committed: Thu Apr 12 10:00:38 2018 +0200

--
 bin/hbase   |  6 +++
 .../hadoop/hbase/mapreduce/CellCounter.java | 47 +++-
 .../hadoop/hbase/mapreduce/RowCounter.java  |  6 +--
 .../hadoop/hbase/mapreduce/TestRowCounter.java  | 22 +
 src/main/asciidoc/_chapters/ops_mgt.adoc| 31 -
 5 files changed, 64 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/c4ebf666/bin/hbase
--
diff --git a/bin/hbase b/bin/hbase
index 8e37f5f..f1e2306 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -106,6 +106,8 @@ if [ $# = 0 ]; then
   echo "  backup  Backup tables for recovery"
   echo "  restore Restore tables from existing backup image"
   echo "  regionsplitter  Run RegionSplitter tool"
+  echo "  rowcounter  Run RowCounter tool"
+  echo "  cellcounter Run CellCounter tool"
   echo "  CLASSNAME   Run the class named CLASSNAME"
   exit 1
 fi
@@ -465,6 +467,10 @@ elif [ "$COMMAND" = "version" ] ; then
   CLASS='org.apache.hadoop.hbase.util.VersionInfo'
 elif [ "$COMMAND" = "regionsplitter" ] ; then
   CLASS='org.apache.hadoop.hbase.util.RegionSplitter'
+elif [ "$COMMAND" = "rowcounter" ] ; then
+  CLASS='org.apache.hadoop.hbase.mapreduce.RowCounter'
+elif [ "$COMMAND" = "cellcounter" ] ; then
+  CLASS='org.apache.hadoop.hbase.mapreduce.CellCounter'
 else
   CLASS=$COMMAND
 fi

http://git-wip-us.apache.org/repos/asf/hbase/blob/c4ebf666/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
--
diff --git 
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
 
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
index aa79aac..ff0f01c 100644
--- 
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
+++ 
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
@@ -292,33 +292,38 @@ public class CellCounter extends Configured implements 
Tool {
   @Override
   public int run(String[] args) throws Exception {
 if (args.length < 2) {
-  System.err.println("ERROR: Wrong number of parameters: " + args.length);
-  System.err.println("Usage: CellCounter ");
-  System.err.println("  
[^[regex pattern] or " +
-"[Prefix] for row filter]] --starttime=[starttime] 
--endtime=[endtime]");
-  System.err.println("  Note: -D properties will be applied to the conf 
used. ");
-  System.err.println("  Additionally, all of the SCAN properties from 
TableInputFormat");
-  System.err.println("  can be specified to get fine grained control on 
what is counted..");
-  System.err.println("   -D " + TableInputFormat.SCAN_ROW_START + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_ROW_STOP + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_COLUMNS + "=\" 
...\"");
-  System.err.println("   -D " + TableInputFormat.SCAN_COLUMN_FAMILY + 
"=,, ...");
-  System.err.println("   -D " + TableInputFormat.SCAN_TIMESTAMP + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_TIMERANGE_START + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_TIMERANGE_END + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_MAXVERSIONS + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_CACHEDROWS + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_BATCHSIZE + 
"=");
-  System.err.println("  parameter can be used to override 
the default report separator " +
-  "string : used to separate the rowId/column family name and 
qualifier name.");
-  System.err.println(" [^[regex pattern] or [Prefix] parameter can be used 
to limit the cell counter count " +
-  "operation to a limited subset of rows from the table based on regex 
or prefix pattern.");
+  printUsage(args.length);
   return -1;
 }
 Job job = createSubmittableJob(getConf(), args);
 return (job.waitForCompletion(true) ? 0 : 1);
   }
 
+  private void