svn commit: r1075441 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java

[st...@apache.org]

Author: stack
Date: Mon Feb 28 17:34:07 2011
New Revision: 1075441

URL: http://svn.apache.org/viewvc?rev=1075441&view=rev
Log:
HBASE-3578 TableInputFormat does not setup the configuration for HBase mapreduce jobs correctly

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1075441&r1=1075440&r2=1075441&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Mon Feb 28 17:34:07 2011
@@ -54,6 +54,8 @@ Release 0.91.0 - Unreleased
    HBASE-3566  writeToWAL is not serialized for increment operation
    HBASE-3552  Coprocessors are unable to load if RegionServer is launched
                using a different classloader than system default
+   HBASE-3578  TableInputFormat does not setup the configuration for HBase
+               mapreduce jobs correctly (Dan Harvey via Stack)
 
   IMPROVEMENTS
    HBASE-3290  Max Compaction Size (Nicolas Spiegelberg via Stack)  
@@ -84,7 +86,7 @@ Release 0.91.0 - Unreleased
    HBASE-3563  [site] Add one-page-only version of hbase doc
    HBASE-3564  DemoClient.pl - a demo client in Perl
    HBASE-3560  the hbase-default entry of "hbase.defaults.for.version" 
-   	       causes tests not to run via not-maven
+               causes tests not to run via not-maven
 
 
   NEW FEATURES

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java?rev=1075441&r1=1075440&r2=1075441&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java Mon Feb 28 17:34:07 2011
@@ -100,6 +100,7 @@ public class TableMapReduceUtil {
     if (outputValueClass != null) job.setMapOutputValueClass(outputValueClass);
     if (outputKeyClass != null) job.setMapOutputKeyClass(outputKeyClass);
     job.setMapperClass(mapper);
+    HBaseConfiguration.addHbaseResources(job.getConfiguration());
     job.getConfiguration().set(TableInputFormat.INPUT_TABLE, table);
     job.getConfiguration().set(TableInputFormat.SCAN,
       convertScanToString(scan));
@@ -231,6 +232,7 @@ public class TableMapReduceUtil {
     String serverImpl, boolean addDependencyJars) throws IOException {
 
     Configuration conf = job.getConfiguration();
+    HBaseConfiguration.addHbaseResources(conf);
     job.setOutputFormatClass(TableOutputFormat.class);
     if (reducer != null) job.setReducerClass(reducer);
     conf.set(TableOutputFormat.OUTPUT_TABLE, table);