diff --git serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java index 5430814..d59d2ff 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java +++ serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java @@ -177,7 +177,7 @@ public final class PrimitiveObjectInspectorUtils { Short.class, ShortWritable.class); public static final PrimitiveTypeEntry timestampTypeEntry = new PrimitiveTypeEntry( PrimitiveCategory.TIMESTAMP, Constants.TIMESTAMP_TYPE_NAME, null, - Object.class, TimestampWritable.class); + Timestamp.class, TimestampWritable.class); // The following is a complex type for special handling public static final PrimitiveTypeEntry unknownTypeEntry = new PrimitiveTypeEntry( diff --git serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestStandardObjectInspectors.java serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestStandardObjectInspectors.java index 89db592..7d87666 100644 --- serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestStandardObjectInspectors.java +++ serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestStandardObjectInspectors.java @@ -17,6 +17,7 @@ */ package org.apache.hadoop.hive.serde2.objectinspector; +import java.sql.Timestamp; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -27,6 +28,7 @@ import org.apache.hadoop.hive.serde2.SerDeUtils; import org.apache.hadoop.hive.serde2.io.ByteWritable; import org.apache.hadoop.hive.serde2.io.DoubleWritable; import org.apache.hadoop.hive.serde2.io.ShortWritable; +import org.apache.hadoop.hive.serde2.io.TimestampWritable; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category; import org.apache.hadoop.hive.serde2.objectinspector.StandardUnionObjectInspector.StandardUnion; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; @@ -89,6 +91,7 @@ public class TestStandardObjectInspectors extends TestCase { doTestStandardPrimitiveObjectInspector(DoubleWritable.class, Double.class); doTestStandardPrimitiveObjectInspector(Text.class, String.class); doTestStandardPrimitiveObjectInspector(BytesWritable.class, byte[].class); + doTestStandardPrimitiveObjectInspector(TimestampWritable.class, Timestamp.class); } catch (Throwable e) { e.printStackTrace(); throw e;