svn commit: r1091288 - in /hbase/branches/0.90: CHANGES.txt src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java

[stack]

Author: stack
Date: Tue Apr 12 04:35:50 2011
New Revision: 1091288

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

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

Modified: hbase/branches/0.90/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1091288&r1=1091287&r2=1091288&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Tue Apr 12 04:35:50 2011
@@ -20,6 +20,8 @@ Release 0.90.3 - Unreleased
                methods (David Butler via Stack)
    HBASE-3747  ReplicationSource should differanciate remote and local 
exceptions
    HBASE-3652  Speed up tests by lowering some sleeps
+   HBASE-3578  TableInputFormat does not setup the configuration for HBase
+               mapreduce jobs correctly (Dan Harvey via Stack)
 
   TASK
    HBASE-3748  Add rolling of thrift/rest daemons to graceful_stop.sh script

Modified: 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java?rev=1091288&r1=1091287&r2=1091288&view=diff
==============================================================================
--- 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
 (original)
+++ 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
 Tue Apr 12 04:35:50 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);