hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject hbase git commit: HBASE-14345 Consolidate printUsage in IntegrationTestLoadAndVerify (Reid Chan)
Date Wed, 10 Aug 2016 17:03:09 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.0 fb9a64816 -> 89b432d45


HBASE-14345 Consolidate printUsage in IntegrationTestLoadAndVerify (Reid Chan)

Change-Id: Iac3e3bbd3c0b8be848ded1c481334675789bd4cc


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

Branch: refs/heads/branch-1.0
Commit: 89b432d452d81843f725466c5cd581599710d488
Parents: fb9a648
Author: Reid <reidddchan@outlook.com>
Authored: Wed Aug 10 09:58:40 2016 -0700
Committer: Apekshit Sharma <appy@apache.org>
Committed: Wed Aug 10 09:58:40 2016 -0700

----------------------------------------------------------------------
 .../hadoop/hbase/test/IntegrationTestLoadAndVerify.java | 12 +++++++-----
 .../IntegrationTestWithCellVisibilityLoadAndVerify.java |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/89b432d4/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java
b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java
index 8a0181c..1930a9c 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java
@@ -398,10 +398,12 @@ public void cleanUpCluster() throws Exception {
     getTestingUtil(getConf()).deleteTable(htd.getTableName());
   }
 
-  public void usage() {
-    System.err.println(this.getClass().getSimpleName() + " [-Doptions] <load|verify|loadAndVerify>");
+  @Override
+  public void printUsage() {
+    printUsage(this.getClass().getSimpleName() + " <options>"
+        + " [-Doptions] <load|verify|loadAndVerify>", "Options", "");
+    System.err.println("");
     System.err.println("  Loads a table with row dependencies and verifies the dependency
chains");
-    System.err.println("Options");
     System.err.println("  -Dloadmapper.table=<name>        Table to write/verify (default
autogen)");
     System.err.println("  -Dloadmapper.backrefs=<n>        Number of backreferences
per row (default 50)");
     System.err.println("  -Dloadmapper.num_to_write=<n>    Number of rows per mapper
(default 100,000 per mapper)");
@@ -419,7 +421,7 @@ public void cleanUpCluster() throws Exception {
 
     String[] args = cmd.getArgs();
     if (args == null || args.length < 1 || args.length > 1) {
-      usage();
+      printUsage();
       throw new RuntimeException("Incorrect Number of args.");
     }
     toRun = args[0];
@@ -442,7 +444,7 @@ public void cleanUpCluster() throws Exception {
       doVerify= true;
     } else {
       System.err.println("Invalid argument " + toRun);
-      usage();
+      printUsage();
       return 1;
     }
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/89b432d4/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.java
b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.java
index e68cb38..1c7fc62 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.java
@@ -346,7 +346,7 @@ public class IntegrationTestWithCellVisibilityLoadAndVerify extends IntegrationT
   }
 
   @Override
-  public void usage() {
+  public void printUsage() {
     System.err.println(this.getClass().getSimpleName() + " -u usera,userb [-Doptions]");
     System.err.println("  Loads a table with cell visibilities and verifies with Authorizations");
     System.err.println("Options");
@@ -386,7 +386,7 @@ public class IntegrationTestWithCellVisibilityLoadAndVerify extends IntegrationT
   protected void processOptions(CommandLine cmd) {
     List args = cmd.getArgList();
     if (args.size() > 0) {
-      usage();
+      printUsage();
       throw new RuntimeException("No args expected.");
     }
     // We always want loadAndVerify action


Mime
View raw message