hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdcry...@apache.org
Subject svn commit: r1085138 - in /hbase/branches/0.90: CHANGES.txt src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java
Date Thu, 24 Mar 2011 20:59:09 GMT
Author: jdcryans
Date: Thu Mar 24 20:59:09 2011
New Revision: 1085138

URL: http://svn.apache.org/viewvc?rev=1085138&view=rev
Log:
   HBASE-3497  TableMapReduceUtil.initTableReducerJob broken due to setConf 
               method in TableOutputFormat


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

Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1085138&r1=1085137&r2=1085138&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Thu Mar 24 20:59:09 2011
@@ -58,6 +58,8 @@ Release 0.90.2 - Unreleased
    HBASE-3654  Weird blocking between getOnlineRegion and createRegionLoad
                (Subbu M Iyer via Stack)
    HBASE-3666  TestScannerTimeout fails occasionally
+   HBASE-3497  TableMapReduceUtil.initTableReducerJob broken due to setConf 
+               method in TableOutputFormat
 
   IMPROVEMENTS
    HBASE-3542  MultiGet methods in Thrift

Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java?rev=1085138&r1=1085137&r2=1085138&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java
(original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java
Thu Mar 24 20:59:09 2011
@@ -25,6 +25,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configurable;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.client.Delete;
 import org.apache.hadoop.hbase.client.HConnectionManager;
@@ -180,21 +181,22 @@ implements Configurable {
   }
 
   @Override
-  public void setConf(Configuration conf) {
-    String tableName = conf.get(OUTPUT_TABLE);
-    String address = conf.get(QUORUM_ADDRESS);
-    String serverClass = conf.get(REGION_SERVER_CLASS);
-    String serverImpl = conf.get(REGION_SERVER_IMPL);
+  public void setConf(Configuration otherConf) {
+    this.conf = HBaseConfiguration.create(otherConf);
+    String tableName = this.conf.get(OUTPUT_TABLE);
+    String address = this.conf.get(QUORUM_ADDRESS);
+    String serverClass = this.conf.get(REGION_SERVER_CLASS);
+    String serverImpl = this.conf.get(REGION_SERVER_IMPL);
     try {
       if (address != null) {
-        ZKUtil.applyClusterKeyToConf(conf, address);
+        ZKUtil.applyClusterKeyToConf(this.conf, address);
       }
       if (serverClass != null) {
-        conf.set(HConstants.REGION_SERVER_CLASS, serverClass);
-        conf.set(HConstants.REGION_SERVER_IMPL, serverImpl);
+        this.conf.set(HConstants.REGION_SERVER_CLASS, serverClass);
+        this.conf.set(HConstants.REGION_SERVER_IMPL, serverImpl);
       }
-      this.table = new HTable(conf, tableName);
-      table.setAutoFlush(false);
+      this.table = new HTable(this.conf, tableName);
+      this.table.setAutoFlush(false);
       LOG.info("Created table instance for "  + tableName);
     } catch(IOException e) {
       LOG.error(e);



Mime
View raw message