incubator-hcatalog-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From khorg...@apache.org
Subject svn commit: r1354351 - in /incubator/hcatalog/trunk: ./ ivy/ src/java/org/apache/hcatalog/data/ src/java/org/apache/hcatalog/har/ src/java/org/apache/hcatalog/listener/ src/java/org/apache/hcatalog/mapreduce/ src/java/org/apache/hcatalog/rcfile/ src/te...
Date Wed, 27 Jun 2012 07:40:21 GMT
Author: khorgath
Date: Wed Jun 27 07:40:18 2012
New Revision: 1354351

URL: http://svn.apache.org/viewvc?rev=1354351&view=rev
Log:
HCATALOG-426 HCatalog should log with slf4j everywhere (traviscrawford via khorgath)

Modified:
    incubator/hcatalog/trunk/CHANGES.txt
    incubator/hcatalog/trunk/build-common.xml
    incubator/hcatalog/trunk/ivy.xml
    incubator/hcatalog/trunk/ivy/libraries.properties
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/LazyHCatRecord.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/har/HarOutputCommitterPostProcessor.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/listener/NotificationListener.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/FileRecordWriterContainer.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/Security.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/rcfile/RCFileMapReduceOutputFormat.java
    incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/generate_data.pl
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/HcatTestUtils.java
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/mapreduce/HCatBaseTest.java
    incubator/hcatalog/trunk/storage-handlers/hbase/ivy.xml
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseRevisionManagerUtil.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HbaseSnapshotRecordReader.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/ImportSequenceFile.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/IDGenerator.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKBasedRevisionManager.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKUtil.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ProtocolSupport.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/WriteLock.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ZNodeName.java
    incubator/hcatalog/trunk/storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseBulkOutputFormat.java

Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1354351&r1=1354350&r2=1354351&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Wed Jun 27 07:40:18 2012
@@ -26,6 +26,8 @@ Trunk (unreleased changes)
   HCAT-328 HCatLoader should report its input size so pig can estimate the number of reducers
(traviscrawford via gates)
 
   IMPROVEMENTS
+  HCAT-426 HCatalog should log with slf4j everywhere (traviscrawford via khorgath)
+
   HCAT-389 hcat_ping (script to check if HCatalog server is running/reachable) (mithun via
khorgath)
 
   HCAT-432 Add findbugs to build (rohini via avandana)

Modified: incubator/hcatalog/trunk/build-common.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/build-common.xml?rev=1354351&r1=1354350&r2=1354351&view=diff
==============================================================================
--- incubator/hcatalog/trunk/build-common.xml (original)
+++ incubator/hcatalog/trunk/build-common.xml Wed Jun 27 07:40:18 2012
@@ -36,8 +36,6 @@
         <!--
         <fileset dir="${hive.root}/build/ivy/lib/default" includes="antlr-3.0.1.jar"/>
         <fileset dir="${hive.root}/build/ivy/lib/default" includes="commons-lang-*.jar"/>
-        <fileset dir="${hive.root}/build/ivy/lib/default" includes="commons-logging-*.jar"/>
-        <fileset dir="${hive.root}/build/ivy/lib/default" includes="commons-logging-api-*.jar"/>
         <fileset dir="${hive.root}/build/ivy/lib/default" includes="datanucleus-enhancer-*.jar"/>
         <fileset dir="${hive.root}/build/ivy/lib/default" includes="datanucleus-core-*.jar"/>
         <fileset dir="${hive.root}/build/ivy/lib/default" includes="jdo2-api-*.jar"/>

Modified: incubator/hcatalog/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/ivy.xml?rev=1354351&r1=1354350&r2=1354351&view=diff
==============================================================================
--- incubator/hcatalog/trunk/ivy.xml (original)
+++ incubator/hcatalog/trunk/ivy.xml Wed Jun 27 07:40:18 2012
@@ -48,10 +48,6 @@
           conf="common->master"/>
         <dependency org="commons-lang" name="commons-lang" rev="${commons-lang.version}"
           conf="common->master"/>
-        <dependency org="commons-logging" name="commons-logging"
-          rev="${commons-logging.version}" conf="common->master"/>
-        <dependency org="commons-logging" name="commons-logging-api"
-          rev="${commons-logging.version}" conf="common->master"/>
         <dependency org="org.apache.hadoop" name="hadoop-tools"
           rev="${hadoop-tools.version}" conf="common->master" />
         <dependency org="org.apache.hadoop" name="hadoop-core"

Modified: incubator/hcatalog/trunk/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/ivy/libraries.properties?rev=1354351&r1=1354350&r2=1354351&view=diff
==============================================================================
--- incubator/hcatalog/trunk/ivy/libraries.properties (original)
+++ incubator/hcatalog/trunk/ivy/libraries.properties Wed Jun 27 07:40:18 2012
@@ -20,7 +20,6 @@ commons-configuration.version=1.6
 commons-dbcp.version=1.4
 commons-httpclient.version=3.0.1
 commons-lang.version=2.4
-commons-logging.version=1.0.4
 commons-pool.version=1.5.4
 datanucleus-connectionpool.version=2.0.3
 datanucleus-core.version=2.0.3

Modified: incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/LazyHCatRecord.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/LazyHCatRecord.java?rev=1354351&r1=1354350&r2=1354351&view=diff
==============================================================================
--- incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/LazyHCatRecord.java (original)
+++ incubator/hcatalog/trunk/src/java/org/apache/hcatalog/data/LazyHCatRecord.java Wed Jun
27 07:40:18 2012
@@ -23,18 +23,16 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hive.serde2.SerDeException;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 import org.apache.hadoop.hive.serde2.objectinspector.StructField;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category;
 import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector;
 import org.apache.hcatalog.common.HCatException;
-import org.apache.hcatalog.common.HCatUtil;
 import org.apache.hcatalog.data.schema.HCatSchema;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An implementation of HCatRecord that wraps an Object returned by a SerDe
@@ -42,8 +40,7 @@ import org.apache.hcatalog.data.schema.H
  */
 public class LazyHCatRecord extends HCatRecord {
 
-  public static final Log LOG = LogFactory
-      .getLog(LazyHCatRecord.class.getName());
+  public static final Logger LOG = LoggerFactory.getLogger(LazyHCatRecord.class.getName());
 
   private Object o;
   private StructObjectInspector soi;

Modified: incubator/hcatalog/trunk/src/java/org/apache/hcatalog/har/HarOutputCommitterPostProcessor.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/java/org/apache/hcatalog/har/HarOutputCommitterPostProcessor.java?rev=1354351&r1=1354350&r2=1354351&view=diff
==============================================================================
--- incubator/hcatalog/trunk/src/java/org/apache/hcatalog/har/HarOutputCommitterPostProcessor.java
(original)
+++ incubator/hcatalog/trunk/src/java/org/apache/hcatalog/har/HarOutputCommitterPostProcessor.java
Wed Jun 27 07:40:18 2012
@@ -20,10 +20,7 @@ package org.apache.hcatalog.har;
 
 import java.io.IOException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hive.metastore.api.Constants;
@@ -33,12 +30,9 @@ import org.apache.hadoop.tools.HadoopArc
 import org.apache.hadoop.util.ToolRunner;
 import org.apache.hcatalog.common.HCatConstants;
 import org.apache.hcatalog.common.HCatException;
-import org.apache.hcatalog.common.HCatUtil;
 
 public class HarOutputCommitterPostProcessor {
   
-//  static final private Log LOG = LogFactory.getLog(HarOutputCommitterPostProcessor.class);
-
   boolean isEnabled = false;
   
   public boolean isEnabled() {

Modified: incubator/hcatalog/trunk/src/java/org/apache/hcatalog/listener/NotificationListener.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/java/org/apache/hcatalog/listener/NotificationListener.java?rev=1354351&r1=1354350&r2=1354351&view=diff
==============================================================================
--- incubator/hcatalog/trunk/src/java/org/apache/hcatalog/listener/NotificationListener.java
(original)
+++ incubator/hcatalog/trunk/src/java/org/apache/hcatalog/listener/NotificationListener.java
Wed Jun 27 07:40:18 2012
@@ -38,8 +38,6 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.metastore.HiveMetaStore.HMSHandler;
@@ -62,6 +60,8 @@ import org.apache.hadoop.hive.metastore.
 import org.apache.hadoop.hive.metastore.events.ListenerEvent;
 import org.apache.hadoop.hive.metastore.events.LoadPartitionDoneEvent;
 import org.apache.hcatalog.common.HCatConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Implementation of
@@ -75,7 +75,7 @@ import org.apache.hcatalog.common.HCatCo
  */
 public class NotificationListener extends MetaStoreEventListener {
 
-  private static final Log LOG = LogFactory.getLog(NotificationListener.class);
+  private static final Logger LOG = LoggerFactory.getLogger(NotificationListener.class);
   protected Session session;
   protected Connection conn;
 
@@ -318,7 +318,7 @@ public class NotificationListener extend
       conn.setExceptionListener(new ExceptionListener() {
         @Override
         public void onException(JMSException jmse) {
-          LOG.error(jmse);
+          LOG.error(jmse.toString());
         }
       });
       // We want message to be sent when session commits, thus we run in
@@ -370,4 +370,4 @@ public class NotificationListener extend
   public void onAlterTable(AlterTableEvent ate) throws MetaException {
     // no-op
   }
-}
+}
\ No newline at end of file

Modified: incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/FileRecordWriterContainer.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/FileRecordWriterContainer.java?rev=1354351&r1=1354350&r2=1354351&view=diff
==============================================================================
--- incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/FileRecordWriterContainer.java
(original)
+++ incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/FileRecordWriterContainer.java
Wed Jun 27 07:40:18 2012
@@ -57,8 +57,6 @@ class FileRecordWriterContainer extends 
 
     private boolean dynamicPartitioningUsed = false;
 
-//    static final private Log LOG = LogFactory.getLog(FileRecordWriterContainer.class);
-
     private final Map<String, org.apache.hadoop.mapred.RecordWriter<? super WritableComparable<?>,
? super Writable>> baseDynamicWriters;
     private final Map<String, SerDe> baseDynamicSerDe;
     private final Map<String, org.apache.hadoop.mapred.OutputCommitter> baseDynamicCommitters;

Modified: incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java?rev=1354351&r1=1354350&r2=1354351&view=diff
==============================================================================
--- incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java
(original)
+++ incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java
Wed Jun 27 07:40:18 2012
@@ -23,19 +23,14 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-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.fs.Path;
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
 import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
 import org.apache.hadoop.hive.metastore.api.FieldSchema;
 import org.apache.hadoop.hive.metastore.api.Index;
-import org.apache.hadoop.hive.metastore.api.MetaException;
 import org.apache.hadoop.hive.metastore.api.StorageDescriptor;
 import org.apache.hadoop.hive.metastore.api.Table;
 import org.apache.hadoop.io.WritableComparable;
@@ -43,19 +38,20 @@ import org.apache.hadoop.mapreduce.Job;
 import org.apache.hadoop.mapreduce.OutputCommitter;
 import org.apache.hadoop.mapreduce.RecordWriter;
 import org.apache.hadoop.mapreduce.TaskAttemptContext;
-import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hcatalog.common.ErrorType;
 import org.apache.hcatalog.common.HCatConstants;
 import org.apache.hcatalog.common.HCatException;
 import org.apache.hcatalog.common.HCatUtil;
 import org.apache.hcatalog.data.HCatRecord;
 import org.apache.hcatalog.data.schema.HCatSchema;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** The OutputFormat to use to write data to HCatalog. The key value is ignored and
  *  should be given as null. The value is the HCatRecord to write.*/
 public class HCatOutputFormat extends HCatBaseOutputFormat {
 
-    static final private Log LOG = LogFactory.getLog(HCatOutputFormat.class);
+    static final private Logger LOG = LoggerFactory.getLogger(HCatOutputFormat.class);
 
     private static int maxDynamicPartitions;
     private static boolean harRequested;

Modified: incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/Security.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/Security.java?rev=1354351&r1=1354350&r2=1354351&view=diff
==============================================================================
--- incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/Security.java (original)
+++ incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/Security.java Wed Jun
27 07:40:18 2012
@@ -21,12 +21,9 @@ package org.apache.hcatalog.mapreduce;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
 import org.apache.hadoop.hive.metastore.api.MetaException;
@@ -39,14 +36,15 @@ import org.apache.hadoop.security.UserGr
 import org.apache.hadoop.security.token.Token;
 import org.apache.hadoop.security.token.TokenIdentifier;
 import org.apache.hadoop.security.token.TokenSelector;
-import org.apache.hadoop.security.token.delegation.AbstractDelegationTokenIdentifier;
 import org.apache.hcatalog.common.HCatConstants;
 import org.apache.hcatalog.common.HCatUtil;
 import org.apache.thrift.TException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 final class Security {
 
-  private static final Log LOG = LogFactory.getLog(HCatOutputFormat.class);
+  private static final Logger LOG = LoggerFactory.getLogger(HCatOutputFormat.class);
   
   // making sure this is not initialized unless needed
   private static final class LazyHolder {

Modified: incubator/hcatalog/trunk/src/java/org/apache/hcatalog/rcfile/RCFileMapReduceOutputFormat.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/java/org/apache/hcatalog/rcfile/RCFileMapReduceOutputFormat.java?rev=1354351&r1=1354350&r2=1354351&view=diff
==============================================================================
--- incubator/hcatalog/trunk/src/java/org/apache/hcatalog/rcfile/RCFileMapReduceOutputFormat.java
(original)
+++ incubator/hcatalog/trunk/src/java/org/apache/hcatalog/rcfile/RCFileMapReduceOutputFormat.java
Wed Jun 27 07:40:18 2012
@@ -19,8 +19,6 @@ package org.apache.hcatalog.rcfile;
 
 import java.io.IOException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;

Modified: incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/generate_data.pl
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/generate_data.pl?rev=1354351&r1=1354350&r2=1354351&view=diff
==============================================================================
--- incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/generate_data.pl (original)
+++ incubator/hcatalog/trunk/src/test/e2e/hcatalog/tools/generate/generate_data.pl Wed Jun
27 07:40:18 2012
@@ -338,7 +338,6 @@ sub findHadoopJars()
       $coreJar = `ls $hadoopClassRoot/hadoop-core-*.jar`;
     }
 
-    my $loggingJar = `ls $hadoopClassRoot/lib/commons-logging-*.jar | grep -v api`;
     my $cfgJar = `ls $hadoopClassRoot/lib/commons-configuration-*.jar`;
     my $langJar = `ls $hadoopClassRoot/lib/commons-lang-*.jar`;
     my $cliJar = `ls $hadoopClassRoot/lib/commons-cli-*.jar`;
@@ -348,11 +347,10 @@ sub findHadoopJars()
     }
 
     chomp $coreJar;
-    chomp $loggingJar;
     chomp $cfgJar;
     chomp $langJar;
     chomp $cliJar;
-    return ($coreJar, $loggingJar, $cfgJar, $langJar, $cliJar);
+    return ($coreJar, $cfgJar, $langJar, $cliJar);
 }
 
 sub findHiveJars()
@@ -430,12 +428,12 @@ sub getJavaCmd() 
             }
         } elsif ($format eq "rc") {
             print MYSQL &getBulkCopyCmd($tableName, "\t", "$tableName.plain");
-            my ($hadoopCoreJar, $commonsLoggingJar, $commonsConfigJar,
+            my ($hadoopCoreJar, $commonsConfigJar,
                 $commonsLangJar, $commonsCliJar) = findHadoopJars();
             my ($hiveExecJar, $hiveCliJar) = findHiveJars();
             my @cmd = (getJavaCmd(), '-cp',
                 "../tools/generate/java/hive-gen.jar:$hadoopCoreJar:" .
-                "$commonsLoggingJar:$commonsConfigJar:$commonsLangJar:" .
+                "$commonsConfigJar:$commonsLangJar:" .
                 "$hiveExecJar",
                 'org.apache.hadoop.hive.tools.generate.RCFileGenerator',
                 'student', $numRows, "$tableName", "$tableName.plain");
@@ -443,7 +441,7 @@ sub getJavaCmd() 
                 . "]\n";
             #@cmd = ('java', '-cp',
             #    "$hiveCliJar:$hiveExecJar:$hadoopCoreJar:" .
-            #    "$commonsLoggingJar:$commonsCliJar:$commonsConfigJar",
+            #    "$commonsCliJar:$commonsConfigJar",
             #    "org.apache.hadoop.hive.cli.RCFileCat", "$tableName");
             #run(\@cmd, '>', $tableName) or
             #    die "Unable to run command [" . join(" ", @cmd) . "]\n";

Modified: incubator/hcatalog/trunk/src/test/org/apache/hcatalog/HcatTestUtils.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/test/org/apache/hcatalog/HcatTestUtils.java?rev=1354351&r1=1354350&r2=1354351&view=diff
==============================================================================
--- incubator/hcatalog/trunk/src/test/org/apache/hcatalog/HcatTestUtils.java (original)
+++ incubator/hcatalog/trunk/src/test/org/apache/hcatalog/HcatTestUtils.java Wed Jun 27 07:40:18
2012
@@ -22,8 +22,6 @@ import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.permission.FsPermission;
@@ -32,14 +30,14 @@ import org.apache.hadoop.hive.metastore.
 import org.apache.hadoop.hive.metastore.api.NoSuchObjectException;
 import org.apache.hadoop.hive.ql.metadata.Hive;
 import org.apache.hadoop.hive.ql.metadata.HiveException;
-import org.apache.hcatalog.data.Pair;
-import org.apache.pig.PigServer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** 
  * Utility methods for tests
  */
 public class HcatTestUtils {
-  private static final Log LOG = LogFactory.getLog(HcatTestUtils.class);
+  private static final Logger LOG = LoggerFactory.getLogger(HcatTestUtils.class);
 
   public static FsPermission perm007 = FsPermission.createImmutable((short) 0007); // -------rwx
   public static FsPermission perm070 = FsPermission.createImmutable((short) 0070); // ----rwx---

Modified: incubator/hcatalog/trunk/src/test/org/apache/hcatalog/mapreduce/HCatBaseTest.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/test/org/apache/hcatalog/mapreduce/HCatBaseTest.java?rev=1354351&r1=1354350&r2=1354351&view=diff
==============================================================================
--- incubator/hcatalog/trunk/src/test/org/apache/hcatalog/mapreduce/HCatBaseTest.java (original)
+++ incubator/hcatalog/trunk/src/test/org/apache/hcatalog/mapreduce/HCatBaseTest.java Wed
Jun 27 07:40:18 2012
@@ -1,7 +1,5 @@
 package org.apache.hcatalog.mapreduce;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.hive.cli.CliSessionState;
 import org.apache.hadoop.hive.conf.HiveConf;
@@ -12,6 +10,8 @@ import org.apache.pig.PigServer;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -20,7 +20,7 @@ import java.io.IOException;
  * Simplify writing HCatalog tests that require a HiveMetaStore.
  */
 public class HCatBaseTest {
-  protected static final Log LOG = LogFactory.getLog(HCatBaseTest.class);
+  protected static final Logger LOG = LoggerFactory.getLogger(HCatBaseTest.class);
   protected static final String TEST_DATA_DIR = System.getProperty("user.dir") +
       "/build/test/data/" + HCatBaseTest.class.getCanonicalName();
   protected static final String TEST_WAREHOUSE_DIR = TEST_DATA_DIR + "/warehouse";

Modified: incubator/hcatalog/trunk/storage-handlers/hbase/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-handlers/hbase/ivy.xml?rev=1354351&r1=1354350&r2=1354351&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-handlers/hbase/ivy.xml (original)
+++ incubator/hcatalog/trunk/storage-handlers/hbase/ivy.xml Wed Jun 27 07:40:18 2012
@@ -63,10 +63,6 @@
           conf="common->master"/>
         <dependency org="commons-lang" name="commons-lang" rev="${commons-lang.version}"
           conf="common->master"/>
-        <dependency org="commons-logging" name="commons-logging"
-          rev="${commons-logging.version}" conf="common->master"/>
-        <dependency org="commons-logging" name="commons-logging-api"
-          rev="${commons-logging.version}" conf="common->master"/>
 
         <!-- hbase test dependencies -->
         <dependency org="com.github.stephenc.high-scale-lib" name="high-scale-lib" rev="${high-scale-lib.version}"
conf="common->master" />

Modified: incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseRevisionManagerUtil.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseRevisionManagerUtil.java?rev=1354351&r1=1354350&r2=1354351&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseRevisionManagerUtil.java
(original)
+++ incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HBaseRevisionManagerUtil.java
Wed Jun 27 07:40:18 2012
@@ -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.HCa
 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.Sto
  */
 class HBaseRevisionManagerUtil {
 
-    private final static Log LOG = LogFactory.getLog(HBaseRevisionManagerUtil.class);
+    private final static Logger LOG = LoggerFactory.getLogger(HBaseRevisionManagerUtil.class);
 
     private HBaseRevisionManagerUtil() {
     }

Modified: incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HbaseSnapshotRecordReader.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HbaseSnapshotRecordReader.java?rev=1354351&r1=1354350&r2=1354351&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HbaseSnapshotRecordReader.java
(original)
+++ incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/HbaseSnapshotRecordReader.java
Wed Jun 27 07:40:18 2012
@@ -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.snapsho
 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.Inp
  */
 class HbaseSnapshotRecordReader implements RecordReader<ImmutableBytesWritable, Result>
{
 
-    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;

Modified: incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/ImportSequenceFile.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/ImportSequenceFile.java?rev=1354351&r1=1354350&r2=1354351&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/ImportSequenceFile.java
(original)
+++ incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/ImportSequenceFile.java
Wed Jun 27 07:40:18 2012
@@ -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.TaskA
 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.ma
  * 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";
 

Modified: incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/IDGenerator.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/IDGenerator.java?rev=1354351&r1=1354350&r2=1354351&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/IDGenerator.java
(original)
+++ incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/IDGenerator.java
Wed Jun 27 07:40:18 2012
@@ -19,14 +19,14 @@ package org.apache.hcatalog.hbase.snapsh
 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 LockListene
     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 {

Modified: incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKBasedRevisionManager.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKBasedRevisionManager.java?rev=1354351&r1=1354350&r2=1354351&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKBasedRevisionManager.java
(original)
+++ incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKBasedRevisionManager.java
Wed Jun 27 07:40:18 2012
@@ -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.snapsho
 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;

Modified: incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKUtil.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKUtil.java?rev=1354351&r1=1354350&r2=1354351&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKUtil.java
(original)
+++ incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKUtil.java
Wed Jun 27 07:40:18 2012
@@ -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

Modified: incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ProtocolSupport.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ProtocolSupport.java?rev=1354351&r1=1354350&r2=1354351&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ProtocolSupport.java
(original)
+++ incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ProtocolSupport.java
Wed Jun 27 07:40:18 2012
@@ -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.Atomi
  *  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);

Modified: incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/WriteLock.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/WriteLock.java?rev=1354351&r1=1354350&r2=1354351&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/WriteLock.java
(original)
+++ incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/WriteLock.java
Wed Jun 27 07:40:18 2012
@@ -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.Creat
 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;

Modified: incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ZNodeName.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ZNodeName.java?rev=1354351&r1=1354350&r2=1354351&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ZNodeName.java
(original)
+++ incubator/hcatalog/trunk/storage-handlers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/ZNodeName.java
Wed Jun 27 07:40:18 2012
@@ -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 Compar
     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) {

Modified: incubator/hcatalog/trunk/storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseBulkOutputFormat.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseBulkOutputFormat.java?rev=1354351&r1=1354350&r2=1354351&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseBulkOutputFormat.java
(original)
+++ incubator/hcatalog/trunk/storage-handlers/hbase/src/test/org/apache/hcatalog/hbase/TestHBaseBulkOutputFormat.java
Wed Jun 27 07:40:18 2012
@@ -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.Inp
 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.assertTru
  * 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;



Mime
View raw message