You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2012/03/29 23:24:53 UTC
svn commit: r1307118 - in /hbase/branches/0.92: CHANGES.txt
src/main/java/org/apache/hadoop/hbase/mapreduce/HRegionPartitioner.java
Author: stack
Date: Thu Mar 29 21:24:52 2012
New Revision: 1307118
URL: http://svn.apache.org/viewvc?rev=1307118&view=rev
Log:
HBASE-4398 If HRegionPartitioner is used in MapReduce, client side configurations are overwritten by hbase-site.xml
Modified:
hbase/branches/0.92/CHANGES.txt
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/mapreduce/HRegionPartitioner.java
Modified: hbase/branches/0.92/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1307118&r1=1307117&r2=1307118&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Thu Mar 29 21:24:52 2012
@@ -20,6 +20,8 @@ Release 0.92.2 - Unreleased
HBASE-5669 AggregationClient fails validation for open stoprow scan
(Mubarak Seyed)
HBASE-5638 Backport HBASE-5633: NPE reading ZK config in HBase (Matteo Bertozzi)
+ HBASE-4398 If HRegionPartitioner is used in MapReduce, client side configurations
+ are overwritten by hbase-site.xml (Takuya Ueshin)
IMPROVEMENTS
HBASE-5592 Make it easier to get a table from shell (Ben West)
Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/mapreduce/HRegionPartitioner.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/mapreduce/HRegionPartitioner.java?rev=1307118&r1=1307117&r2=1307118&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/mapreduce/HRegionPartitioner.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/mapreduce/HRegionPartitioner.java Thu Mar 29 21:24:52 2012
@@ -116,9 +116,8 @@ implements Configurable {
*/
@Override
public void setConf(Configuration configuration) {
- this.conf = configuration;
+ this.conf = HBaseConfiguration.create(configuration);
try {
- HBaseConfiguration.addHbaseResources(conf);
this.table = new HTable(this.conf,
configuration.get(TableOutputFormat.OUTPUT_TABLE));
} catch (IOException e) {