diff --git a/itests/qtest-accumulo/pom.xml b/itests/qtest-accumulo/pom.xml index 09ae2a2..386bc2c 100644 --- a/itests/qtest-accumulo/pom.xml +++ b/itests/qtest-accumulo/pom.xml @@ -122,7 +122,7 @@ - com.esotericsoftware.kryo + com.esotericsoftware kryo ${kryo.version} test diff --git a/pom.xml b/pom.xml index 04e517b..4f40364 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ 3.5.2 20090211 4.11 - 2.22 + 3.0.3 0.9.2 0.9.2 2.4 @@ -241,8 +241,8 @@ - com.esotericsoftware.kryo - kryo + com.esotericsoftware + kryo-shaded ${kryo.version} diff --git a/ql/pom.xml b/ql/pom.xml index 83b9ebf..b0f5508 100644 --- a/ql/pom.xml +++ b/ql/pom.xml @@ -72,8 +72,8 @@ - com.esotericsoftware.kryo - kryo + com.esotericsoftware + kryo-shaded ${kryo.version} @@ -484,6 +484,12 @@ spark-core_${scala.binary.version} ${spark.version} true + + + com.esotericsoftware.kryo + kryo + + com.sun.jersey @@ -711,7 +717,9 @@ org.apache.hive:hive-serde org.apache.hive:hive-llap-client org.apache.hive:hive-metastore - com.esotericsoftware.kryo:kryo + com.esotericsoftware:kryo-shaded + com.esotericsoftware:minlog + org.objenesis:objenesis org.apache.parquet:parquet-hadoop-bundle org.apache.thrift:libthrift org.apache.thrift:libfb303 @@ -745,6 +753,10 @@ com.esotericsoftware org.apache.hive.com.esotericsoftware + + org.objenesis + org.apache.hive.org.objenesis + diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java index eb2ab56..b3aaeb1 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java @@ -75,7 +75,6 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicLong; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.zip.Deflater; @@ -193,12 +192,12 @@ import org.apache.hadoop.util.Progressable; import org.apache.hadoop.util.Shell; import org.apache.hive.common.util.ReflectionUtil; +import org.objenesis.strategy.StdInstantiatorStrategy; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; import com.esotericsoftware.kryo.serializers.FieldSerializer; -import com.esotericsoftware.shaded.org.objenesis.strategy.StdInstantiatorStrategy; import com.google.common.base.Preconditions; /** @@ -1094,7 +1093,7 @@ protected Kryo initialValue() { kryo.register(java.sql.Date.class, new SqlDateSerializer()); kryo.register(java.sql.Timestamp.class, new TimestampSerializer()); kryo.register(Path.class, new PathSerializer()); - kryo.setInstantiatorStrategy(new StdInstantiatorStrategy()); + kryo.setInstantiatorStrategy(new Kryo.DefaultInstantiatorStrategy(new StdInstantiatorStrategy())); removeField(kryo, Operator.class, "colExprMap"); removeField(kryo, ColumnInfo.class, "objectInspector"); removeField(kryo, AbstractOperatorDesc.class, "statistics"); @@ -1116,7 +1115,7 @@ protected synchronized Kryo initialValue() { kryo.register(java.sql.Date.class, new SqlDateSerializer()); kryo.register(java.sql.Timestamp.class, new TimestampSerializer()); kryo.register(Path.class, new PathSerializer()); - kryo.setInstantiatorStrategy(new StdInstantiatorStrategy()); + kryo.setInstantiatorStrategy(new Kryo.DefaultInstantiatorStrategy(new StdInstantiatorStrategy())); removeField(kryo, Operator.class, "colExprMap"); removeField(kryo, ColumnInfo.class, "objectInspector"); kryo.register(SparkEdgeProperty.class); diff --git a/spark-client/pom.xml b/spark-client/pom.xml index 1d05720..ba556cb 100644 --- a/spark-client/pom.xml +++ b/spark-client/pom.xml @@ -39,8 +39,8 @@ - com.esotericsoftware.kryo - kryo + com.esotericsoftware + kryo-shaded com.google.guava @@ -59,6 +59,12 @@ org.apache.spark spark-core_${scala.binary.version} ${spark.version} + + + com.esotericsoftware.kryo + kryo + + junit diff --git a/spark-client/src/main/java/org/apache/hive/spark/client/rpc/KryoMessageCodec.java b/spark-client/src/main/java/org/apache/hive/spark/client/rpc/KryoMessageCodec.java index 197f113..9e789cf 100644 --- a/spark-client/src/main/java/org/apache/hive/spark/client/rpc/KryoMessageCodec.java +++ b/spark-client/src/main/java/org/apache/hive/spark/client/rpc/KryoMessageCodec.java @@ -23,19 +23,20 @@ import java.util.Arrays; import java.util.List; +import org.objenesis.strategy.StdInstantiatorStrategy; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.ByteBufferInputStream; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; -import com.esotericsoftware.shaded.org.objenesis.strategy.StdInstantiatorStrategy; import com.google.common.base.Preconditions; + import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.ByteToMessageCodec; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * Codec that serializes / deserializes objects using Kryo. Objects are encoded with a 4-byte * header with the length of the serialized data. @@ -59,7 +60,7 @@ protected Kryo initialValue() { kryo.register(klass, REG_ID_BASE + count); count++; } - kryo.setInstantiatorStrategy(new StdInstantiatorStrategy()); + kryo.setInstantiatorStrategy(new Kryo.DefaultInstantiatorStrategy(new StdInstantiatorStrategy())); return kryo; } };