http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/CompactorTest.java ---------------------------------------------------------------------- diff --git a/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/CompactorTest.java b/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/CompactorTest.java index 39c0571..2ba0b29 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/CompactorTest.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/CompactorTest.java @@ -17,8 +17,8 @@ */ package org.apache.hadoop.hive.ql.txn.compactor; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.*; import org.apache.hadoop.hive.common.ValidTxnList; @@ -60,7 +60,7 @@ import java.util.concurrent.atomic.AtomicBoolean; */ public abstract class CompactorTest { static final private String CLASS_NAME = CompactorTest.class.getName(); - static final private Log LOG = LogFactory.getLog(CLASS_NAME); + static final private Logger LOG = LoggerFactory.getLogger(CLASS_NAME); protected CompactionTxnHandler txnHandler; protected IMetaStoreClient ms;
http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestCleaner.java ---------------------------------------------------------------------- diff --git a/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestCleaner.java b/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestCleaner.java index 0db732c..bca5002 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestCleaner.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestCleaner.java @@ -18,8 +18,8 @@ package org.apache.hadoop.hive.ql.txn.compactor; import org.junit.Assert; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.api.*; @@ -37,7 +37,7 @@ import java.util.concurrent.atomic.AtomicBoolean; */ public class TestCleaner extends CompactorTest { - static final private Log LOG = LogFactory.getLog(TestCleaner.class.getName()); + static final private Logger LOG = LoggerFactory.getLogger(TestCleaner.class.getName()); public TestCleaner() throws Exception { super(); http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestInitiator.java ---------------------------------------------------------------------- diff --git a/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestInitiator.java b/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestInitiator.java index 0b0b1da..e9b4154 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestInitiator.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestInitiator.java @@ -18,8 +18,8 @@ package org.apache.hadoop.hive.ql.txn.compactor; import org.junit.Assert; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.api.*; import org.apache.hadoop.hive.metastore.txn.TxnDbUtil; @@ -38,7 +38,7 @@ import java.util.concurrent.TimeUnit; */ public class TestInitiator extends CompactorTest { static final private String CLASS_NAME = TestInitiator.class.getName(); - static final private Log LOG = LogFactory.getLog(CLASS_NAME); + static final private Logger LOG = LoggerFactory.getLogger(CLASS_NAME); public TestInitiator() throws Exception { super(); http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestWorker.java ---------------------------------------------------------------------- diff --git a/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestWorker.java b/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestWorker.java index 245e839..fe1d0d3 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestWorker.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestWorker.java @@ -17,8 +17,8 @@ */ package org.apache.hadoop.hive.ql.txn.compactor; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.fs.*; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.api.*; @@ -46,7 +46,7 @@ import java.util.Map; */ public class TestWorker extends CompactorTest { static final private String CLASS_NAME = TestWorker.class.getName(); - static final private Log LOG = LogFactory.getLog(CLASS_NAME); + static final private Logger LOG = LoggerFactory.getLogger(CLASS_NAME); public TestWorker() throws Exception { super(); http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/pom.xml ---------------------------------------------------------------------- diff --git a/serde/pom.xml b/serde/pom.xml index 99c89ed..772ce71 100644 --- a/serde/pom.xml +++ b/serde/pom.xml @@ -61,11 +61,6 @@ <version>${commons-lang.version}</version> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>${commons-logging.version}</version> - </dependency> - <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro</artifactId> <version>${avro.version}</version> http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/AbstractEncodingAwareSerDe.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/AbstractEncodingAwareSerDe.java b/serde/src/java/org/apache/hadoop/hive/serde2/AbstractEncodingAwareSerDe.java index efc4c7e..aa877d8 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/AbstractEncodingAwareSerDe.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/AbstractEncodingAwareSerDe.java @@ -21,12 +21,12 @@ package org.apache.hadoop.hive.serde2; import java.nio.charset.Charset; 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.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.io.Writable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Charsets; @@ -36,7 +36,7 @@ import com.google.common.base.Charsets; * transform data from UTF-8 to specified charset during deserialize. */ public abstract class AbstractEncodingAwareSerDe extends AbstractSerDe { - private static final Log LOG = LogFactory.getLog(AbstractEncodingAwareSerDe.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractEncodingAwareSerDe.class); protected Charset charset; @Override http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/ColumnProjectionUtils.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/ColumnProjectionUtils.java b/serde/src/java/org/apache/hadoop/hive/serde2/ColumnProjectionUtils.java index 570a31c..fc0a4b7 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/ColumnProjectionUtils.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/ColumnProjectionUtils.java @@ -21,21 +21,20 @@ package org.apache.hadoop.hive.serde2; import java.util.ArrayList; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.util.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; -import com.google.common.collect.Lists; /** * ColumnProjectionUtils. * */ public final class ColumnProjectionUtils { - public static final Log LOG = LogFactory.getLog(ColumnProjectionUtils.class); + public static final Logger LOG = LoggerFactory.getLogger(ColumnProjectionUtils.class); public static final String READ_COLUMN_IDS_CONF_STR = "hive.io.file.readcolumn.ids"; public static final String READ_ALL_COLUMNS = "hive.io.file.read.all.columns"; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/DelimitedJSONSerDe.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/DelimitedJSONSerDe.java b/serde/src/java/org/apache/hadoop/hive/serde2/DelimitedJSONSerDe.java index 81ff0dd..a36ffe6 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/DelimitedJSONSerDe.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/DelimitedJSONSerDe.java @@ -20,8 +20,8 @@ package org.apache.hadoop.hive.serde2; import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe; import org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters; @@ -38,7 +38,7 @@ import org.apache.hadoop.io.Writable; */ public class DelimitedJSONSerDe extends LazySimpleSerDe { - public static final Log LOG = LogFactory.getLog(DelimitedJSONSerDe.class.getName()); + public static final Logger LOG = LoggerFactory.getLogger(DelimitedJSONSerDe.class.getName()); public DelimitedJSONSerDe() throws SerDeException { } http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/MetadataTypedColumnsetSerDe.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/MetadataTypedColumnsetSerDe.java b/serde/src/java/org/apache/hadoop/hive/serde2/MetadataTypedColumnsetSerDe.java index 262c57f..a0a790c 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/MetadataTypedColumnsetSerDe.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/MetadataTypedColumnsetSerDe.java @@ -24,8 +24,8 @@ import java.util.Arrays; import java.util.List; import java.util.Properties; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.objectinspector.MetadataListStructObjectInspector; @@ -49,8 +49,8 @@ import org.apache.hadoop.io.Writable; serdeConstants.SERIALIZATION_LAST_COLUMN_TAKES_REST }) public class MetadataTypedColumnsetSerDe extends AbstractSerDe { - public static final Log LOG = LogFactory - .getLog(MetadataTypedColumnsetSerDe.class.getName()); + public static final Logger LOG = LoggerFactory + .getLogger(MetadataTypedColumnsetSerDe.class.getName()); public static final String DefaultSeparator = "\001"; private String separator; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/OpenCSVSerde.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/OpenCSVSerde.java b/serde/src/java/org/apache/hadoop/hive/serde2/OpenCSVSerde.java index 44b5ae7..a7059c0 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/OpenCSVSerde.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/OpenCSVSerde.java @@ -17,8 +17,6 @@ */ package org.apache.hadoop.hive.serde2; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; @@ -29,6 +27,8 @@ import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectIn import org.apache.hadoop.hive.serde2.objectinspector.primitive.StringObjectInspector; import org.apache.hadoop.io.Text; import org.apache.hadoop.io.Writable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.CharArrayReader; import java.io.IOException; @@ -54,7 +54,7 @@ import au.com.bytecode.opencsv.CSVWriter; OpenCSVSerde.SEPARATORCHAR, OpenCSVSerde.QUOTECHAR, OpenCSVSerde.ESCAPECHAR}) public final class OpenCSVSerde extends AbstractSerDe { - public static final Log LOG = LogFactory.getLog(OpenCSVSerde.class.getName()); + public static final Logger LOG = LoggerFactory.getLogger(OpenCSVSerde.class.getName()); private ObjectInspector inspector; private String[] outputFields; private int numCols; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java b/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java index 38e8b77..752b907 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java @@ -26,8 +26,8 @@ import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.common.type.HiveChar; import org.apache.hadoop.hive.common.type.HiveDecimal; @@ -74,7 +74,7 @@ import com.google.common.collect.Lists; RegexSerDe.INPUT_REGEX, RegexSerDe.INPUT_REGEX_CASE_SENSITIVE }) public class RegexSerDe extends AbstractSerDe { - public static final Log LOG = LogFactory.getLog(RegexSerDe.class.getName()); + public static final Logger LOG = LoggerFactory.getLogger(RegexSerDe.class.getName()); public static final String INPUT_REGEX = "input.regex"; public static final String INPUT_REGEX_CASE_SENSITIVE = "input.regex.case.insensitive"; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java b/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java index 192e814..90439a2 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java @@ -19,16 +19,11 @@ package org.apache.hadoop.hive.serde2; import java.nio.charset.Charset; -import java.util.ArrayList; 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.hive.common.type.HiveIntervalDayTime; -import org.apache.hadoop.hive.common.type.HiveIntervalYearMonth; import org.apache.hadoop.hive.serde2.AbstractSerDe; import org.apache.hadoop.hive.serde2.objectinspector.ListObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.MapObjectInspector; @@ -56,6 +51,8 @@ import org.apache.hadoop.hive.serde2.objectinspector.primitive.StringObjectInspe import org.apache.hadoop.hive.serde2.objectinspector.primitive.TimestampObjectInspector; import org.apache.hadoop.io.BytesWritable; import org.apache.hadoop.io.Text; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * SerDeUtils. @@ -75,7 +72,7 @@ public final class SerDeUtils { // lower case null is used within json objects private static final String JSON_NULL = "null"; - public static final Log LOG = LogFactory.getLog(SerDeUtils.class.getName()); + public static final Logger LOG = LoggerFactory.getLogger(SerDeUtils.class.getName()); /** * Escape a String in JSON format. http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroDeserializer.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroDeserializer.java b/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroDeserializer.java index 46997f8..4bba3d4 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroDeserializer.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroDeserializer.java @@ -42,8 +42,8 @@ import org.apache.avro.io.BinaryEncoder; import org.apache.avro.io.DecoderFactory; import org.apache.avro.io.EncoderFactory; import org.apache.avro.UnresolvedUnionException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.common.type.HiveChar; import org.apache.hadoop.hive.common.type.HiveDecimal; import org.apache.hadoop.hive.common.type.HiveVarchar; @@ -61,7 +61,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.UnionTypeInfo; import org.apache.hadoop.io.Writable; class AvroDeserializer { - private static final Log LOG = LogFactory.getLog(AvroDeserializer.class); + private static final Logger LOG = LoggerFactory.getLogger(AvroDeserializer.class); /** * Set of already seen and valid record readers IDs which doesn't need re-encoding */ http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroLazyObjectInspector.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroLazyObjectInspector.java b/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroLazyObjectInspector.java index 756f566..de9f4a8 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroLazyObjectInspector.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroLazyObjectInspector.java @@ -30,8 +30,8 @@ import org.apache.avro.generic.GenericDatumReader; import org.apache.avro.generic.GenericRecord; import org.apache.avro.io.DatumReader; import org.apache.commons.lang.ClassUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.lazy.ByteArrayRef; import org.apache.hadoop.hive.serde2.lazy.LazyArray; @@ -70,7 +70,7 @@ public class AvroLazyObjectInspector extends LazySimpleStructObjectInspector { /** * LOGGER * */ - public static final Log LOG = LogFactory.getLog(AvroLazyObjectInspector.class); + public static final Logger LOG = LoggerFactory.getLogger(AvroLazyObjectInspector.class); /** * Constructor @@ -500,4 +500,4 @@ public class AvroLazyObjectInspector extends LazySimpleStructObjectInspector { return clazz.isPrimitive() || ClassUtils.wrapperToPrimitive(clazz) != null || clazz.getSimpleName().equals("String"); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerDe.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerDe.java b/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerDe.java index 0e4e4c6..5035426 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerDe.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerDe.java @@ -23,8 +23,8 @@ import java.util.List; import java.util.Properties; import org.apache.avro.Schema; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.AbstractSerDe; @@ -45,7 +45,7 @@ import org.apache.hadoop.io.Writable; AvroSerdeUtils.SCHEMA_LITERAL, AvroSerdeUtils.SCHEMA_URL, AvroSerdeUtils.SCHEMA_NAMESPACE, AvroSerdeUtils.SCHEMA_NAME, AvroSerdeUtils.SCHEMA_DOC}) public class AvroSerDe extends AbstractSerDe { - private static final Log LOG = LogFactory.getLog(AvroSerDe.class); + private static final Logger LOG = LoggerFactory.getLogger(AvroSerDe.class); public static final String TABLE_NAME = "name"; public static final String TABLE_COMMENT = "comment"; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerdeUtils.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerdeUtils.java b/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerdeUtils.java index a451601..08ae6ef 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerdeUtils.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerdeUtils.java @@ -19,8 +19,8 @@ package org.apache.hadoop.hive.serde2.avro; import org.apache.avro.Schema; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileSystem; @@ -50,7 +50,7 @@ import java.util.Properties; * end-users but public for interop to the ql package. */ public class AvroSerdeUtils { - private static final Log LOG = LogFactory.getLog(AvroSerdeUtils.class); + private static final Logger LOG = LoggerFactory.getLogger(AvroSerdeUtils.class); /** * Enum container for all avro table properties. http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerializer.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerializer.java b/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerializer.java index 1c8bc48..83e5d68 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerializer.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerializer.java @@ -32,8 +32,8 @@ import org.apache.avro.generic.GenericArray; import org.apache.avro.generic.GenericData; import org.apache.avro.generic.GenericData.Fixed; import org.apache.avro.generic.GenericEnumSymbol; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.common.type.HiveChar; import org.apache.hadoop.hive.common.type.HiveDecimal; import org.apache.hadoop.hive.common.type.HiveVarchar; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/avro/InstanceCache.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/avro/InstanceCache.java b/serde/src/java/org/apache/hadoop/hive/serde2/avro/InstanceCache.java index 8f6a911..09fca68 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/avro/InstanceCache.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/avro/InstanceCache.java @@ -21,8 +21,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Cache for objects whose creation only depends on some other set of objects and therefore can be @@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFactory; * @param <Instance> Instance that will be created from SeedObject. */ public abstract class InstanceCache<SeedObject, Instance> { - private static final Log LOG = LogFactory.getLog(InstanceCache.class); + private static final Logger LOG = LoggerFactory.getLogger(InstanceCache.class); Map<SeedObject, Instance> cache = new HashMap<SeedObject, Instance>(); public InstanceCache() {} http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java b/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java index 313b5f6..2796011 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java @@ -28,8 +28,8 @@ 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.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.common.type.HiveDecimal; import org.apache.hadoop.hive.common.type.HiveIntervalDayTime; @@ -121,7 +121,7 @@ import org.apache.hadoop.io.Writable; serdeConstants.SERIALIZATION_SORT_ORDER}) public class BinarySortableSerDe extends AbstractSerDe { - public static final Log LOG = LogFactory.getLog(BinarySortableSerDe.class.getName()); + public static final Logger LOG = LoggerFactory.getLogger(BinarySortableSerDe.class.getName()); List<String> columnNames; List<TypeInfo> columnTypes; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/fast/BinarySortableDeserializeRead.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/fast/BinarySortableDeserializeRead.java b/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/fast/BinarySortableDeserializeRead.java index 2b6d9c0..0643445 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/fast/BinarySortableDeserializeRead.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/fast/BinarySortableDeserializeRead.java @@ -23,8 +23,8 @@ import java.io.IOException; import java.math.BigInteger; import java.util.Arrays; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.common.type.HiveDecimal; import org.apache.hadoop.hive.serde2.binarysortable.BinarySortableSerDe; import org.apache.hadoop.hive.serde2.binarysortable.InputByteBuffer; @@ -60,7 +60,7 @@ import org.apache.hadoop.io.Text; * called. */ public class BinarySortableDeserializeRead implements DeserializeRead { - public static final Log LOG = LogFactory.getLog(BinarySortableDeserializeRead.class.getName()); + public static final Logger LOG = LoggerFactory.getLogger(BinarySortableDeserializeRead.class.getName()); private PrimitiveTypeInfo[] primitiveTypeInfos; @@ -743,4 +743,4 @@ public class BinarySortableDeserializeRead implements DeserializeRead { // Now return whether it is NULL or NOT NULL. return (saveDecimal == null); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/fast/BinarySortableSerializeWrite.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/fast/BinarySortableSerializeWrite.java b/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/fast/BinarySortableSerializeWrite.java index 285ae10..733798c 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/fast/BinarySortableSerializeWrite.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/fast/BinarySortableSerializeWrite.java @@ -23,8 +23,8 @@ import java.sql.Date; import java.sql.Timestamp; import java.util.Arrays; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.common.type.HiveChar; import org.apache.hadoop.hive.common.type.HiveDecimal; import org.apache.hadoop.hive.common.type.HiveIntervalDayTime; @@ -48,7 +48,7 @@ import org.apache.hive.common.util.DateUtils; * This is an alternative way to serialize than what is provided by BinarySortableSerDe. */ public class BinarySortableSerializeWrite implements SerializeWrite { - public static final Log LOG = LogFactory.getLog(BinarySortableSerializeWrite.class.getName()); + public static final Logger LOG = LoggerFactory.getLogger(BinarySortableSerializeWrite.class.getName()); private Output output; @@ -379,4 +379,4 @@ public class BinarySortableSerializeWrite implements SerializeWrite { BinarySortableSerDe.serializeHiveDecimal(output, dec, invert); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java b/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java index 0ca8e2d..e32d9a6 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java @@ -24,8 +24,8 @@ import java.util.Arrays; import java.util.List; import java.util.Properties; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.ColumnProjectionUtils; @@ -77,8 +77,8 @@ public class ColumnarSerDe extends ColumnarSerDeBase { .getAllStructFieldTypeInfos() + "]"; } - public static final Log LOG = LogFactory - .getLog(ColumnarSerDe.class.getName()); + public static final Logger LOG = LoggerFactory + .getLogger(ColumnarSerDe.class); public ColumnarSerDe() throws SerDeException { } http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarStruct.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarStruct.java b/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarStruct.java index 157600e..06ff2d4 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarStruct.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarStruct.java @@ -20,8 +20,8 @@ package org.apache.hadoop.hive.serde2.columnar; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.serde2.lazy.ByteArrayRef; import org.apache.hadoop.hive.serde2.lazy.LazyFactory; import org.apache.hadoop.hive.serde2.lazy.LazyObjectBase; @@ -38,7 +38,7 @@ import org.apache.hadoop.io.Text; */ public class ColumnarStruct extends ColumnarStructBase { - private static final Log LOG = LogFactory.getLog(ColumnarStruct.class); + private static final Logger LOG = LoggerFactory.getLogger(ColumnarStruct.class); Text nullSequence; int lengthNullSequence; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDe.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDe.java b/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDe.java index 21cbd90..0c8a466 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDe.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDe.java @@ -23,8 +23,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.AbstractSerDe; @@ -56,7 +56,7 @@ import org.apache.thrift.transport.TIOStreamTransport; DynamicSerDe.META_TABLE_NAME}) public class DynamicSerDe extends AbstractSerDe { - public static final Log LOG = LogFactory.getLog(DynamicSerDe.class.getName()); + public static final Logger LOG = LoggerFactory.getLogger(DynamicSerDe.class.getName()); private String type_name; private DynamicSerDeStructBase bt; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/io/DateWritable.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/io/DateWritable.java b/serde/src/java/org/apache/hadoop/hive/serde2/io/DateWritable.java index e69351f..dd2b1d9 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/io/DateWritable.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/io/DateWritable.java @@ -38,6 +38,7 @@ import org.apache.hadoop.io.WritableUtils; * */ public class DateWritable implements WritableComparable<DateWritable> { + private static final long MILLIS_PER_DAY = TimeUnit.DAYS.toMillis(1); // Local time zone. http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/io/HiveIntervalDayTimeWritable.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/io/HiveIntervalDayTimeWritable.java b/serde/src/java/org/apache/hadoop/hive/serde2/io/HiveIntervalDayTimeWritable.java index a7a6d1b..86b6cb5 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/io/HiveIntervalDayTimeWritable.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/io/HiveIntervalDayTimeWritable.java @@ -22,8 +22,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.common.type.HiveIntervalDayTime; import org.apache.hadoop.hive.serde2.ByteStream.RandomAccessOutput; import org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryUtils; @@ -35,7 +35,7 @@ import org.apache.hadoop.io.WritableUtils; public class HiveIntervalDayTimeWritable implements WritableComparable<HiveIntervalDayTimeWritable> { - static final private Log LOG = LogFactory.getLog(HiveIntervalDayTimeWritable.class); + static final private Logger LOG = LoggerFactory.getLogger(HiveIntervalDayTimeWritable.class); protected HiveIntervalDayTime intervalValue = new HiveIntervalDayTime(); http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/io/HiveIntervalYearMonthWritable.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/io/HiveIntervalYearMonthWritable.java b/serde/src/java/org/apache/hadoop/hive/serde2/io/HiveIntervalYearMonthWritable.java index dc4a3ed..873d0fa 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/io/HiveIntervalYearMonthWritable.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/io/HiveIntervalYearMonthWritable.java @@ -22,8 +22,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.common.type.HiveIntervalYearMonth; import org.apache.hadoop.hive.serde2.ByteStream.RandomAccessOutput; import org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryUtils; @@ -34,7 +34,7 @@ import org.apache.hadoop.io.WritableUtils; public class HiveIntervalYearMonthWritable implements WritableComparable<HiveIntervalYearMonthWritable> { - static final private Log LOG = LogFactory.getLog(HiveIntervalYearMonthWritable.class); + static final private Logger LOG = LoggerFactory.getLogger(HiveIntervalYearMonthWritable.class); protected HiveIntervalYearMonth intervalValue = new HiveIntervalYearMonth(); http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyBinary.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyBinary.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyBinary.java index 884c3ae..010f1f9 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyBinary.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyBinary.java @@ -19,16 +19,16 @@ package org.apache.hadoop.hive.serde2.lazy; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyBinaryObjectInspector; import org.apache.hadoop.io.BytesWritable; public class LazyBinary extends LazyPrimitive<LazyBinaryObjectInspector, BytesWritable> { - private static final Log LOG = LogFactory.getLog(LazyBinary.class); + private static final Logger LOG = LoggerFactory.getLogger(LazyBinary.class); private static final boolean DEBUG_LOG_ENABLED = LOG.isDebugEnabled(); - + LazyBinary(LazyBinaryObjectInspector oi) { super(oi); data = new BytesWritable(); http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyDate.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyDate.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyDate.java index 7af2374..0579ff2 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyDate.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyDate.java @@ -22,8 +22,8 @@ import java.io.OutputStream; import java.nio.ByteBuffer; import java.sql.Date; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.serde2.io.DateWritable; import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyDateObjectInspector; import org.apache.hadoop.io.Text; @@ -37,7 +37,7 @@ import org.apache.hadoop.io.Text; * */ public class LazyDate extends LazyPrimitive<LazyDateObjectInspector, DateWritable> { - private static final Log LOG = LogFactory.getLog(LazyDate.class); + private static final Logger LOG = LoggerFactory.getLogger(LazyDate.class); public LazyDate(LazyDateObjectInspector oi) { super(oi); http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyDouble.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyDouble.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyDouble.java index 35c2141..a7d6c66 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyDouble.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyDouble.java @@ -19,8 +19,8 @@ package org.apache.hadoop.hive.serde2.lazy; import java.nio.charset.CharacterCodingException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.serde2.io.DoubleWritable; import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyDoubleObjectInspector; import org.apache.hadoop.io.Text; @@ -32,7 +32,7 @@ import org.apache.hadoop.io.Text; public class LazyDouble extends LazyPrimitive<LazyDoubleObjectInspector, DoubleWritable> { - private static final Log LOG = LogFactory.getLog(LazyDouble.class); + private static final Logger LOG = LoggerFactory.getLogger(LazyDouble.class); public LazyDouble(LazyDoubleObjectInspector oi) { super(oi); data = new DoubleWritable(); http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFloat.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFloat.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFloat.java index 6e132c7..5b055d2 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFloat.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFloat.java @@ -19,8 +19,8 @@ package org.apache.hadoop.hive.serde2.lazy; import java.nio.charset.CharacterCodingException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyFloatObjectInspector; import org.apache.hadoop.io.FloatWritable; import org.apache.hadoop.io.Text; @@ -32,7 +32,7 @@ import org.apache.hadoop.io.Text; public class LazyFloat extends LazyPrimitive<LazyFloatObjectInspector, FloatWritable> { - private static final Log LOG = LogFactory.getLog(LazyFloat.class); + private static final Logger LOG = LoggerFactory.getLogger(LazyFloat.class); public LazyFloat(LazyFloatObjectInspector oi) { super(oi); data = new FloatWritable(); http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyHiveChar.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyHiveChar.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyHiveChar.java index 3799c7c..fc359d8 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyHiveChar.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyHiveChar.java @@ -19,8 +19,8 @@ package org.apache.hadoop.hive.serde2.lazy; import java.nio.charset.CharacterCodingException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.serde2.io.HiveCharWritable; import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyHiveCharObjectInspector; import org.apache.hadoop.hive.serde2.typeinfo.CharTypeInfo; @@ -33,7 +33,7 @@ import org.apache.hadoop.io.Text; public class LazyHiveChar extends LazyPrimitive<LazyHiveCharObjectInspector, HiveCharWritable> { - private static final Log LOG = LogFactory.getLog(LazyHiveChar.class); + private static final Logger LOG = LoggerFactory.getLogger(LazyHiveChar.class); protected int maxLength = -1; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyHiveDecimal.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyHiveDecimal.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyHiveDecimal.java index b8b1f59..40601c0 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyHiveDecimal.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyHiveDecimal.java @@ -22,8 +22,8 @@ import java.io.OutputStream; import java.nio.ByteBuffer; import java.nio.charset.CharacterCodingException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.common.type.HiveDecimal; import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyHiveDecimalObjectInspector; @@ -31,7 +31,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.DecimalTypeInfo; import org.apache.hadoop.io.Text; public class LazyHiveDecimal extends LazyPrimitive<LazyHiveDecimalObjectInspector, HiveDecimalWritable> { - static final private Log LOG = LogFactory.getLog(LazyHiveDecimal.class); + private static final Logger LOG = LoggerFactory.getLogger(LazyHiveDecimal.class); private final int precision; private final int scale; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyHiveVarchar.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyHiveVarchar.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyHiveVarchar.java index b4659e7..8a30a41 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyHiveVarchar.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyHiveVarchar.java @@ -19,8 +19,8 @@ package org.apache.hadoop.hive.serde2.lazy; import java.nio.charset.CharacterCodingException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.serde2.io.HiveVarcharWritable; import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyHiveVarcharObjectInspector; import org.apache.hadoop.hive.serde2.typeinfo.VarcharTypeInfo; @@ -33,7 +33,7 @@ import org.apache.hadoop.io.Text; public class LazyHiveVarchar extends LazyPrimitive<LazyHiveVarcharObjectInspector, HiveVarcharWritable> { - private static final Log LOG = LogFactory.getLog(LazyHiveVarchar.class); + private static final Logger LOG = LoggerFactory.getLogger(LazyHiveVarchar.class); protected int maxLength = -1; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyMap.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyMap.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyMap.java index c20bdc1..bada959 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyMap.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyMap.java @@ -23,8 +23,8 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazyMapObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector; import org.apache.hadoop.io.Text; @@ -38,7 +38,7 @@ import org.apache.hadoop.io.Text; */ public class LazyMap extends LazyNonPrimitive<LazyMapObjectInspector> { - public static final Log LOG = LogFactory.getLog(LazyMap.class); + public static final Logger LOG = LoggerFactory.getLogger(LazyMap.class); /** * Whether the data is already parsed or not. */ http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyPrimitive.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyPrimitive.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyPrimitive.java index 32224a8..da324ee 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyPrimitive.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyPrimitive.java @@ -19,8 +19,8 @@ package org.apache.hadoop.hive.serde2.lazy; import java.nio.charset.CharacterCodingException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.io.Text; import org.apache.hadoop.io.Writable; @@ -31,7 +31,7 @@ import org.apache.hadoop.io.Writable; public abstract class LazyPrimitive<OI extends ObjectInspector, T extends Writable> extends LazyObject<OI> { - private static final Log LOG = LogFactory.getLog(LazyPrimitive.class); + private static final Logger LOG = LoggerFactory.getLogger(LazyPrimitive.class); protected LazyPrimitive(OI oi) { super(oi); } http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySerDeParameters.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySerDeParameters.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySerDeParameters.java index 2ab6c5b..54f6b2b 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySerDeParameters.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySerDeParameters.java @@ -25,8 +25,8 @@ 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.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hadoop.hive.serde.serdeConstants; @@ -43,7 +43,7 @@ import org.apache.hive.common.util.HiveStringUtils; * */ public class LazySerDeParameters implements LazyObjectInspectorParameters { - public static final Log LOG = LogFactory.getLog(LazySerDeParameters.class.getName()); + public static final Logger LOG = LoggerFactory.getLogger(LazySerDeParameters.class.getName()); public static final byte[] DefaultSeparators = {(byte) 1, (byte) 2, (byte) 3}; public static final String SERIALIZATION_EXTEND_NESTING_LEVELS = "hive.serialization.extend.nesting.levels"; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java index cb3f9d1..0a2f44c 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java @@ -27,8 +27,6 @@ import java.util.Map; import java.util.Properties; import org.apache.commons.lang.ArrayUtils; -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.ConfVars; import org.apache.hadoop.hive.serde.serdeConstants; @@ -82,9 +80,6 @@ import org.apache.hive.common.util.HiveStringUtils; }) public class LazySimpleSerDe extends AbstractEncodingAwareSerDe { - public static final Log LOG = LogFactory.getLog(LazySimpleSerDe.class - .getName()); - private LazySerDeParameters serdeParams = null; private ObjectInspector cachedObjectInspector; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyStruct.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyStruct.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyStruct.java index 9a246af..0310970 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyStruct.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyStruct.java @@ -22,9 +22,9 @@ import java.util.Arrays; import java.util.List; import com.google.common.primitives.Bytes; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hive.serde2.SerDeException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.serde2.SerDeStatsStruct; import org.apache.hadoop.hive.serde2.StructObject; import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazySimpleStructObjectInspector; @@ -40,7 +40,7 @@ import org.apache.hadoop.hive.serde2.objectinspector.StructField; public class LazyStruct extends LazyNonPrimitive<LazySimpleStructObjectInspector> implements StructObject, SerDeStatsStruct { - private static Log LOG = LogFactory.getLog(LazyStruct.class.getName()); + private static final Logger LOG = LoggerFactory.getLogger(LazyStruct.class.getName()); /** * Whether the data is already parsed or not. http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyTimestamp.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyTimestamp.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyTimestamp.java index 66134e1..8f0c3d2 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyTimestamp.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyTimestamp.java @@ -22,8 +22,8 @@ import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.sql.Timestamp; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.serde2.io.TimestampWritable; import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyTimestampObjectInspector; @@ -36,7 +36,7 @@ import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyTimestam * */ public class LazyTimestamp extends LazyPrimitive<LazyTimestampObjectInspector, TimestampWritable> { - static final private Log LOG = LogFactory.getLog(LazyTimestamp.class); + private static final Logger LOG = LoggerFactory.getLogger(LazyTimestamp.class); public LazyTimestamp(LazyTimestampObjectInspector oi) { super(oi); @@ -62,7 +62,7 @@ public class LazyTimestamp extends LazyPrimitive<LazyTimestampObjectInspector, T try { s = new String(bytes.getData(), start, length, "US-ASCII"); } catch (UnsupportedEncodingException e) { - LOG.error(e); + LOG.error("Unsupported encoding found ", e); s = ""; } @@ -82,8 +82,6 @@ public class LazyTimestamp extends LazyPrimitive<LazyTimestampObjectInspector, T data.set(t); } - private static final String nullTimestamp = "NULL"; - /** * Writes a Timestamp in JDBC timestamp format to the output stream * @param out http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazy/fast/LazySimpleDeserializeRead.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/fast/LazySimpleDeserializeRead.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/fast/LazySimpleDeserializeRead.java index dc76c7d..736dae7 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/fast/LazySimpleDeserializeRead.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/fast/LazySimpleDeserializeRead.java @@ -24,8 +24,8 @@ import java.nio.charset.CharacterCodingException; import java.sql.Date; import java.sql.Timestamp; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.common.type.HiveDecimal; import org.apache.hadoop.hive.common.type.HiveIntervalDayTime; import org.apache.hadoop.hive.common.type.HiveIntervalYearMonth; @@ -60,21 +60,19 @@ import org.apache.hive.common.util.TimestampParser; * * Reading some fields require a results object to receive value information. A separate * results object is created by the caller at initialization per different field even for the same - * type. + * type. * * Some type values are by reference to either bytes in the deserialization buffer or to * other type specific buffers. So, those references are only valid until the next time set is * called. */ public class LazySimpleDeserializeRead implements DeserializeRead { - public static final Log LOG = LogFactory.getLog(LazySimpleDeserializeRead.class.getName()); + public static final Logger LOG = LoggerFactory.getLogger(LazySimpleDeserializeRead.class.getName()); private PrimitiveTypeInfo[] primitiveTypeInfos; - private LazySerDeParameters lazyParams; private byte separator; - private boolean lastColumnTakesRest; private boolean isEscaped; private byte escapeChar; private byte[] nullSequenceBytes; @@ -117,11 +115,8 @@ public class LazySimpleDeserializeRead implements DeserializeRead { byte separator, LazySerDeParameters lazyParams) { this.primitiveTypeInfos = primitiveTypeInfos; - this.separator = separator; - this.lazyParams = lazyParams; - lastColumnTakesRest = lazyParams.isLastColumnTakesRest(); isEscaped = lazyParams.isEscaped(); escapeChar = lazyParams.getEscapeChar(); nullSequenceBytes = lazyParams.getNullSequence().getBytes(); @@ -141,6 +136,7 @@ public class LazySimpleDeserializeRead implements DeserializeRead { /* * The primitive type information for all fields. */ + @Override public PrimitiveTypeInfo[] primitiveTypeInfos() { return primitiveTypeInfos; } @@ -180,7 +176,7 @@ public class LazySimpleDeserializeRead implements DeserializeRead { if (!readBeyondBufferRangeWarned) { // Warn only once. int length = end - start; - LOG.info("Reading beyond buffer range! Buffer range " + start + LOG.info("Reading beyond buffer range! Buffer range " + start + " for length " + length + " but reading more (NULLs returned)." + " Ignoring similar problems."); readBeyondBufferRangeWarned = true; @@ -418,7 +414,7 @@ public class LazySimpleDeserializeRead implements DeserializeRead { try { s = new String(bytes, fieldStart, fieldLength, "US-ASCII"); } catch (UnsupportedEncodingException e) { - LOG.error(e); + LOG.error("Unsupported encoding found ", e); s = ""; } @@ -457,7 +453,7 @@ public class LazySimpleDeserializeRead implements DeserializeRead { // } break; case INTERVAL_DAY_TIME: - { + { String s = null; try { s = Text.decode(bytes, fieldStart, fieldLength); @@ -521,13 +517,14 @@ public class LazySimpleDeserializeRead implements DeserializeRead { /* * Call this method after all fields have been read to check for extra fields. */ + @Override public void extraFieldsCheck() { if (offset < end) { // We did not consume all of the byte range. if (!bufferRangeHasExtraDataWarned) { // Warn only once. int length = end - start; - LOG.info("Not all fields were read in the buffer range! Buffer range " + start + LOG.info("Not all fields were read in the buffer range! Buffer range " + start + " for length " + length + " but reading more (NULLs returned)." + " Ignoring similar problems."); bufferRangeHasExtraDataWarned = true; @@ -622,7 +619,7 @@ public class LazySimpleDeserializeRead implements DeserializeRead { } // Reading a STRING field require a results object to receive value information. A separate - // results object is created by the caller at initialization per different bytes field. + // results object is created by the caller at initialization per different bytes field. @Override public ReadStringResults createReadStringResults() { return new LazySimpleReadStringResults(); @@ -655,12 +652,13 @@ public class LazySimpleDeserializeRead implements DeserializeRead { } // Reading a CHAR field require a results object to receive value information. A separate - // results object is created by the caller at initialization per different CHAR field. + // results object is created by the caller at initialization per different CHAR field. @Override public ReadHiveCharResults createReadHiveCharResults() { return new LazySimpleReadHiveCharResults(); } + @Override public void readHiveChar(ReadHiveCharResults readHiveCharResults) throws IOException { LazySimpleReadHiveCharResults LazySimpleReadHiveCharResults = (LazySimpleReadHiveCharResults) readHiveCharResults; @@ -706,12 +704,13 @@ public class LazySimpleDeserializeRead implements DeserializeRead { } // Reading a VARCHAR field require a results object to receive value information. A separate - // results object is created by the caller at initialization per different VARCHAR field. + // results object is created by the caller at initialization per different VARCHAR field. @Override public ReadHiveVarcharResults createReadHiveVarcharResults() { return new LazySimpleReadHiveVarcharResults(); } + @Override public void readHiveVarchar(ReadHiveVarcharResults readHiveVarcharResults) throws IOException { LazySimpleReadHiveVarcharResults lazySimpleReadHiveVarvarcharResults = (LazySimpleReadHiveVarcharResults) readHiveVarcharResults; @@ -749,7 +748,7 @@ public class LazySimpleDeserializeRead implements DeserializeRead { } // Reading a BINARY field require a results object to receive value information. A separate - // results object is created by the caller at initialization per different bytes field. + // results object is created by the caller at initialization per different bytes field. @Override public ReadBinaryResults createReadBinaryResults() { return new LazySimpleReadBinaryResults(); @@ -779,7 +778,7 @@ public class LazySimpleDeserializeRead implements DeserializeRead { } // Reading a DATE field require a results object to receive value information. A separate - // results object is created by the caller at initialization per different DATE field. + // results object is created by the caller at initialization per different DATE field. @Override public ReadDateResults createReadDateResults() { return new LazySimpleReadDateResults(); @@ -813,7 +812,7 @@ public class LazySimpleDeserializeRead implements DeserializeRead { // Reading a INTERVAL_YEAR_MONTH field require a results object to receive value information. // A separate results object is created by the caller at initialization per different - // INTERVAL_YEAR_MONTH field. + // INTERVAL_YEAR_MONTH field. @Override public ReadIntervalYearMonthResults createReadIntervalYearMonthResults() { return new LazySimpleReadIntervalYearMonthResults(); @@ -825,7 +824,7 @@ public class LazySimpleDeserializeRead implements DeserializeRead { LazySimpleReadIntervalYearMonthResults lazySimpleReadIntervalYearMonthResults = (LazySimpleReadIntervalYearMonthResults) readIntervalYearMonthResults; - HiveIntervalYearMonthWritable hiveIntervalYearMonthWritable = + HiveIntervalYearMonthWritable hiveIntervalYearMonthWritable = lazySimpleReadIntervalYearMonthResults.getHiveIntervalYearMonthWritable(); hiveIntervalYearMonthWritable.set(saveIntervalYearMonth); saveIntervalYearMonth = null; @@ -849,7 +848,7 @@ public class LazySimpleDeserializeRead implements DeserializeRead { // Reading a INTERVAL_DAY_TIME field require a results object to receive value information. // A separate results object is created by the caller at initialization per different - // INTERVAL_DAY_TIME field. + // INTERVAL_DAY_TIME field. @Override public ReadIntervalDayTimeResults createReadIntervalDayTimeResults() { return new LazySimpleReadIntervalDayTimeResults(); @@ -861,7 +860,7 @@ public class LazySimpleDeserializeRead implements DeserializeRead { LazySimpleReadIntervalDayTimeResults lazySimpleReadIntervalDayTimeResults = (LazySimpleReadIntervalDayTimeResults) readIntervalDayTimeResults; - HiveIntervalDayTimeWritable hiveIntervalDayTimeWritable = + HiveIntervalDayTimeWritable hiveIntervalDayTimeWritable = lazySimpleReadIntervalDayTimeResults.getHiveIntervalDayTimeWritable(); hiveIntervalDayTimeWritable.set(saveIntervalDayTime); saveIntervalDayTime = null; @@ -884,7 +883,7 @@ public class LazySimpleDeserializeRead implements DeserializeRead { } // Reading a TIMESTAMP field require a results object to receive value information. A separate - // results object is created by the caller at initialization per different TIMESTAMP field. + // results object is created by the caller at initialization per different TIMESTAMP field. @Override public ReadTimestampResults createReadTimestampResults() { return new LazySimpleReadTimestampResults(); @@ -892,7 +891,7 @@ public class LazySimpleDeserializeRead implements DeserializeRead { @Override public void readTimestamp(ReadTimestampResults readTimestampResults) { - LazySimpleReadTimestampResults lazySimpleReadTimestampResults = + LazySimpleReadTimestampResults lazySimpleReadTimestampResults = (LazySimpleReadTimestampResults) readTimestampResults; TimestampWritable timestampWritable = lazySimpleReadTimestampResults.getTimestampWritable(); @@ -920,7 +919,7 @@ public class LazySimpleDeserializeRead implements DeserializeRead { } // Reading a DECIMAL field require a results object to receive value information. A separate - // results object is created by the caller at initialization per different DECIMAL field. + // results object is created by the caller at initialization per different DECIMAL field. @Override public ReadDecimalResults createReadDecimalResults() { return new LazySimpleReadDecimalResults(); @@ -944,101 +943,6 @@ public class LazySimpleDeserializeRead implements DeserializeRead { private static int maxLongDigitsCount = maxLongBytes.length; private static byte[] minLongNoSignBytes = ((Long) Long.MIN_VALUE).toString().substring(1).getBytes(); - private boolean parseLongFast() { - - // Parse without using exceptions for better performance. - int i = fieldStart; - int end = fieldStart + fieldLength; - boolean negative = false; - if (i >= end) { - return false; // Empty field. - } - if (bytes[i] == '+') { - i++; - if (i >= end) { - return false; - } - } else if (bytes[i] == '-') { - negative = true; - i++; - if (i >= end) { - return false; - } - } - // Skip leading zeros. - boolean atLeastOneZero = false; - while (true) { - if (bytes[i] != '0') { - break; - } - i++; - if (i >= end) { - saveLong = 0; - return true; - } - atLeastOneZero = true; - } - // We tolerate and ignore decimal places. - if (bytes[i] == '.') { - if (!atLeastOneZero) { - return false; - } - saveLong = 0; - // Fall through below and verify trailing decimal digits. - } else { - if (!Character.isDigit(bytes[i])) { - return false; - } - int nonLeadingZeroStart = i; - int digitCount = 1; - saveLong = Character.digit(bytes[i], 10); - i++; - while (i < end) { - if (!Character.isDigit(bytes[i])) { - break; - } - digitCount++; - if (digitCount > maxLongDigitsCount) { - return false; - } else if (digitCount == maxLongDigitsCount) { - // Use the old trick of comparing against number string to check for overflow. - if (!negative) { - if (byteArrayCompareRanges(bytes, nonLeadingZeroStart, maxLongBytes, 0, digitCount) >= 1) { - return false; - } - } else { - if (byteArrayCompareRanges(bytes, nonLeadingZeroStart, minLongNoSignBytes, 0, digitCount) >= 1) { - return false; - } - } - } - saveLong = (saveLong * 10) + Character.digit(bytes[i], 10); - } - if (negative) { - // Safe because of our number string comparision against min (negative) long. - saveLong = -saveLong; - } - if (i >= end) { - return true; - } - if (bytes[i] != '.') { - return false; - } - } - // Fall through to here if we detect the start of trailing decimal digits... - // We verify trailing digits only. - while (true) { - i++; - if (i >= end) { - break; - } - if (!Character.isDigit(bytes[i])) { - return false; - } - } - return true; - } - public static int byteArrayCompareRanges(byte[] arg1, int start1, byte[] arg2, int start2, int len) { for (int i = 0; i < len; i++) { // Note the "& 0xff" is just a way to convert unsigned bytes to signed integer. http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazy/fast/LazySimpleSerializeWrite.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/fast/LazySimpleSerializeWrite.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/fast/LazySimpleSerializeWrite.java index 77838a1..4f9c130 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/fast/LazySimpleSerializeWrite.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/fast/LazySimpleSerializeWrite.java @@ -25,8 +25,8 @@ import java.sql.Date; import java.sql.Timestamp; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.common.type.HiveChar; import org.apache.hadoop.hive.common.type.HiveDecimal; import org.apache.hadoop.hive.common.type.HiveIntervalDayTime; @@ -64,7 +64,7 @@ import org.apache.hive.common.util.DateUtils; * This is an alternative way to serialize than what is provided by LazyBinarySerDe. */ public class LazySimpleSerializeWrite implements SerializeWrite { - public static final Log LOG = LogFactory.getLog(LazySimpleSerializeWrite.class.getName()); + public static final Logger LOG = LoggerFactory.getLogger(LazySimpleSerializeWrite.class.getName()); private LazySerDeParameters lazyParams; @@ -516,4 +516,4 @@ public class LazySimpleSerializeWrite implements SerializeWrite { index++; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyListObjectInspector.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyListObjectInspector.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyListObjectInspector.java index e293582..97130a8 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyListObjectInspector.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyListObjectInspector.java @@ -20,8 +20,8 @@ package org.apache.hadoop.hive.serde2.lazy.objectinspector; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.serde2.lazy.LazyArray; import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyObjectInspectorParameters; import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyObjectInspectorParametersImpl; @@ -37,7 +37,7 @@ import org.apache.hadoop.io.Text; */ public class LazyListObjectInspector implements ListObjectInspector { - public static final Log LOG = LogFactory.getLog(LazyListObjectInspector.class + public static final Logger LOG = LoggerFactory.getLogger(LazyListObjectInspector.class .getName()); private ObjectInspector listElementObjectInspector; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyMapObjectInspector.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyMapObjectInspector.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyMapObjectInspector.java index 908f2c7..ff40492 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyMapObjectInspector.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyMapObjectInspector.java @@ -20,8 +20,8 @@ package org.apache.hadoop.hive.serde2.lazy.objectinspector; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.serde2.lazy.LazyMap; import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyObjectInspectorParameters; import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyObjectInspectorParametersImpl; @@ -37,7 +37,7 @@ import org.apache.hadoop.io.Text; */ public class LazyMapObjectInspector implements MapObjectInspector { - public static final Log LOG = LogFactory.getLog(LazyMapObjectInspector.class + public static final Logger LOG = LoggerFactory.getLogger(LazyMapObjectInspector.class .getName()); private ObjectInspector mapKeyObjectInspector; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyUnionObjectInspector.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyUnionObjectInspector.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyUnionObjectInspector.java index bedc8e8..fb4086b 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyUnionObjectInspector.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyUnionObjectInspector.java @@ -21,8 +21,8 @@ package org.apache.hadoop.hive.serde2.lazy.objectinspector; import java.util.ArrayList; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.serde2.lazy.LazyUnion; import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyObjectInspectorParameters; import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyObjectInspectorParametersImpl; @@ -40,8 +40,8 @@ import org.apache.hadoop.io.Text; */ public class LazyUnionObjectInspector implements UnionObjectInspector { - public static final Log LOG = LogFactory - .getLog(LazyUnionObjectInspector.class.getName()); + public static final Logger LOG = LoggerFactory + .getLogger(LazyUnionObjectInspector.class.getName()); private List<ObjectInspector> ois; http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryDate.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryDate.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryDate.java index 4200e26..f1d9474 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryDate.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryDate.java @@ -17,8 +17,8 @@ */ package org.apache.hadoop.hive.serde2.lazybinary; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.serde2.io.DateWritable; import org.apache.hadoop.hive.serde2.lazy.ByteArrayRef; import org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryUtils.VInt; @@ -30,7 +30,7 @@ import org.apache.hadoop.hive.serde2.objectinspector.primitive.WritableDateObjec */ public class LazyBinaryDate extends LazyBinaryPrimitive<WritableDateObjectInspector, DateWritable> { - static final Log LOG = LogFactory.getLog(LazyBinaryDate.class); + static final Logger LOG = LoggerFactory.getLogger(LazyBinaryDate.class); LazyBinaryDate(WritableDateObjectInspector oi) { super(oi); http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryHiveIntervalDayTime.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryHiveIntervalDayTime.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryHiveIntervalDayTime.java index dda2b46..f82ddda 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryHiveIntervalDayTime.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryHiveIntervalDayTime.java @@ -17,8 +17,8 @@ */ package org.apache.hadoop.hive.serde2.lazybinary; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.serde2.io.HiveIntervalDayTimeWritable; import org.apache.hadoop.hive.serde2.lazy.ByteArrayRef; import org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryUtils.VInt; @@ -31,7 +31,7 @@ import org.apache.hadoop.hive.serde2.objectinspector.primitive.WritableHiveInter */ public class LazyBinaryHiveIntervalDayTime extends LazyBinaryPrimitive<WritableHiveIntervalDayTimeObjectInspector, HiveIntervalDayTimeWritable>{ - static final Log LOG = LogFactory.getLog(LazyBinaryHiveIntervalDayTime.class); + static final Logger LOG = LoggerFactory.getLogger(LazyBinaryHiveIntervalDayTime.class); /** * Reusable member for decoding integer. http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryHiveIntervalYearMonth.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryHiveIntervalYearMonth.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryHiveIntervalYearMonth.java index 426bb7a..c2a8372 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryHiveIntervalYearMonth.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryHiveIntervalYearMonth.java @@ -17,8 +17,8 @@ */ package org.apache.hadoop.hive.serde2.lazybinary; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.serde2.io.HiveIntervalYearMonthWritable; import org.apache.hadoop.hive.serde2.lazy.ByteArrayRef; import org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryUtils.VInt; @@ -30,7 +30,7 @@ import org.apache.hadoop.hive.serde2.objectinspector.primitive.WritableHiveInter */ public class LazyBinaryHiveIntervalYearMonth extends LazyBinaryPrimitive<WritableHiveIntervalYearMonthObjectInspector, HiveIntervalYearMonthWritable>{ - static final Log LOG = LogFactory.getLog(LazyBinaryHiveIntervalYearMonth.class); + static final Logger LOG = LoggerFactory.getLogger(LazyBinaryHiveIntervalYearMonth.class); /** * Reusable member for decoding integer. http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryMap.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryMap.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryMap.java index 5e40cd5..1aa72ce 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryMap.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryMap.java @@ -21,8 +21,8 @@ import java.util.Arrays; import java.util.LinkedHashMap; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.serde2.lazy.ByteArrayRef; import org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryUtils.RecordInfo; import org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryUtils.VInt; @@ -48,7 +48,7 @@ import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector; public class LazyBinaryMap extends LazyBinaryNonPrimitive<LazyBinaryMapObjectInspector> { - private static Log LOG = LogFactory.getLog(LazyBinaryMap.class.getName()); + private static final Logger LOG = LoggerFactory.getLogger(LazyBinaryMap.class.getName()); /** * Whether the data is already parsed or not. http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java index 41fe98a..54bfd2d 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java @@ -24,8 +24,8 @@ 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.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.AbstractSerDe; @@ -80,7 +80,7 @@ import org.apache.hadoop.io.Writable; */ @SerDeSpec(schemaProps = {serdeConstants.LIST_COLUMNS, serdeConstants.LIST_COLUMN_TYPES}) public class LazyBinarySerDe extends AbstractSerDe { - public static final Log LOG = LogFactory.getLog(LazyBinarySerDe.class.getName()); + public static final Logger LOG = LoggerFactory.getLogger(LazyBinarySerDe.class.getName()); public LazyBinarySerDe() throws SerDeException { } http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryStruct.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryStruct.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryStruct.java index 43255cd..b4eb7bb 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryStruct.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryStruct.java @@ -21,8 +21,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.serde2.SerDeStatsStruct; import org.apache.hadoop.hive.serde2.StructObject; import org.apache.hadoop.hive.serde2.lazy.ByteArrayRef; @@ -48,7 +48,7 @@ import org.apache.hadoop.io.BinaryComparable; public class LazyBinaryStruct extends LazyBinaryNonPrimitive<LazyBinaryStructObjectInspector> implements StructObject, SerDeStatsStruct { - private static Log LOG = LogFactory.getLog(LazyBinaryStruct.class.getName()); + private static final Logger LOG = LoggerFactory.getLogger(LazyBinaryStruct.class.getName()); /** * Whether the data is already parsed or not. http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryTimestamp.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryTimestamp.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryTimestamp.java index 98dd81c..a530130 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryTimestamp.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryTimestamp.java @@ -17,8 +17,8 @@ */ package org.apache.hadoop.hive.serde2.lazybinary; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.serde2.io.TimestampWritable; import org.apache.hadoop.hive.serde2.lazy.ByteArrayRef; import org.apache.hadoop.hive.serde2.objectinspector.primitive.WritableTimestampObjectInspector; @@ -30,7 +30,7 @@ import org.apache.hadoop.hive.serde2.objectinspector.primitive.WritableTimestamp */ public class LazyBinaryTimestamp extends LazyBinaryPrimitive<WritableTimestampObjectInspector, TimestampWritable> { - static final Log LOG = LogFactory.getLog(LazyBinaryTimestamp.class); + static final Logger LOG = LoggerFactory.getLogger(LazyBinaryTimestamp.class); LazyBinaryTimestamp(WritableTimestampObjectInspector oi) { super(oi); http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUnion.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUnion.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUnion.java index 8b17b25..fbf05b6 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUnion.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUnion.java @@ -21,8 +21,8 @@ import java.util.Arrays; import java.util.List; - import org.apache.commons.logging.Log; - import org.apache.commons.logging.LogFactory; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.serde2.SerDeStatsStruct; import org.apache.hadoop.hive.serde2.lazy.ByteArrayRef; import org.apache.hadoop.hive.serde2.lazybinary.objectinspector.LazyBinaryUnionObjectInspector; @@ -39,7 +39,7 @@ public class LazyBinaryUnion extends LazyBinaryNonPrimitive<LazyBinaryUnionObjectInspector> implements SerDeStatsStruct { - private static Log LOG = LogFactory.getLog(LazyBinaryUnion.class.getName()); + private static Logger LOG = LoggerFactory.getLogger(LazyBinaryUnion.class.getName()); /** * Whether the data is already parsed or not. http://git-wip-us.apache.org/repos/asf/hive/blob/55337444/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java index 6f277a1..f8a110d 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java @@ -414,7 +414,7 @@ public final class LazyBinaryUtils { int len = LazyBinaryUtils.writeVLongToByteArray(vLongBytes, l); byteStream.write(vLongBytes, 0, len); } - + public static void writeDouble(RandomAccessOutput byteStream, double d) { long v = Double.doubleToLongBits(d); byteStream.write((byte) (v >> 56));
