From 432c24559bf9f99fe6a8adc619c75f72348a79f1 Mon Sep 17 00:00:00 2001 From: Mike Drob Date: Wed, 18 Jul 2018 09:24:59 -0500 Subject: [PATCH] HIVE-20201 Use Apache Commons Base64 --- .../apache/hadoop/hive/hbase/HiveHBaseTableSnapshotInputFormat.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableSnapshotInputFormat.java b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableSnapshotInputFormat.java index aedadc29b8..77dff5cf29 100644 --- a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableSnapshotInputFormat.java +++ b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableSnapshotInputFormat.java @@ -18,6 +18,7 @@ package org.apache.hadoop.hive.hbase; +import org.apache.commons.codec.binary.Base64; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Scan; @@ -26,7 +27,6 @@ import org.apache.hadoop.hbase.mapred.TableSnapshotInputFormat; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos; -import org.apache.hadoop.hbase.util.Base64; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.mapred.FileInputFormat; import org.apache.hadoop.mapred.InputFormat; @@ -54,7 +54,7 @@ private static void setColumns(JobConf job) throws IOException { // Copied from HBase's TableMapreduceUtil since it is not public API static String convertScanToString(Scan scan) throws IOException { ClientProtos.Scan proto = ProtobufUtil.toScan(scan); - return Base64.encodeBytes(proto.toByteArray()); + return Base64.encodeBase64String(proto.toByteArray()); } @Override -- 2.16.1