svn commit: r828036 - in /hadoop/hbase/branches/0.20: CHANGES.txt src/java/org/apache/hadoop/hbase/mapreduce/Driver.java

[stack]

Author: stack
Date: Wed Oct 21 14:44:39 2009
New Revision: 828036

URL: http://svn.apache.org/viewvc?rev=828036&view=rev
Log:
HBASE-1924 MapReduce Driver lost hsf2sf backporting hbase-1684

Modified:
    hadoop/hbase/branches/0.20/CHANGES.txt
    
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/mapreduce/Driver.java

Modified: hadoop/hbase/branches/0.20/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/CHANGES.txt?rev=828036&r1=828035&r2=828036&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.20/CHANGES.txt Wed Oct 21 14:44:39 2009
@@ -14,6 +14,7 @@
    HBASE-1917  TestScanner.testFilters failing
    HBASE-1908  ROOT not reassigned if only one regionserver left
    HBASE-1916  FindBugs and javac warnings cleanup
+   HBASE-1924  MapReduce Driver lost hsf2sf backporting hbase-1684
 
   IMPROVEMENTS
    HBASE-1899  Use scanner caching in shell count

Modified: 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/mapreduce/Driver.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/mapreduce/Driver.java?rev=828036&r1=828035&r2=828036&view=diff
==============================================================================
--- 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/mapreduce/Driver.java
 (original)
+++ 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/mapreduce/Driver.java
 Wed Oct 21 14:44:39 2009
@@ -20,6 +20,7 @@
 package org.apache.hadoop.hbase.mapreduce;
 
 import org.apache.hadoop.util.ProgramDriver;
+import org.apache.hadoop.hbase.migration.nineteen.HStoreFileToStoreFile;
 
 /**
  * Driver for hbase mapreduce jobs. Select which to run by passing
@@ -34,6 +35,9 @@
     ProgramDriver pgd = new ProgramDriver();
     pgd.addClass(RowCounter.NAME, RowCounter.class,
       "Count rows in HBase table");
+    pgd.addClass(HStoreFileToStoreFile.JOBNAME,
+      HStoreFileToStoreFile.class,
+      "Bulk convert 0.19 HStoreFiles to 0.20 StoreFiles");
     pgd.addClass(Export.NAME, Export.class, "Write table data to HDFS.");
     pgd.addClass(Import.NAME, Import.class, "Import data written by Export.");
     pgd.driver(args);