hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1100404 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java
Date Fri, 06 May 2011 22:12:09 GMT
Author: stack
Date: Fri May  6 22:12:09 2011
New Revision: 1100404

URL: http://svn.apache.org/viewvc?rev=1100404&view=rev
Log:
HBASE-3864 Rename of hfile.min.blocksize.size in HBASE-2899 reverted in HBASE-1861

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

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1100404&r1=1100403&r2=1100404&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Fri May  6 22:12:09 2011
@@ -101,6 +101,8 @@ Release 0.91.0 - Unreleased
    HBASE-3853  Fix TestInfoServers to pass after HBASE-3835 (todd)
    HBASE-3862  Race conditions in aggregate calculation (John Heitmann)
    HBASE-3865  Failing TestWALReplay
+   HBASE-3864  Rename of hfile.min.blocksize.size in HBASE-2899 reverted in
+               HBASE-1861 (Aaron T. Myers)
 
   IMPROVEMENTS
    HBASE-3290  Max Compaction Size (Nicolas Spiegelberg via Stack)  

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java?rev=1100404&r1=1100403&r2=1100404&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java Fri
May  6 22:12:09 2011
@@ -82,7 +82,7 @@ public class HFileOutputFormat extends F
     // These configs. are from hbase-*.xml
     final long maxsize = conf.getLong("hbase.hregion.max.filesize",
         HConstants.DEFAULT_MAX_FILE_SIZE);
-    final int blocksize = conf.getInt("hfile.min.blocksize.size",
+    final int blocksize = conf.getInt("hbase.mapreduce.hfileoutputformat.blocksize",
         HFile.DEFAULT_BLOCKSIZE);
     // Invented config.  Add to hbase-*.xml if other than default compression.
     final String defaultCompression = conf.get("hfile.compression",



Mime
View raw message