You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zg...@apache.org on 2019/03/12 09:53:06 UTC
[hbase] branch master updated: HBASE-21810 bulkload support set
hfile compression on client
This is an automated email from the ASF dual-hosted git repository.
zghao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new a54f0bf HBASE-21810 bulkload support set hfile compression on client
a54f0bf is described below
commit a54f0bfb8f9a0b7d6ec4e4585cd30b9e674bfde8
Author: chenyechao <ch...@gmail.com>
AuthorDate: Mon Mar 11 19:28:08 2019 +0800
HBASE-21810 bulkload support set hfile compression on client
Signed-off-by: Guanghao Zhang <zg...@apache.org>
---
.../hadoop/hbase/mapreduce/HFileOutputFormat2.java | 15 +++++++-
.../hbase/mapreduce/TestHFileOutputFormat2.java | 43 ++++++++++++++++++++++
2 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
index bac3618..1e96232 100644
--- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
+++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
@@ -160,9 +160,11 @@ public class HFileOutputFormat2
// This constant is public since the client can modify this when setting
// up their conf object and thus refer to this symbol.
// It is present for backwards compatibility reasons. Use it only to
- // override the auto-detection of datablock encoding.
+ // override the auto-detection of datablock encoding and compression.
public static final String DATABLOCK_ENCODING_OVERRIDE_CONF_KEY =
"hbase.mapreduce.hfileoutputformat.datablock.encoding";
+ public static final String COMPRESSION_OVERRIDE_CONF_KEY =
+ "hbase.mapreduce.hfileoutputformat.compression";
/**
* Keep locality while generating HFiles for bulkload. See HBASE-12596
@@ -210,6 +212,14 @@ public class HFileOutputFormat2
Compression.Algorithm.NONE.getName());
final Algorithm defaultCompression = HFileWriterImpl
.compressionByName(defaultCompressionStr);
+ String compressionStr = conf.get(COMPRESSION_OVERRIDE_CONF_KEY);
+ final Algorithm overriddenCompression;
+ if (compressionStr != null) {
+ overriddenCompression = Compression.getCompressionAlgorithmByName(compressionStr);
+ } else {
+ overriddenCompression = null;
+ }
+
final boolean compactionExclude = conf.getBoolean(
"hbase.mapreduce.hfileoutputformat.compaction.exclude", false);
@@ -399,7 +409,8 @@ public class HFileOutputFormat2
new Path(getTableRelativePath(tableName), Bytes.toString(family)));
}
WriterLength wl = new WriterLength();
- Algorithm compression = compressionMap.get(tableAndFamily);
+ Algorithm compression = overriddenCompression;
+ compression = compression == null ? compressionMap.get(tableAndFamily) : compression;
compression = compression == null ? defaultCompression : compression;
BloomType bloomType = bloomTypeMap.get(tableAndFamily);
bloomType = bloomType == null ? BloomType.NONE : bloomType;
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java
index cbf5ff8..e8bb805 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java
@@ -1551,5 +1551,48 @@ public class TestHFileOutputFormat2 {
Assert.assertTrue(partitionPathString.startsWith(fooHomeDirectory.toString()));
Assert.assertTrue(fs.exists(new Path(partitionPathString)));
}
+
+ @Test
+ public void TestConfigureCompression() throws Exception {
+ Configuration conf = new Configuration(this.util.getConfiguration());
+ RecordWriter<ImmutableBytesWritable, Cell> writer = null;
+ TaskAttemptContext context = null;
+ Path dir = util.getDataTestDir("TestConfigureCompression");
+ String hfileoutputformatCompression = "gz";
+
+ try {
+ conf.set(HFileOutputFormat2.OUTPUT_TABLE_NAME_CONF_KEY, TABLE_NAMES[0].getNameAsString());
+ conf.setBoolean(HFileOutputFormat2.LOCALITY_SENSITIVE_CONF_KEY, false);
+
+ conf.set(HFileOutputFormat2.COMPRESSION_OVERRIDE_CONF_KEY, hfileoutputformatCompression);
+
+ Job job = Job.getInstance(conf);
+ FileOutputFormat.setOutputPath(job, dir);
+ context = createTestTaskAttemptContext(job);
+ HFileOutputFormat2 hof = new HFileOutputFormat2();
+ writer = hof.getRecordWriter(context);
+ final byte[] b = Bytes.toBytes("b");
+
+ KeyValue kv = new KeyValue(b, b, b, HConstants.LATEST_TIMESTAMP, b);
+ writer.write(new ImmutableBytesWritable(), kv);
+ writer.close(context);
+ writer = null;
+ FileSystem fs = dir.getFileSystem(conf);
+ RemoteIterator<LocatedFileStatus> iterator = fs.listFiles(dir, true);
+ while (iterator.hasNext()) {
+ LocatedFileStatus keyFileStatus = iterator.next();
+ HFile.Reader reader =
+ HFile.createReader(fs, keyFileStatus.getPath(), new CacheConfig(conf), true, conf);
+ assertEquals(reader.getCompressionAlgorithm().getName(), hfileoutputformatCompression);
+ }
+ } finally {
+ if (writer != null && context != null) {
+ writer.close(context);
+ }
+ dir.getFileSystem(conf).delete(dir, true);
+ }
+
+ }
+
}