diff --git a/pom.xml b/pom.xml index a713a6a..bb09dfd 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ org.apache.hbase hbase jar - 0.94.6-cdh4.3.0 + 0.94.6-cdh4.3.0-with-more-bulk HBase HBase is the &lt;a href="http://hadoop.apache.org"&rt;Hadoop</a&rt; database. Use it when you need diff --git a/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java b/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java index acb7d73..1c8d8b8 100644 --- a/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java +++ b/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java @@ -54,6 +54,7 @@ import org.apache.hadoop.hbase.io.hfile.HFile; import org.apache.hadoop.hbase.io.hfile.HFileDataBlockEncoder; import org.apache.hadoop.hbase.io.hfile.HFileDataBlockEncoderImpl; import org.apache.hadoop.hbase.io.hfile.NoOpDataBlockEncoder; +import org.apache.hadoop.hbase.mapreduce.hadoopbackport.TotalOrderPartitioner; import org.apache.hadoop.hbase.regionserver.Store; import org.apache.hadoop.hbase.regionserver.StoreFile; import org.apache.hadoop.hbase.regionserver.StoreFile.BloomType; @@ -80,7 +81,7 @@ public class HFileOutputFormat extends FileOutputFormat getRecordWriter(final TaskAttemptContext context) @@ -104,7 +105,7 @@ public class HFileOutputFormat extends FileOutputFormat compressionMap = createFamilyCompressionMap(conf); final Map bloomTypeMap = createFamilyBloomMap(conf); - + String dataBlockEncodingStr = conf.get(DATABLOCK_ENCODING_CONF_KEY); final HFileDataBlockEncoder encoder; if (dataBlockEncodingStr == null) { @@ -371,10 +372,15 @@ public class HFileOutputFormat extends FileOutputFormat createFamilyBloomMap(Configuration conf) { return createFamilyConfValueMap(conf, BLOOM_TYPE_CONF_KEY); } - + /** * Run inside the task to deserialize column family to given conf value map. - * + * * @param conf * @param confName * @return a map of column family to the given configuration value @@ -443,7 +449,7 @@ public class HFileOutputFormat extends FileOutputFormat