fix imports, tests

Author: Araika

ql/src/test/results/clientpositive/llap/avro_timestamp_micros.q.out

@@ -18,9 +18,9 @@ POSTHOOK: Lineage: hive_test.dt SCRIPT []
 PREHOOK: query: SELECT * FROM hive_test
 PREHOOK: type: QUERY
 PREHOOK: Input: default@hive_test
-PREHOOK: Output: hdfs://### HDFS PATH ###
+#### A masked pattern was here ####
 POSTHOOK: query: SELECT * FROM hive_test
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@hive_test
-POSTHOOK: Output: hdfs://### HDFS PATH ###
+#### A masked pattern was here ####
 2024-08-09 14:08:26.326107

serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroDeserializer.java

@@ -389,7 +389,7 @@ private Object deserializePrimitive(Object datum, Schema fileSchema, Schema reco
           skipProlepticConversion = HiveConf.ConfVars.HIVE_AVRO_PROLEPTIC_GREGORIAN_DEFAULT.defaultBoolVal;
         }
       }
-      LogicalType logicalType = recordSchema.getLogicalType();
+      LogicalType logicalType = fileSchema.getLogicalType();
       Timestamp timestamp;
       if (logicalType != null && logicalType.getName().equals(AvroSerDe.TIMESTAMP_TYPE_NAME_MICROS)) {
         timestamp = Timestamp.ofEpochMicro((Long) datum);
@@ -398,7 +398,7 @@ private Object deserializePrimitive(Object datum, Schema fileSchema, Schema reco
       }
       timestamp = TimestampTZUtil.convertTimestampToZone(
               timestamp, ZoneOffset.UTC, convertToTimeZone, legacyConversion);
-      if (!skipProlepticConversion && logicalType.getName().equals(AvroSerDe.TIMESTAMP_TYPE_NAME_MICROS)) {
+      if (!skipProlepticConversion && logicalType != null && logicalType.getName().equals(AvroSerDe.TIMESTAMP_TYPE_NAME_MICROS)) {
         timestamp = Timestamp.ofEpochMicro(
             CalendarUtils.convertTimeToProlepticMicros(timestamp.toEpochMicro()));
       } else if (!skipProlepticConversion) {

serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerializer.java

@@ -17,8 +17,6 @@
  */
 package org.apache.hadoop.hive.serde2.avro;
 
-import java.time.Instant;
-import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -237,7 +235,7 @@ private Object serializePrimitive(TypeInfo typeInfo, PrimitiveObjectInspector fi
       LogicalType logicalType = schema.getLogicalType();
       if (logicalType != null && logicalType.getName().equals(AvroSerDe.TIMESTAMP_TYPE_NAME_MICROS)) {
         long micros = defaultProleptic ? timestamp.toEpochMicro() :
-                CalendarUtils.convertTimeToProlepticMicros(timestamp.toEpochMicro());
+                CalendarUtils.convertTimeToHybridMicros(timestamp.toEpochMicro());
         timestamp = TimestampTZUtil.convertTimestampToZone(
                 Timestamp.ofEpochMicro(micros), TimeZone.getDefault().toZoneId(), ZoneOffset.UTC, legacyConversion);
         return timestamp.toEpochMicro();

serde/src/test/org/apache/hadoop/hive/serde2/avro/TestTypeInfoToSchema.java

@@ -261,7 +261,7 @@ public void createAvroDateSchema() {
   public void createAvroTimestampSchema() {
     final String specificSchema = "{" +
       "\"type\":\"long\"," +
-      "\"logicalType\":\"timestamp-millis\"}";
+      "\"logicalType\":\"timestamp-micros\"}";
     String expectedSchema = genSchema(specificSchema);
 
     Assert.assertEquals("Test for timestamp in avro schema failed",