diff --git build-common.xml build-common.xml index dd30e79..16f65fc 100644 --- build-common.xml +++ build-common.xml @@ -36,8 +36,6 @@ diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseRevisionManagerUtil.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseRevisionManagerUtil.java index 2b62ea8..84513cf 100644 --- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseRevisionManagerUtil.java +++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseRevisionManagerUtil.java @@ -26,8 +26,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.hbase.HBaseSerDe; import org.apache.hcatalog.common.HCatConstants; @@ -42,6 +40,8 @@ import org.apache.hcatalog.mapreduce.HCatTableInfo; import org.apache.hcatalog.mapreduce.InputJobInfo; import org.apache.hcatalog.mapreduce.OutputJobInfo; import org.apache.hcatalog.mapreduce.StorerInfo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** @@ -50,7 +50,7 @@ import org.apache.hcatalog.mapreduce.StorerInfo; */ class HBaseRevisionManagerUtil { - private final static Log LOG = LogFactory.getLog(HBaseRevisionManagerUtil.class); + private final static Logger LOG = LoggerFactory.getLogger(HBaseRevisionManagerUtil.class); private HBaseRevisionManagerUtil() { } diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HbaseSnapshotRecordReader.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HbaseSnapshotRecordReader.java index 686c2b1..4264d0c 100644 --- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HbaseSnapshotRecordReader.java +++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HbaseSnapshotRecordReader.java @@ -26,8 +26,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.client.HTable; @@ -44,6 +42,8 @@ import org.apache.hcatalog.hbase.snapshot.FamilyRevision; import org.apache.hcatalog.hbase.snapshot.RevisionManager; import org.apache.hcatalog.hbase.snapshot.TableSnapshot; import org.apache.hcatalog.mapreduce.InputJobInfo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The Class HbaseSnapshotRecordReader implements logic for filtering records @@ -51,7 +51,7 @@ import org.apache.hcatalog.mapreduce.InputJobInfo; */ class HbaseSnapshotRecordReader implements RecordReader { - static final Log LOG = LogFactory.getLog(HbaseSnapshotRecordReader.class); + static final Logger LOG = LoggerFactory.getLogger(HbaseSnapshotRecordReader.class); private final InputJobInfo inpJobInfo; private final Configuration conf; private final int maxRevisions = 1; diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/ImportSequenceFile.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/ImportSequenceFile.java index 95e38e2..2f1b293 100644 --- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/ImportSequenceFile.java +++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/ImportSequenceFile.java @@ -19,15 +19,12 @@ */ package org.apache.hcatalog.hbase; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.filecache.DistributedCache; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.hbase.mapreduce.HFileOutputFormat; import org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles; import org.apache.hadoop.hbase.mapreduce.PutSortReducer; -import org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil; import org.apache.hadoop.hbase.mapreduce.hadoopbackport.TotalOrderPartitioner; import java.io.IOException; @@ -49,6 +46,8 @@ import org.apache.hadoop.mapreduce.TaskAttemptID; import org.apache.hadoop.mapreduce.lib.input.FileInputFormat; import org.apache.hadoop.mapreduce.lib.input.SequenceFileInputFormat; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.apache.hadoop.hbase.mapreduce.hadoopbackport.TotalOrderPartitioner.*; @@ -61,7 +60,7 @@ import static org.apache.hadoop.hbase.mapreduce.hadoopbackport.TotalOrderPartiti * and data needs to be bulk loaded onto HBase. */ class ImportSequenceFile { - private final static Log LOG = LogFactory.getLog(ImportSequenceFile.class); + private final static Logger LOG = LoggerFactory.getLogger(ImportSequenceFile.class); private final static String NAME = "HCatImportSequenceFile"; private final static String IMPORTER_WORK_DIR = "_IMPORTER_MR_WORK_DIR"; diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/IDGenerator.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/IDGenerator.java index 01873bc..2c545c7 100644 --- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/IDGenerator.java +++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/IDGenerator.java @@ -19,14 +19,14 @@ package org.apache.hcatalog.hbase.snapshot; import java.io.IOException; import java.nio.charset.Charset; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hcatalog.hbase.snapshot.lock.LockListener; import org.apache.hcatalog.hbase.snapshot.lock.WriteLock; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.ZooDefs.Ids; import org.apache.zookeeper.ZooKeeper; import org.apache.zookeeper.data.Stat; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** @@ -38,7 +38,7 @@ class IDGenerator implements LockListener{ private String zNodeDataLoc; private String zNodeLockBasePath; private long id; - private static final Log LOG = LogFactory.getLog(IDGenerator.class); + private static final Logger LOG = LoggerFactory.getLogger(IDGenerator.class); IDGenerator(ZooKeeper zookeeper, String tableName, String idGenNode) throws IOException { diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKBasedRevisionManager.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKBasedRevisionManager.java index dca828c..6a9891d 100644 --- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKBasedRevisionManager.java +++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKBasedRevisionManager.java @@ -21,10 +21,7 @@ import java.io.IOException; import java.util.Collections; import java.util.HashMap; import java.util.List; -import java.util.Properties; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HConstants; import org.apache.hcatalog.hbase.snapshot.lock.LockListener; @@ -32,13 +29,15 @@ import org.apache.hcatalog.hbase.snapshot.lock.WriteLock; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.ZooDefs.Ids; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The service for providing revision management to Hbase tables. */ public class ZKBasedRevisionManager implements RevisionManager{ - private static final Log LOG = LogFactory.getLog(ZKBasedRevisionManager.class); + private static final Logger LOG = LoggerFactory.getLogger(ZKBasedRevisionManager.class); private String zkHostList; private String baseDir; private ZKUtil zkUtil; diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKUtil.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKUtil.java index 016e4b2..0e4066f 100644 --- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKUtil.java +++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKUtil.java @@ -22,8 +22,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hcatalog.hbase.snapshot.transaction.thrift.*; import org.apache.thrift.TBase; @@ -39,6 +37,8 @@ import org.apache.zookeeper.ZooKeeper; import org.apache.zookeeper.ZooKeeper.States; import org.apache.zookeeper.data.ACL; import org.apache.zookeeper.data.Stat; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class ZKUtil { @@ -46,7 +46,7 @@ class ZKUtil { private ZooKeeper zkSession; private String baseDir; private String connectString; - private static final Log LOG = LogFactory.getLog(ZKUtil.class); + private static final Logger LOG = LoggerFactory.getLogger(ZKUtil.class); static enum UpdateMode { APPEND, REMOVE, KEEP_ALIVE diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ProtocolSupport.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ProtocolSupport.java index 3043d3a..a08d3cf 100644 --- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ProtocolSupport.java +++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ProtocolSupport.java @@ -17,15 +17,14 @@ */ package org.apache.hcatalog.hbase.snapshot.lock; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.hcatalog.hbase.snapshot.lock.ZooKeeperOperation; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.ZooDefs; import org.apache.zookeeper.ZooKeeper; import org.apache.zookeeper.data.ACL; import org.apache.zookeeper.data.Stat; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; @@ -39,7 +38,7 @@ import java.util.concurrent.atomic.AtomicBoolean; * changes in the retry delay, retry count values and package name. */ class ProtocolSupport { - private static final Log LOG = LogFactory.getLog(ProtocolSupport.class); + private static final Logger LOG = LoggerFactory.getLogger(ProtocolSupport.class); protected final ZooKeeper zookeeper; private AtomicBoolean closed = new AtomicBoolean(false); diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/WriteLock.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/WriteLock.java index cc2cf2a..80d83e1 100644 --- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/WriteLock.java +++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/WriteLock.java @@ -17,8 +17,6 @@ */ package org.apache.hcatalog.hbase.snapshot.lock; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.Watcher; @@ -26,6 +24,8 @@ import static org.apache.zookeeper.CreateMode.EPHEMERAL_SEQUENTIAL; import org.apache.zookeeper.ZooKeeper; import org.apache.zookeeper.data.ACL; import org.apache.zookeeper.data.Stat; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.List; import java.util.SortedSet; @@ -42,7 +42,7 @@ import java.util.TreeSet; * made is a TODO for sorting using suffixes and the package name. */ public class WriteLock extends ProtocolSupport { - private static final Log LOG = LogFactory.getLog(WriteLock.class); + private static final Logger LOG = LoggerFactory.getLogger(WriteLock.class); private final String dir; private String id; diff --git storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ZNodeName.java storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ZNodeName.java index ec7e831..eaa6f8a 100644 --- storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ZNodeName.java +++ storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ZNodeName.java @@ -17,9 +17,8 @@ */ package org.apache.hcatalog.hbase.snapshot.lock; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Represents an ephemeral znode name which has an ordered sequence number @@ -31,7 +30,7 @@ public class ZNodeName implements Comparable { private final String name; private String prefix; private int sequence = -1; - private static final Log LOG = LogFactory.getLog(ZNodeName.class); + private static final Logger LOG = LoggerFactory.getLogger(ZNodeName.class); public ZNodeName(String name) { if (name == null) { diff --git storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseBulkOutputFormat.java storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseBulkOutputFormat.java index 8c0a979..6e28892 100644 --- storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseBulkOutputFormat.java +++ storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseBulkOutputFormat.java @@ -18,8 +18,6 @@ package org.apache.hcatalog.hbase; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.FileSystem; @@ -69,6 +67,8 @@ import org.apache.hcatalog.mapreduce.InputJobInfo; import org.apache.hcatalog.mapreduce.OutputJobInfo; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.Arrays; @@ -84,7 +84,7 @@ import static org.junit.Assert.assertTrue; * Including ImprtSequenceFile and HBaseBulkOutputFormat */ public class TestHBaseBulkOutputFormat extends SkeletonHBaseTest { - private final static Log LOG = LogFactory.getLog(TestHBaseBulkOutputFormat.class); + private final static Logger LOG = LoggerFactory.getLogger(TestHBaseBulkOutputFormat.class); private final HiveConf allConf; private final HCatDriver hcatDriver;