svn commit: r815506 - in /hadoop/hbase/branches/0.20: CHANGES.txt src/java/org/apache/hadoop/hbase/io/hfile/HFile.java

[st...@apache.org]

Author: stack
Date: Tue Sep 15 21:54:19 2009
New Revision: 815506

URL: http://svn.apache.org/viewvc?rev=815506&view=rev
Log:
HBASE-1833 hfle.main fixes

Modified:
    hadoop/hbase/branches/0.20/CHANGES.txt
    hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/io/hfile/HFile.java

Modified: hadoop/hbase/branches/0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/CHANGES.txt?rev=815506&r1=815505&r2=815506&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.20/CHANGES.txt Tue Sep 15 21:54:19 2009
@@ -24,6 +24,7 @@
    HBASE-1823  Ability for Scanners to bypass the block cache
    HBASE-1827  Add disabling block cache scanner flag to the shell
    HBASE-1574  Client and server APIs to do batch deletes
+   HBASE-1833  hfile.main fixes
 
 Release 0.20.0 - Tue Sep  8 12:48:41 PDT 2009
 

Modified: hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/io/hfile/HFile.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/io/hfile/HFile.java?rev=815506&r1=815505&r2=815506&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/io/hfile/HFile.java (original)
+++ hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/io/hfile/HFile.java Tue Sep 15 21:54:19 2009
@@ -1639,13 +1639,16 @@
     try {
       // create options
       Options options = new Options();
-      options.addOption("v", "verbose", false, "verbose output");
-      options.addOption("p", "printkv", false, "print key/value pairs");
-      options.addOption("m", "printmeta", false, "print meta data of file");
-      options.addOption("k", "checkrow", false, "enable row order check");
-      options.addOption("a", "checkfamily", false, "enable family check");
-      options.addOption("f", "file", true, "file to scan");
-      options.addOption("r", "region", true, "region to scan");
+      options.addOption("v", "verbose", false, "Verbose output; emits file and meta data delimiters");
+      options.addOption("p", "printkv", false, "Print key/value pairs");
+      options.addOption("m", "printmeta", false, "Print meta data of file");
+      options.addOption("k", "checkrow", false,
+        "Enable row order check; looks for out-of-order keys");
+      options.addOption("a", "checkfamily", false, "Enable family check");
+      options.addOption("f", "file", true,
+        "File to scan. Pass full-path; e.g. hdfs://a:9000/hbase/.META./12/34");
+      options.addOption("r", "region", true,
+        "Region to scan. Pass region name; e.g. '.META.,,1'");
       if (args.length == 0) {
         HelpFormatter formatter = new HelpFormatter();
         formatter.printHelp("HFile ", options, true);
@@ -1660,6 +1663,8 @@
       boolean checkFamily = cmd.hasOption("a");
       // get configuration, file system and get list of files
       HBaseConfiguration conf = new HBaseConfiguration();
+      conf.set("fs.default.name",
+        conf.get(org.apache.hadoop.hbase.HConstants.HBASE_DIR));
       FileSystem fs = FileSystem.get(conf);
       ArrayList<Path> files = new ArrayList<Path>();
       if (cmd.hasOption("f")) {
@@ -1675,18 +1680,17 @@
         Path regionDir = new Path(tableDir, Integer.toString(enc));
         if (verbose) System.out.println("region dir -> " + regionDir);
         List<Path> regionFiles = getStoreFiles(fs, regionDir);
-        System.out.println("Number of region files found -> " + 
+        if (verbose) System.out.println("Number of region files found -> " + 
           regionFiles.size());
         if (verbose) {
           int i = 1;
           for (Path p : regionFiles) {
-            System.out.println("Found file[" + i++ + "] -> " + p);
+            if (verbose) System.out.println("Found file[" + i++ + "] -> " + p);
           }
         }
         files.addAll(regionFiles);
       }
       // iterate over all files found
-      System.out.println("\nStart scan of files...\n");
       for (Path file : files) {
         if (verbose) System.out.println("Scanning -> " + file);
         if (!fs.exists(file)) {
@@ -1756,7 +1760,6 @@
         }
         reader.close();
       }
-      System.out.println("\nDone.");
     } catch (Exception e) {
       e.printStackTrace();
     }