Update to Hive 3.1.2

pom.xml

@@ -10,7 +10,7 @@
 
     <groupId>io.prestosql.hive</groupId>
     <artifactId>hive-apache</artifactId>
-    <version>3.0.0-7-SNAPSHOT</version>
+    <version>3.1.2-1-SNAPSHOT</version>
 
     <name>hive-apache</name>
     <description>Shaded version of Apache Hive for Presto</description>
@@ -43,13 +43,12 @@
 
         <shadeBase>io.prestosql.hive.\$internal</shadeBase>
 
-        <dep.hive.version>3.0.0</dep.hive.version>
+        <dep.hive.version>3.1.2</dep.hive.version>
 
         <dep.avro.version>1.8.2</dep.avro.version>
-        <dep.jodd.version>3.5.2</dep.jodd.version>
         <dep.parquet.version>1.11.0</dep.parquet.version>
         <dep.protobuf.version>2.5.0</dep.protobuf.version>
-        <dep.slf4j.version>1.7.25</dep.slf4j.version>
+        <dep.slf4j.version>1.7.29</dep.slf4j.version>
     </properties>
 
     <dependencies>
@@ -287,10 +286,6 @@
                     <groupId>org.apache.ivy</groupId>
                     <artifactId>ivy</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>commons-httpclient</groupId>
-                    <artifactId>commons-httpclient</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>commons-io</groupId>
                     <artifactId>commons-io</artifactId>
@@ -533,12 +528,6 @@
             <version>${dep.protobuf.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.jodd</groupId>
-            <artifactId>jodd-core</artifactId>
-            <version>${dep.jodd.version}</version>
-        </dependency>
-
         <!-- hadoop compilation dependency for CodecPool -->
         <dependency>
             <groupId>org.apache.hadoop</groupId>
@@ -677,10 +666,6 @@
                                     <pattern>org.tukaani.xz</pattern>
                                     <shadedPattern>${shadeBase}.org.tukaani.xz</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>jodd</pattern>
-                                    <shadedPattern>${shadeBase}.jodd</shadedPattern>
-                                </relocation>
                                 <relocation>
                                     <pattern>com.codahale.metrics</pattern>
                                     <shadedPattern>${shadeBase}.com.codahale.metrics</shadedPattern>
@@ -725,6 +710,7 @@
                                         <exclude>hive-exec-log4j2.properties</exclude>
                                         <exclude>tez-container-log4j2.properties</exclude>
                                         <exclude>org/apache/hadoop/hive/ql/io/CodecPool*.class</exclude>
+                                        <exclude>org/apache/hadoop/hive/ql/io/parquet/timestamp/NanoTimeUtils.class</exclude>
                                         <exclude>org/apache/tez/**</exclude>
                                     </excludes>
                                 </filter>

src/main/java/org/apache/hadoop/hive/ql/io/parquet/timestamp/NanoTimeUtils.java

@@ -0,0 +1,24 @@
+package org.apache.hadoop.hive.ql.io.parquet.timestamp;
+
+import org.apache.hadoop.hive.common.type.Timestamp;
+
+import static java.lang.Math.toIntExact;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+public final class NanoTimeUtils
+{
+    private NanoTimeUtils() {}
+
+    private static final int JULIAN_EPOCH_OFFSET_DAYS = 2_440_588;
+
+    public static NanoTime getNanoTime(Timestamp timestamp, @SuppressWarnings("unused") boolean ignored)
+    {
+        int epochDay = toIntExact(SECONDS.toDays(timestamp.toEpochSecond()));
+        int julianDay = JULIAN_EPOCH_OFFSET_DAYS + epochDay;
+
+        long timeOfDaySeconds = timestamp.toEpochSecond() % 86400;
+        long timeOfDayNanos = SECONDS.toNanos(timeOfDaySeconds) + timestamp.getNanos();
+
+        return new NanoTime(julianDay, timeOfDayNanos);
+    }
+}

src/main/java/org/apache/hive/hcatalog/data/JsonSerDe.java

@@ -21,8 +21,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.charset.CharacterCodingException;
-import java.sql.Date;
-import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -34,9 +32,11 @@
 import java.util.regex.Pattern;
 
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hive.common.type.Date;
 import org.apache.hadoop.hive.common.type.HiveChar;
 import org.apache.hadoop.hive.common.type.HiveDecimal;
 import org.apache.hadoop.hive.common.type.HiveVarchar;
+import org.apache.hadoop.hive.common.type.Timestamp;
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.serde.serdeConstants;
 import org.apache.hadoop.hive.serde2.AbstractSerDe;