diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index 7ea2de9019..12f4822e38 100644 --- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -2036,7 +2036,7 @@ private static void populateLlapDaemonVarsSet(Set llapDaemonVarsSetLocal HIVE_PARQUET_WRITE_INT64_TIMESTAMP("hive.parquet.write.int64.timestamp", false, "Write parquet timestamps as int64/LogicalTypes instead of int96/OriginalTypes. Note:" + "Timestamps will be time zone agnostic (NEVER converted to a different time zone)."), - HIVE_PARQUET_TIMESTAMP_TIME_UNIT("hive.parquet.timestamp.time.unit", "millis", + HIVE_PARQUET_TIMESTAMP_TIME_UNIT("hive.parquet.timestamp.time.unit", "micros", new StringSet("nanos", "micros", "millis"), "Store parquet int64/LogicalTypes timestamps in this time unit."), diff --git a/ql/src/test/org/apache/hadoop/hive/ql/io/parquet/TestHiveSchemaConverter.java b/ql/src/test/org/apache/hadoop/hive/ql/io/parquet/TestHiveSchemaConverter.java index 0f3ca6e547..4e176a08db 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/io/parquet/TestHiveSchemaConverter.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/io/parquet/TestHiveSchemaConverter.java @@ -413,7 +413,7 @@ public void testLogicalTypes() throws Exception { testLogicalTypeAnnotation("boolean", "a", null, conf); testLogicalTypeAnnotation("binary", "a", null, conf); testLogicalTypeAnnotation("timestamp", "a", - LogicalTypeAnnotation.timestampType(false, LogicalTypeAnnotation.TimeUnit.MILLIS), conf); + LogicalTypeAnnotation.timestampType(false, LogicalTypeAnnotation.TimeUnit.MICROS), conf); testLogicalTypeAnnotation("char(3)", "a", LogicalTypeAnnotation.stringType(), conf); testLogicalTypeAnnotation("varchar(30)", "a", LogicalTypeAnnotation.stringType(), conf); testLogicalTypeAnnotation("decimal(7,2)", "a", LogicalTypeAnnotation.decimalType(2, 7), conf);