Forráskód Böngészése

HADOOP-2455 Error in Help-string of create command

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@605277 13f79535-47bb-0310-9956-ffa450edef68
Michael Stack 17 éve
szülő
commit
f4a985bfd6

+ 2 - 0
src/contrib/hbase/CHANGES.txt

@@ -85,6 +85,8 @@ Trunk (unreleased changes)
    HADOOP-2199 Add tools for going from hregion filename to region name in logs
    HADOOP-2441 Fix build failures in TestHBaseCluster
    HADOOP-2451 End key is incorrectly assigned in many region splits
+   HADOOP-2455 Error in Help-string of CREATE command (Edward Yoon via Stack)
+         
    
   IMPROVEMENTS
    HADOOP-2401 Add convenience put method that takes writable

+ 6 - 6
src/contrib/hbase/src/java/org/apache/hadoop/hbase/shell/HelpCommand.java

@@ -30,8 +30,8 @@ import org.apache.hadoop.hbase.HBaseConfiguration;
 
 public class HelpCommand extends BasicCommand {
   private String argument;
-  private static final String[] HEADER = new String[] { "Command", "Description",
-      "Example" };
+  private static final String[] HEADER = new String[] { "Command",
+      "Description", "Example" };
 
   /** application name */
   public static final String APP_NAME = "Hbase Shell";
@@ -90,8 +90,8 @@ public class HelpCommand extends BasicCommand {
                 "Create tables",
                 "CREATE TABLE table_name (column_family_name [MAX_VERSIONS=n] "
                     + "[MAX_LENGTH=n] [COMPRESSION=NONE|RECORD|BLOCK] [IN_MEMORY] "
-                    + "[BLOOMFILTER=NONE|BLOOM|COUNTING|RETOUCHED VECTOR_SIZE=n NUM_HASH=n], "
-                    + "...)" });
+                    + "[BLOOMFILTER=NONE|BLOOMFILTER|COUNTING_BLOOMFILTER|RETOUCHED_BLOOMFILTER "
+                    + "VECTOR_SIZE=n NUM_HASH=n], " + "...)" });
     load.put("DROP", new String[] { "Drop tables",
         "DROP TABLE table_name [, table_name] ...;" });
 
@@ -126,8 +126,8 @@ public class HelpCommand extends BasicCommand {
     // model of
     // data.
 
-    load
-        .put("TABLE", new String[] { "Load a table", "A = table('table_name');" });
+    load.put("TABLE",
+        new String[] { "Load a table", "A = table('table_name');" });
     load.put("SUBSTITUTE", new String[] { "Substitute expression to [A~Z]",
         "D = A.projection('cf_name1'[, 'cf_name2']);" });
     load.put("SAVE", new String[] {