This is an automated email from the ASF dual-hosted git repository. nic pushed a commit to branch 3.0.x in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 46001fc2deffc16248da40944ce90bcbd912525a Author: shaofengshi <[email protected]> AuthorDate: Tue Dec 10 22:27:05 2019 +0800 KYLIN-4292 Use HFileOutputFormat3 in all places to replace HFileOutputFormat2 --- .../org/apache/kylin/storage/hbase/lookup/LookupTableToHFileJob.java | 4 ++-- .../java/org/apache/kylin/storage/hbase/steps/CreateHTableJob.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/lookup/LookupTableToHFileJob.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/lookup/LookupTableToHFileJob.java index 2a12575..4f6dcb8 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/lookup/LookupTableToHFileJob.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/lookup/LookupTableToHFileJob.java @@ -33,7 +33,6 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.HTable; -import org.apache.hadoop.hbase.mapreduce.HFileOutputFormat2; import org.apache.hadoop.hbase.regionserver.DisabledRegionSplitPolicy; import org.apache.hadoop.hdfs.DFSConfigKeys; import org.apache.hadoop.mapreduce.Job; @@ -65,6 +64,7 @@ import org.apache.kylin.source.IReadableTable.TableSignature; import org.apache.kylin.source.SourceManager; import org.apache.kylin.storage.hbase.HBaseConnection; import org.apache.kylin.storage.hbase.steps.CubeHTableUtil; +import org.apache.kylin.storage.hbase.steps.HFileOutputFormat3; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -137,7 +137,7 @@ public class LookupTableToHFileJob extends AbstractHadoopJob { HTable htable = (HTable) conn.getTable(TableName.valueOf(hTableNameAndShard.getFirst())); // Automatic config ! - HFileOutputFormat2.configureIncrementalLoad(job, htable, htable.getRegionLocator()); + HFileOutputFormat3.configureIncrementalLoad(job, htable, htable.getRegionLocator()); job.setReducerClass(KVSortReducerWithDupKeyCheck.class); diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CreateHTableJob.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CreateHTableJob.java index 23a865d..4b2218b 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CreateHTableJob.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CreateHTableJob.java @@ -34,7 +34,6 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.KeyValueUtil; import org.apache.hadoop.hbase.client.HTable; -import org.apache.hadoop.hbase.mapreduce.HFileOutputFormat2; import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.mapreduce.Job; @@ -133,7 +132,7 @@ public class CreateHTableJob extends AbstractHadoopJob { HadoopUtil.healSickConfig(hbaseConf); Job job = Job.getInstance(hbaseConf, hbaseTableName); HTable table = new HTable(hbaseConf, hbaseTableName); - HFileOutputFormat2.configureIncrementalLoadMap(job, table); + HFileOutputFormat3.configureIncrementalLoadMap(job, table); logger.info("Saving HBase configuration to {}", hbaseConfPath); FileSystem fs = HadoopUtil.getWorkingFileSystem();
