From eacd65e9e9b46d4b50e6f474024d9388f5842f33 Mon Sep 17 00:00:00 2001 From: Nicholas Nezis Date: Wed, 29 Jul 2020 03:08:59 -0400 Subject: [PATCH 01/13] Bumping Kryo version --- WORKSPACE | 2 +- maven_install.json | 124 ++++++++++----------- release/maven/heron-with-kryo.template.pom | 2 +- 3 files changed, 59 insertions(+), 69 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index a66fa9398ae..5cbf58108ff 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -68,7 +68,7 @@ maven_install( "antlr:antlr:2.7.7", "org.apache.zookeeper:zookeeper:3.5.8", "io.kubernetes:client-java:" + kubernetes_client_version, - "com.esotericsoftware:kryo:3.0.3", + "com.esotericsoftware:kryo:5.0.0-RC7", "org.apache.avro:avro:1.7.4", "org.apache.mesos:mesos:0.22.0", "com.hashicorp.nomad:nomad-sdk:0.7.0", diff --git a/maven_install.json b/maven_install.json index a2da79c0c9f..8cef8e66c40 100644 --- a/maven_install.json +++ b/maven_install.json @@ -1,6 +1,6 @@ { "dependency_tree": { - "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": -1332813254, + "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": 1408980268, "conflict_resolution": {}, "dependencies": [ { @@ -374,108 +374,98 @@ "url": "https://jcenter.bintray.com/com/beust/jcommander/1.48/jcommander-1.48-sources.jar" }, { - "coord": "com.esotericsoftware:kryo:3.0.3", + "coord": "com.esotericsoftware:kryo:5.0.0-RC7", "dependencies": [ - "com.esotericsoftware:minlog:1.3.0", - "org.objenesis:objenesis:2.1", - "org.ow2.asm:asm:5.0.4", - "com.esotericsoftware:reflectasm:1.10.1" + "com.esotericsoftware:minlog:1.3.1", + "com.esotericsoftware:reflectasm:1.11.8", + "org.objenesis:objenesis:2.1" ], "directDependencies": [ - "com.esotericsoftware:minlog:1.3.0", - "com.esotericsoftware:reflectasm:1.10.1", + "com.esotericsoftware:minlog:1.3.1", + "com.esotericsoftware:reflectasm:1.11.8", "org.objenesis:objenesis:2.1" ], - "file": "v1/https/jcenter.bintray.com/com/esotericsoftware/kryo/3.0.3/kryo-3.0.3.jar", + "file": "v1/https/jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC7/kryo-5.0.0-RC7.jar", "mirror_urls": [ - "https://jcenter.bintray.com/com/esotericsoftware/kryo/3.0.3/kryo-3.0.3.jar", - "https://maven.google.com/com/esotericsoftware/kryo/3.0.3/kryo-3.0.3.jar", - "https://repo1.maven.org/maven2/com/esotericsoftware/kryo/3.0.3/kryo-3.0.3.jar" + "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC7/kryo-5.0.0-RC7.jar", + "https://maven.google.com/com/esotericsoftware/kryo/5.0.0-RC7/kryo-5.0.0-RC7.jar", + "https://repo1.maven.org/maven2/com/esotericsoftware/kryo/5.0.0-RC7/kryo-5.0.0-RC7.jar" ], - "sha256": "5c295b23480225ff6e7d6770dfa904bedcec8556c27234fea0a271fe13195f69", - "url": "https://jcenter.bintray.com/com/esotericsoftware/kryo/3.0.3/kryo-3.0.3.jar" + "sha256": "017c613db166b9d896d9d89975f4bcf70b16e987efe0dcc6fcf2fd898533d078", + "url": "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC7/kryo-5.0.0-RC7.jar" }, { - "coord": "com.esotericsoftware:kryo:jar:sources:3.0.3", + "coord": "com.esotericsoftware:kryo:jar:sources:5.0.0-RC7", "dependencies": [ - "com.esotericsoftware:minlog:jar:sources:1.3.0", - "com.esotericsoftware:reflectasm:jar:sources:1.10.1", - "org.objenesis:objenesis:jar:sources:2.1", - "org.ow2.asm:asm:jar:sources:5.0.4" + "com.esotericsoftware:reflectasm:jar:sources:1.11.8", + "com.esotericsoftware:minlog:jar:sources:1.3.1", + "org.objenesis:objenesis:jar:sources:2.1" ], "directDependencies": [ - "com.esotericsoftware:minlog:jar:sources:1.3.0", - "com.esotericsoftware:reflectasm:jar:sources:1.10.1", + "com.esotericsoftware:minlog:jar:sources:1.3.1", + "com.esotericsoftware:reflectasm:jar:sources:1.11.8", "org.objenesis:objenesis:jar:sources:2.1" ], - "file": "v1/https/jcenter.bintray.com/com/esotericsoftware/kryo/3.0.3/kryo-3.0.3-sources.jar", + "file": "v1/https/jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC7/kryo-5.0.0-RC7-sources.jar", "mirror_urls": [ - "https://jcenter.bintray.com/com/esotericsoftware/kryo/3.0.3/kryo-3.0.3-sources.jar", - "https://maven.google.com/com/esotericsoftware/kryo/3.0.3/kryo-3.0.3-sources.jar", - "https://repo1.maven.org/maven2/com/esotericsoftware/kryo/3.0.3/kryo-3.0.3-sources.jar" + "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC7/kryo-5.0.0-RC7-sources.jar", + "https://maven.google.com/com/esotericsoftware/kryo/5.0.0-RC7/kryo-5.0.0-RC7-sources.jar", + "https://repo1.maven.org/maven2/com/esotericsoftware/kryo/5.0.0-RC7/kryo-5.0.0-RC7-sources.jar" ], - "sha256": "5a02ca261f78e21ad030e5f8ac5dc61bf93160128e53d98ef0be41dbe6dbf4a6", - "url": "https://jcenter.bintray.com/com/esotericsoftware/kryo/3.0.3/kryo-3.0.3-sources.jar" + "sha256": "0a9e84c625be8e7ba710b78cc55a741e8c90203debe0f871de7fcaeaa50cb2ca", + "url": "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC7/kryo-5.0.0-RC7-sources.jar" }, { - "coord": "com.esotericsoftware:minlog:1.3.0", + "coord": "com.esotericsoftware:minlog:1.3.1", "dependencies": [], "directDependencies": [], - "file": "v1/https/jcenter.bintray.com/com/esotericsoftware/minlog/1.3.0/minlog-1.3.0.jar", + "file": "v1/https/jcenter.bintray.com/com/esotericsoftware/minlog/1.3.1/minlog-1.3.1.jar", "mirror_urls": [ - "https://jcenter.bintray.com/com/esotericsoftware/minlog/1.3.0/minlog-1.3.0.jar", - "https://maven.google.com/com/esotericsoftware/minlog/1.3.0/minlog-1.3.0.jar", - "https://repo1.maven.org/maven2/com/esotericsoftware/minlog/1.3.0/minlog-1.3.0.jar" + "https://jcenter.bintray.com/com/esotericsoftware/minlog/1.3.1/minlog-1.3.1.jar", + "https://maven.google.com/com/esotericsoftware/minlog/1.3.1/minlog-1.3.1.jar", + "https://repo1.maven.org/maven2/com/esotericsoftware/minlog/1.3.1/minlog-1.3.1.jar" ], - "sha256": "f7b399d3a5478a4f3e0d98bd1c9f47766119c66414bc33aa0f6cde0066f24cc2", - "url": "https://jcenter.bintray.com/com/esotericsoftware/minlog/1.3.0/minlog-1.3.0.jar" + "sha256": "5d4d632cfbebfe0a7644501cc303570b691406181bee65e9916b921c767d7c72", + "url": "https://jcenter.bintray.com/com/esotericsoftware/minlog/1.3.1/minlog-1.3.1.jar" }, { - "coord": "com.esotericsoftware:minlog:jar:sources:1.3.0", + "coord": "com.esotericsoftware:minlog:jar:sources:1.3.1", "dependencies": [], "directDependencies": [], - "file": "v1/https/jcenter.bintray.com/com/esotericsoftware/minlog/1.3.0/minlog-1.3.0-sources.jar", + "file": "v1/https/jcenter.bintray.com/com/esotericsoftware/minlog/1.3.1/minlog-1.3.1-sources.jar", "mirror_urls": [ - "https://jcenter.bintray.com/com/esotericsoftware/minlog/1.3.0/minlog-1.3.0-sources.jar", - "https://maven.google.com/com/esotericsoftware/minlog/1.3.0/minlog-1.3.0-sources.jar", - "https://repo1.maven.org/maven2/com/esotericsoftware/minlog/1.3.0/minlog-1.3.0-sources.jar" + "https://jcenter.bintray.com/com/esotericsoftware/minlog/1.3.1/minlog-1.3.1-sources.jar", + "https://maven.google.com/com/esotericsoftware/minlog/1.3.1/minlog-1.3.1-sources.jar", + "https://repo1.maven.org/maven2/com/esotericsoftware/minlog/1.3.1/minlog-1.3.1-sources.jar" ], - "sha256": "99872e1e68874771d77bf3131620bf656b541fa993d3f6e9d29b9f03ae423d17", - "url": "https://jcenter.bintray.com/com/esotericsoftware/minlog/1.3.0/minlog-1.3.0-sources.jar" + "sha256": "fdaf83a8c51295eff3a8109473ce7b213582738f71593e16b1efa012ff1f99b5", + "url": "https://jcenter.bintray.com/com/esotericsoftware/minlog/1.3.1/minlog-1.3.1-sources.jar" }, { - "coord": "com.esotericsoftware:reflectasm:1.10.1", - "dependencies": [ - "org.ow2.asm:asm:5.0.4" - ], - "directDependencies": [ - "org.ow2.asm:asm:5.0.4" - ], - "file": "v1/https/jcenter.bintray.com/com/esotericsoftware/reflectasm/1.10.1/reflectasm-1.10.1.jar", + "coord": "com.esotericsoftware:reflectasm:1.11.8", + "dependencies": [], + "directDependencies": [], + "file": "v1/https/jcenter.bintray.com/com/esotericsoftware/reflectasm/1.11.8/reflectasm-1.11.8.jar", "mirror_urls": [ - "https://jcenter.bintray.com/com/esotericsoftware/reflectasm/1.10.1/reflectasm-1.10.1.jar", - "https://maven.google.com/com/esotericsoftware/reflectasm/1.10.1/reflectasm-1.10.1.jar", - "https://repo1.maven.org/maven2/com/esotericsoftware/reflectasm/1.10.1/reflectasm-1.10.1.jar" + "https://jcenter.bintray.com/com/esotericsoftware/reflectasm/1.11.8/reflectasm-1.11.8.jar", + "https://maven.google.com/com/esotericsoftware/reflectasm/1.11.8/reflectasm-1.11.8.jar", + "https://repo1.maven.org/maven2/com/esotericsoftware/reflectasm/1.11.8/reflectasm-1.11.8.jar" ], - "sha256": "94867942701229aead2b99cfbfdb68ea0afe4ec6fb943e5a10cb875f6e94f5b4", - "url": "https://jcenter.bintray.com/com/esotericsoftware/reflectasm/1.10.1/reflectasm-1.10.1.jar" + "sha256": "d91dc2db686c0389763ae2253e43cfd1c7e175efcceeb3c59778d6deb86bef90", + "url": "https://jcenter.bintray.com/com/esotericsoftware/reflectasm/1.11.8/reflectasm-1.11.8.jar" }, { - "coord": "com.esotericsoftware:reflectasm:jar:sources:1.10.1", - "dependencies": [ - "org.ow2.asm:asm:jar:sources:5.0.4" - ], - "directDependencies": [ - "org.ow2.asm:asm:jar:sources:5.0.4" - ], - "file": "v1/https/jcenter.bintray.com/com/esotericsoftware/reflectasm/1.10.1/reflectasm-1.10.1-sources.jar", + "coord": "com.esotericsoftware:reflectasm:jar:sources:1.11.8", + "dependencies": [], + "directDependencies": [], + "file": "v1/https/jcenter.bintray.com/com/esotericsoftware/reflectasm/1.11.8/reflectasm-1.11.8-sources.jar", "mirror_urls": [ - "https://jcenter.bintray.com/com/esotericsoftware/reflectasm/1.10.1/reflectasm-1.10.1-sources.jar", - "https://maven.google.com/com/esotericsoftware/reflectasm/1.10.1/reflectasm-1.10.1-sources.jar", - "https://repo1.maven.org/maven2/com/esotericsoftware/reflectasm/1.10.1/reflectasm-1.10.1-sources.jar" + "https://jcenter.bintray.com/com/esotericsoftware/reflectasm/1.11.8/reflectasm-1.11.8-sources.jar", + "https://maven.google.com/com/esotericsoftware/reflectasm/1.11.8/reflectasm-1.11.8-sources.jar", + "https://repo1.maven.org/maven2/com/esotericsoftware/reflectasm/1.11.8/reflectasm-1.11.8-sources.jar" ], - "sha256": "5d46267d7130e2d5963472dbb2a975ae764ec9f616c1c9b7e7961fcc600d38a0", - "url": "https://jcenter.bintray.com/com/esotericsoftware/reflectasm/1.10.1/reflectasm-1.10.1-sources.jar" + "sha256": "f5261244cee0661d1dc0ae4c465e13654e3ee787ce32e25e784f32b51d13ce58", + "url": "https://jcenter.bintray.com/com/esotericsoftware/reflectasm/1.11.8/reflectasm-1.11.8-sources.jar" }, { "coord": "com.fasterxml.jackson.core:jackson-annotations:2.8.8", diff --git a/release/maven/heron-with-kryo.template.pom b/release/maven/heron-with-kryo.template.pom index 6413908c02e..3bb9b3db0a2 100644 --- a/release/maven/heron-with-kryo.template.pom +++ b/release/maven/heron-with-kryo.template.pom @@ -36,7 +36,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma com.esotericsoftware kryo - 3.0.3 + 5.0.0-RC7 compile From e362cbef27860a4508fc0365410bfce3d3af749c Mon Sep 17 00:00:00 2001 From: Nicholas Nezis Date: Sun, 2 Aug 2020 01:17:12 -0400 Subject: [PATCH 02/13] Initial kryo upgrade --- .../heron/api/serializer/KryoSerializer.java | 26 +++----------- .../HeronPluggableSerializerDelegate.java | 2 +- .../serialization/SerializationFactory.java | 6 ++-- .../types/ArrayListSerializer.java | 36 ------------------- .../types/HashMapSerializer.java | 36 ------------------- .../types/HashSetSerializer.java | 2 +- .../HeronPluggableSerializerDelegate.java | 2 +- .../serialization/SerializationFactory.java | 6 ++-- .../types/ArrayListSerializer.java | 36 ------------------- .../types/HashMapSerializer.java | 36 ------------------- .../types/HashSetSerializer.java | 2 +- .../HeronPluggableSerializerDelegate.java | 2 +- .../serialization/SerializationFactory.java | 11 +++--- .../types/ArrayListSerializer.java | 36 ------------------- .../types/HashMapSerializer.java | 36 ------------------- .../types/HashSetSerializer.java | 2 +- 16 files changed, 20 insertions(+), 257 deletions(-) delete mode 100644 storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/types/ArrayListSerializer.java delete mode 100644 storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/types/HashMapSerializer.java delete mode 100644 storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/types/ArrayListSerializer.java delete mode 100644 storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/types/HashMapSerializer.java delete mode 100644 storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/types/ArrayListSerializer.java delete mode 100644 storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/types/HashMapSerializer.java diff --git a/heron/api/src/java/org/apache/heron/api/serializer/KryoSerializer.java b/heron/api/src/java/org/apache/heron/api/serializer/KryoSerializer.java index fe7ebf51665..e143d00fa8e 100644 --- a/heron/api/src/java/org/apache/heron/api/serializer/KryoSerializer.java +++ b/heron/api/src/java/org/apache/heron/api/serializer/KryoSerializer.java @@ -37,8 +37,8 @@ import com.esotericsoftware.kryo.io.Output; import com.esotericsoftware.kryo.serializers.CollectionSerializer; import com.esotericsoftware.kryo.serializers.DefaultSerializers; -import com.esotericsoftware.kryo.serializers.MapSerializer; +import com.esotericsoftware.kryo.serializers.MapSerializer; import org.apache.heron.api.Config; import org.apache.heron.api.tuple.Values; import org.apache.heron.api.utils.Utils; @@ -79,7 +79,7 @@ public void initialize(Map config) { @Override public byte[] serialize(Object object) { - kryoOut.clear(); + kryoOut.reset(); kryo.writeClassAndObject(kryoOut, object); return kryoOut.toBytes(); } @@ -94,8 +94,8 @@ public Object deserialize(byte[] input) { private static void registerDefaultSerializers(Kryo k) { // Default serializers k.register(byte[].class); - k.register(ArrayList.class, new ArrayListSerializer()); - k.register(HashMap.class, new HashMapSerializer()); + k.register(ArrayList.class); + k.register(HashMap.class); k.register(HashSet.class, new HashSetSerializer()); k.register(BigInteger.class, new DefaultSerializers.BigIntegerSerializer()); k.register(Values.class); @@ -218,26 +218,10 @@ private static Serializer resolveSerializerInstance( serializerClass.getName(), superClass.getName())); } - private static class ArrayListSerializer extends CollectionSerializer { - @Override - @SuppressWarnings("rawtypes") // extending Kryo class that uses raw types - public Collection create(Kryo k, Input input, Class type) { - return new ArrayList(); - } - } - - private static class HashMapSerializer extends MapSerializer { - @Override - @SuppressWarnings("rawtypes") // extending kryo class signature that takes Map - public Map create(Kryo k, Input input, Class type) { - return new HashMap<>(); - } - } - private static class HashSetSerializer extends CollectionSerializer { @Override @SuppressWarnings("rawtypes") // extending Kryo class that uses raw types - public Collection create(Kryo k, Input input, Class type) { + public Collection create(Kryo kryo, Input input, Class type, int size) { return new HashSet(); } } diff --git a/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/HeronPluggableSerializerDelegate.java b/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/HeronPluggableSerializerDelegate.java index bc0daef2b21..382f9f59b0b 100644 --- a/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/HeronPluggableSerializerDelegate.java +++ b/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/HeronPluggableSerializerDelegate.java @@ -44,7 +44,7 @@ public void initialize(Map config) { @Override public byte[] serialize(Object object) { - kryoOut.clear(); + kryoOut.reset(); kryo.writeClassAndObject(kryoOut, object); return kryoOut.toBytes(); } diff --git a/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/SerializationFactory.java b/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/SerializationFactory.java index 8ed559fd2b4..5be62ef48a5 100644 --- a/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/SerializationFactory.java +++ b/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/SerializationFactory.java @@ -35,8 +35,6 @@ import com.esotericsoftware.kryo.serializers.DefaultSerializers.BigIntegerSerializer; import backtype.storm.Config; -import backtype.storm.serialization.types.ArrayListSerializer; -import backtype.storm.serialization.types.HashMapSerializer; import backtype.storm.serialization.types.HashSetSerializer; import backtype.storm.tuple.Values; import backtype.storm.utils.ListDelegate; @@ -60,8 +58,8 @@ public static Kryo getKryo(Map conf) { Kryo k = kryoFactory.getKryo(conf); k.register(byte[].class); k.register(ListDelegate.class); - k.register(ArrayList.class, new ArrayListSerializer()); - k.register(HashMap.class, new HashMapSerializer()); + k.register(ArrayList.class); + k.register(HashMap.class); k.register(HashSet.class, new HashSetSerializer()); k.register(BigInteger.class, new BigIntegerSerializer()); // k.register(TransactionAttempt.class); diff --git a/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/types/ArrayListSerializer.java b/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/types/ArrayListSerializer.java deleted file mode 100644 index 28b885d0994..00000000000 --- a/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/types/ArrayListSerializer.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package backtype.storm.serialization.types; - -import java.util.ArrayList; -import java.util.Collection; - -import com.esotericsoftware.kryo.Kryo; -import com.esotericsoftware.kryo.io.Input; -import com.esotericsoftware.kryo.serializers.CollectionSerializer; - - -public class ArrayListSerializer extends CollectionSerializer { - @Override - @SuppressWarnings("rawtypes") // extending Kryo class that uses raw types - public Collection create(Kryo kryo, Input input, Class type) { - return new ArrayList(); - } -} diff --git a/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/types/HashMapSerializer.java b/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/types/HashMapSerializer.java deleted file mode 100644 index 8e95658bccc..00000000000 --- a/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/types/HashMapSerializer.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package backtype.storm.serialization.types; - -import java.util.HashMap; -import java.util.Map; - -import com.esotericsoftware.kryo.Kryo; -import com.esotericsoftware.kryo.io.Input; -import com.esotericsoftware.kryo.serializers.MapSerializer; - - -public class HashMapSerializer extends MapSerializer { - @Override - @SuppressWarnings("rawtypes") // extending kryo class signature that takes Map - public Map create(Kryo kryo, Input input, Class type) { - return new HashMap(); - } -} diff --git a/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/types/HashSetSerializer.java b/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/types/HashSetSerializer.java index 824bf04ee7f..3e3fdc3d752 100644 --- a/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/types/HashSetSerializer.java +++ b/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/types/HashSetSerializer.java @@ -30,7 +30,7 @@ public class HashSetSerializer extends CollectionSerializer { @Override @SuppressWarnings("rawtypes") // extending Kryo class that uses raw types - public Collection create(Kryo kryo, Input input, Class type) { + protected Collection create(Kryo kryo, Input input, Class type, int size) { return new HashSet(); } } diff --git a/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/HeronPluggableSerializerDelegate.java b/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/HeronPluggableSerializerDelegate.java index 6ad7569f874..5731af51055 100644 --- a/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/HeronPluggableSerializerDelegate.java +++ b/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/HeronPluggableSerializerDelegate.java @@ -44,7 +44,7 @@ public void initialize(Map config) { @Override public byte[] serialize(Object object) { - kryoOut.clear(); + kryoOut.reset(); kryo.writeClassAndObject(kryoOut, object); return kryoOut.toBytes(); } diff --git a/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/SerializationFactory.java b/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/SerializationFactory.java index 47102a63e0c..081d9e3fc07 100644 --- a/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/SerializationFactory.java +++ b/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/SerializationFactory.java @@ -35,8 +35,6 @@ import com.esotericsoftware.kryo.serializers.DefaultSerializers.BigIntegerSerializer; import org.apache.storm.Config; -import org.apache.storm.serialization.types.ArrayListSerializer; -import org.apache.storm.serialization.types.HashMapSerializer; import org.apache.storm.serialization.types.HashSetSerializer; import org.apache.storm.tuple.Values; import org.apache.storm.utils.ListDelegate; @@ -61,8 +59,8 @@ public static Kryo getKryo(Map conf) { Kryo k = kryoFactory.getKryo(conf); k.register(byte[].class); k.register(ListDelegate.class); - k.register(ArrayList.class, new ArrayListSerializer()); - k.register(HashMap.class, new HashMapSerializer()); + k.register(ArrayList.class); + k.register(HashMap.class); k.register(HashSet.class, new HashSetSerializer()); k.register(BigInteger.class, new BigIntegerSerializer()); // k.register(TransactionAttempt.class); diff --git a/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/types/ArrayListSerializer.java b/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/types/ArrayListSerializer.java deleted file mode 100644 index 427bd6f1759..00000000000 --- a/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/types/ArrayListSerializer.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.storm.serialization.types; - -import java.util.ArrayList; -import java.util.Collection; - -import com.esotericsoftware.kryo.Kryo; -import com.esotericsoftware.kryo.io.Input; -import com.esotericsoftware.kryo.serializers.CollectionSerializer; - - -public class ArrayListSerializer extends CollectionSerializer { - @Override - @SuppressWarnings("rawtypes") // extending Kryo class that uses raw types - public Collection create(Kryo kryo, Input input, Class type) { - return new ArrayList(); - } -} diff --git a/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/types/HashMapSerializer.java b/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/types/HashMapSerializer.java deleted file mode 100644 index c75b93a0dfe..00000000000 --- a/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/types/HashMapSerializer.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.storm.serialization.types; - -import java.util.HashMap; -import java.util.Map; - -import com.esotericsoftware.kryo.Kryo; -import com.esotericsoftware.kryo.io.Input; -import com.esotericsoftware.kryo.serializers.MapSerializer; - - -public class HashMapSerializer extends MapSerializer { - @Override - @SuppressWarnings("rawtypes") // extending Kryo class that uses raw types - public Map create(Kryo kryo, Input input, Class type) { - return new HashMap(); - } -} diff --git a/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/types/HashSetSerializer.java b/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/types/HashSetSerializer.java index cf41a6f41de..179ddb946af 100644 --- a/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/types/HashSetSerializer.java +++ b/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/types/HashSetSerializer.java @@ -30,7 +30,7 @@ public class HashSetSerializer extends CollectionSerializer { @Override @SuppressWarnings("rawtypes") // extending Kryo class that uses raw types - public Collection create(Kryo kryo, Input input, Class type) { + protected Collection create(Kryo kryo, Input input, Class type, int size) { return new HashSet(); } } diff --git a/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/HeronPluggableSerializerDelegate.java b/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/HeronPluggableSerializerDelegate.java index 6ad7569f874..5731af51055 100644 --- a/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/HeronPluggableSerializerDelegate.java +++ b/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/HeronPluggableSerializerDelegate.java @@ -44,7 +44,7 @@ public void initialize(Map config) { @Override public byte[] serialize(Object object) { - kryoOut.clear(); + kryoOut.reset(); kryo.writeClassAndObject(kryoOut, object); return kryoOut.toBytes(); } diff --git a/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/SerializationFactory.java b/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/SerializationFactory.java index 47102a63e0c..ec8ed20c790 100644 --- a/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/SerializationFactory.java +++ b/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/SerializationFactory.java @@ -32,11 +32,10 @@ import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.Serializer; +import com.esotericsoftware.kryo.serializers.CollectionSerializer; import com.esotericsoftware.kryo.serializers.DefaultSerializers.BigIntegerSerializer; import org.apache.storm.Config; -import org.apache.storm.serialization.types.ArrayListSerializer; -import org.apache.storm.serialization.types.HashMapSerializer; import org.apache.storm.serialization.types.HashSetSerializer; import org.apache.storm.tuple.Values; import org.apache.storm.utils.ListDelegate; @@ -61,8 +60,8 @@ public static Kryo getKryo(Map conf) { Kryo k = kryoFactory.getKryo(conf); k.register(byte[].class); k.register(ListDelegate.class); - k.register(ArrayList.class, new ArrayListSerializer()); - k.register(HashMap.class, new HashMapSerializer()); + k.register(ArrayList.class); + k.register(HashMap.class); k.register(HashSet.class, new HashSetSerializer()); k.register(BigInteger.class, new BigIntegerSerializer()); // k.register(TransactionAttempt.class); @@ -166,8 +165,8 @@ private static Serializer resolveSerializerInstance( } try { - return serializerClass.newInstance(); - } catch (InstantiationException | IllegalAccessException ex) { + return serializerClass.getDeclaredConstructor().newInstance(); + } catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException ex) { // do nothing } diff --git a/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/types/ArrayListSerializer.java b/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/types/ArrayListSerializer.java deleted file mode 100644 index 427bd6f1759..00000000000 --- a/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/types/ArrayListSerializer.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.storm.serialization.types; - -import java.util.ArrayList; -import java.util.Collection; - -import com.esotericsoftware.kryo.Kryo; -import com.esotericsoftware.kryo.io.Input; -import com.esotericsoftware.kryo.serializers.CollectionSerializer; - - -public class ArrayListSerializer extends CollectionSerializer { - @Override - @SuppressWarnings("rawtypes") // extending Kryo class that uses raw types - public Collection create(Kryo kryo, Input input, Class type) { - return new ArrayList(); - } -} diff --git a/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/types/HashMapSerializer.java b/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/types/HashMapSerializer.java deleted file mode 100644 index c75b93a0dfe..00000000000 --- a/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/types/HashMapSerializer.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.storm.serialization.types; - -import java.util.HashMap; -import java.util.Map; - -import com.esotericsoftware.kryo.Kryo; -import com.esotericsoftware.kryo.io.Input; -import com.esotericsoftware.kryo.serializers.MapSerializer; - - -public class HashMapSerializer extends MapSerializer { - @Override - @SuppressWarnings("rawtypes") // extending Kryo class that uses raw types - public Map create(Kryo kryo, Input input, Class type) { - return new HashMap(); - } -} diff --git a/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/types/HashSetSerializer.java b/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/types/HashSetSerializer.java index cf41a6f41de..179ddb946af 100644 --- a/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/types/HashSetSerializer.java +++ b/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/types/HashSetSerializer.java @@ -30,7 +30,7 @@ public class HashSetSerializer extends CollectionSerializer { @Override @SuppressWarnings("rawtypes") // extending Kryo class that uses raw types - public Collection create(Kryo kryo, Input input, Class type) { + protected Collection create(Kryo kryo, Input input, Class type, int size) { return new HashSet(); } } From fbed65919f6b40a4c5c069af6708d8a7362621b4 Mon Sep 17 00:00:00 2001 From: Nicholas Nezis Date: Sun, 2 Aug 2020 03:06:28 -0400 Subject: [PATCH 03/13] Style cleanup --- .../src/java/org/apache/heron/api/serializer/KryoSerializer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/heron/api/src/java/org/apache/heron/api/serializer/KryoSerializer.java b/heron/api/src/java/org/apache/heron/api/serializer/KryoSerializer.java index e143d00fa8e..ab66f55829a 100644 --- a/heron/api/src/java/org/apache/heron/api/serializer/KryoSerializer.java +++ b/heron/api/src/java/org/apache/heron/api/serializer/KryoSerializer.java @@ -38,7 +38,6 @@ import com.esotericsoftware.kryo.serializers.CollectionSerializer; import com.esotericsoftware.kryo.serializers.DefaultSerializers; -import com.esotericsoftware.kryo.serializers.MapSerializer; import org.apache.heron.api.Config; import org.apache.heron.api.tuple.Values; import org.apache.heron.api.utils.Utils; From 1e71211e7f77a0b959107e0f73a2751bc2441e4e Mon Sep 17 00:00:00 2001 From: Nicholas Nezis Date: Sun, 2 Aug 2020 15:08:35 -0400 Subject: [PATCH 04/13] Removing rawtypes suppression --- .../org/apache/heron/api/serializer/KryoSerializer.java | 7 +++---- .../storm/serialization/types/HashSetSerializer.java | 8 +++----- .../storm/serialization/types/HashSetSerializer.java | 8 +++----- .../storm/serialization/types/HashSetSerializer.java | 8 +++----- 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/heron/api/src/java/org/apache/heron/api/serializer/KryoSerializer.java b/heron/api/src/java/org/apache/heron/api/serializer/KryoSerializer.java index ab66f55829a..aaf869bea80 100644 --- a/heron/api/src/java/org/apache/heron/api/serializer/KryoSerializer.java +++ b/heron/api/src/java/org/apache/heron/api/serializer/KryoSerializer.java @@ -217,11 +217,10 @@ private static Serializer resolveSerializerInstance( serializerClass.getName(), superClass.getName())); } - private static class HashSetSerializer extends CollectionSerializer { + private static class HashSetSerializer extends CollectionSerializer> { @Override - @SuppressWarnings("rawtypes") // extending Kryo class that uses raw types - public Collection create(Kryo kryo, Input input, Class type, int size) { - return new HashSet(); + public HashSet create(Kryo kryo, Input input, Class> type, int size) { + return new HashSet<>(size); } } } diff --git a/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/types/HashSetSerializer.java b/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/types/HashSetSerializer.java index 3e3fdc3d752..ba55c6f9217 100644 --- a/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/types/HashSetSerializer.java +++ b/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/types/HashSetSerializer.java @@ -26,11 +26,9 @@ import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.serializers.CollectionSerializer; - -public class HashSetSerializer extends CollectionSerializer { +public class HashSetSerializer extends CollectionSerializer> { @Override - @SuppressWarnings("rawtypes") // extending Kryo class that uses raw types - protected Collection create(Kryo kryo, Input input, Class type, int size) { - return new HashSet(); + public HashSet create(Kryo kryo, Input input, Class> type, int size) { + return new HashSet<>(size); } } diff --git a/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/types/HashSetSerializer.java b/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/types/HashSetSerializer.java index 179ddb946af..4039241fab0 100644 --- a/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/types/HashSetSerializer.java +++ b/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/types/HashSetSerializer.java @@ -26,11 +26,9 @@ import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.serializers.CollectionSerializer; - -public class HashSetSerializer extends CollectionSerializer { +public class HashSetSerializer extends CollectionSerializer> { @Override - @SuppressWarnings("rawtypes") // extending Kryo class that uses raw types - protected Collection create(Kryo kryo, Input input, Class type, int size) { - return new HashSet(); + public HashSet create(Kryo kryo, Input input, Class> type, int size) { + return new HashSet<>(size); } } diff --git a/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/types/HashSetSerializer.java b/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/types/HashSetSerializer.java index 179ddb946af..4039241fab0 100644 --- a/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/types/HashSetSerializer.java +++ b/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/types/HashSetSerializer.java @@ -26,11 +26,9 @@ import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.serializers.CollectionSerializer; - -public class HashSetSerializer extends CollectionSerializer { +public class HashSetSerializer extends CollectionSerializer> { @Override - @SuppressWarnings("rawtypes") // extending Kryo class that uses raw types - protected Collection create(Kryo kryo, Input input, Class type, int size) { - return new HashSet(); + public HashSet create(Kryo kryo, Input input, Class> type, int size) { + return new HashSet<>(size); } } From a51410a10ac88711f6028324f6aa6263d8aa4ab9 Mon Sep 17 00:00:00 2001 From: Nicholas Nezis Date: Sun, 2 Aug 2020 22:34:13 -0400 Subject: [PATCH 05/13] Removing unused import --- .../backtype/storm/serialization/types/HashSetSerializer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/types/HashSetSerializer.java b/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/types/HashSetSerializer.java index ba55c6f9217..09e38e046c3 100644 --- a/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/types/HashSetSerializer.java +++ b/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/types/HashSetSerializer.java @@ -19,7 +19,6 @@ package backtype.storm.serialization.types; -import java.util.Collection; import java.util.HashSet; import com.esotericsoftware.kryo.Kryo; From 44bbd3c78e112f203082d6c45847f97087cb3559 Mon Sep 17 00:00:00 2001 From: Nicholas Nezis Date: Mon, 3 Aug 2020 00:50:54 -0400 Subject: [PATCH 06/13] Removing unused import --- .../src/java/org/apache/heron/api/serializer/KryoSerializer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/heron/api/src/java/org/apache/heron/api/serializer/KryoSerializer.java b/heron/api/src/java/org/apache/heron/api/serializer/KryoSerializer.java index aaf869bea80..d0daf77e608 100644 --- a/heron/api/src/java/org/apache/heron/api/serializer/KryoSerializer.java +++ b/heron/api/src/java/org/apache/heron/api/serializer/KryoSerializer.java @@ -23,7 +23,6 @@ import java.lang.reflect.InvocationTargetException; import java.math.BigInteger; import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.List; From f4164d9acbbbadbc158e092625c5ffa6a772fb7a Mon Sep 17 00:00:00 2001 From: Nicholas Nezis Date: Mon, 3 Aug 2020 00:52:02 -0400 Subject: [PATCH 07/13] Add Kryo serialization to one of the API examples --- examples/src/java/BUILD | 1 + .../src/java/org/apache/heron/examples/api/AckingTopology.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/examples/src/java/BUILD b/examples/src/java/BUILD index 8d9e823c6cf..22813fc537a 100644 --- a/examples/src/java/BUILD +++ b/examples/src/java/BUILD @@ -10,6 +10,7 @@ java_binary( "//heron/api/src/java:api-java-low-level", "//heron/common/src/java:basics-java", "//heron/simulator/src/java:simulator-java", + "//third_party/java:kryo", ], ) diff --git a/examples/src/java/org/apache/heron/examples/api/AckingTopology.java b/examples/src/java/org/apache/heron/examples/api/AckingTopology.java index 13a4b4b3a8b..12bdfadbd4e 100644 --- a/examples/src/java/org/apache/heron/examples/api/AckingTopology.java +++ b/examples/src/java/org/apache/heron/examples/api/AckingTopology.java @@ -60,6 +60,8 @@ public static void main(String[] args) throws Exception { Config conf = new Config(); conf.setDebug(true); + conf.setSerializationClassName(Config.HERON_KRYO_SERIALIZER_CLASS_NAME); + // Specifies that all tuples will be automatically failed if not acked within 10 seconds conf.setMessageTimeoutSecs(10); From 49ece221eed1329aadc213f2be4801e5feea929d Mon Sep 17 00:00:00 2001 From: Nicholas Nezis Date: Mon, 3 Aug 2020 02:42:58 -0400 Subject: [PATCH 08/13] Removing unused import --- .../org/apache/storm/serialization/types/HashSetSerializer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/types/HashSetSerializer.java b/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/types/HashSetSerializer.java index 4039241fab0..62af6d99800 100644 --- a/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/types/HashSetSerializer.java +++ b/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/types/HashSetSerializer.java @@ -19,7 +19,6 @@ package org.apache.storm.serialization.types; -import java.util.Collection; import java.util.HashSet; import com.esotericsoftware.kryo.Kryo; From dc744de6aa2fee8ccef060170a93b651dd692115 Mon Sep 17 00:00:00 2001 From: Nicholas Nezis Date: Mon, 3 Aug 2020 10:30:49 -0400 Subject: [PATCH 09/13] Removing unused import --- .../org/apache/storm/serialization/types/HashSetSerializer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/types/HashSetSerializer.java b/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/types/HashSetSerializer.java index 4039241fab0..62af6d99800 100644 --- a/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/types/HashSetSerializer.java +++ b/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/types/HashSetSerializer.java @@ -19,7 +19,6 @@ package org.apache.storm.serialization.types; -import java.util.Collection; import java.util.HashSet; import com.esotericsoftware.kryo.Kryo; From 6e02cf522336f22ff93974237f54e9b0da94d1c6 Mon Sep 17 00:00:00 2001 From: Nicholas Nezis Date: Wed, 5 Aug 2020 23:33:23 -0400 Subject: [PATCH 10/13] Removing HashSetSerializer This is in preperation for Kryo 5.0.0 --- .../heron/api/serializer/KryoSerializer.java | 9 +---- .../serialization/SerializationFactory.java | 3 +- .../types/HashSetSerializer.java | 33 ------------------- .../serialization/SerializationFactory.java | 3 +- .../types/HashSetSerializer.java | 33 ------------------- .../serialization/SerializationFactory.java | 3 +- .../types/HashSetSerializer.java | 33 ------------------- 7 files changed, 4 insertions(+), 113 deletions(-) delete mode 100644 storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/types/HashSetSerializer.java delete mode 100644 storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/types/HashSetSerializer.java delete mode 100644 storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/types/HashSetSerializer.java diff --git a/heron/api/src/java/org/apache/heron/api/serializer/KryoSerializer.java b/heron/api/src/java/org/apache/heron/api/serializer/KryoSerializer.java index d0daf77e608..732b14fdf03 100644 --- a/heron/api/src/java/org/apache/heron/api/serializer/KryoSerializer.java +++ b/heron/api/src/java/org/apache/heron/api/serializer/KryoSerializer.java @@ -94,7 +94,7 @@ private static void registerDefaultSerializers(Kryo k) { k.register(byte[].class); k.register(ArrayList.class); k.register(HashMap.class); - k.register(HashSet.class, new HashSetSerializer()); + k.register(HashSet.class); k.register(BigInteger.class, new DefaultSerializers.BigIntegerSerializer()); k.register(Values.class); } @@ -215,11 +215,4 @@ private static Serializer resolveSerializerInstance( String.format("Unable to create serializer \"%s\" for class: %s", serializerClass.getName(), superClass.getName())); } - - private static class HashSetSerializer extends CollectionSerializer> { - @Override - public HashSet create(Kryo kryo, Input input, Class> type, int size) { - return new HashSet<>(size); - } - } } diff --git a/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/SerializationFactory.java b/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/SerializationFactory.java index 5be62ef48a5..5188853b295 100644 --- a/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/SerializationFactory.java +++ b/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/SerializationFactory.java @@ -35,7 +35,6 @@ import com.esotericsoftware.kryo.serializers.DefaultSerializers.BigIntegerSerializer; import backtype.storm.Config; -import backtype.storm.serialization.types.HashSetSerializer; import backtype.storm.tuple.Values; import backtype.storm.utils.ListDelegate; import backtype.storm.utils.Utils; @@ -60,7 +59,7 @@ public static Kryo getKryo(Map conf) { k.register(ListDelegate.class); k.register(ArrayList.class); k.register(HashMap.class); - k.register(HashSet.class, new HashSetSerializer()); + k.register(HashSet.class); k.register(BigInteger.class, new BigIntegerSerializer()); // k.register(TransactionAttempt.class); k.register(Values.class); diff --git a/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/types/HashSetSerializer.java b/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/types/HashSetSerializer.java deleted file mode 100644 index 09e38e046c3..00000000000 --- a/storm-compatibility/v0.10.2/src/java/backtype/storm/serialization/types/HashSetSerializer.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package backtype.storm.serialization.types; - -import java.util.HashSet; - -import com.esotericsoftware.kryo.Kryo; -import com.esotericsoftware.kryo.io.Input; -import com.esotericsoftware.kryo.serializers.CollectionSerializer; - -public class HashSetSerializer extends CollectionSerializer> { - @Override - public HashSet create(Kryo kryo, Input input, Class> type, int size) { - return new HashSet<>(size); - } -} diff --git a/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/SerializationFactory.java b/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/SerializationFactory.java index 081d9e3fc07..27d27750e15 100644 --- a/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/SerializationFactory.java +++ b/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/SerializationFactory.java @@ -35,7 +35,6 @@ import com.esotericsoftware.kryo.serializers.DefaultSerializers.BigIntegerSerializer; import org.apache.storm.Config; -import org.apache.storm.serialization.types.HashSetSerializer; import org.apache.storm.tuple.Values; import org.apache.storm.utils.ListDelegate; import org.apache.storm.utils.Utils; @@ -61,7 +60,7 @@ public static Kryo getKryo(Map conf) { k.register(ListDelegate.class); k.register(ArrayList.class); k.register(HashMap.class); - k.register(HashSet.class, new HashSetSerializer()); + k.register(HashSet.class); k.register(BigInteger.class, new BigIntegerSerializer()); // k.register(TransactionAttempt.class); k.register(Values.class); diff --git a/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/types/HashSetSerializer.java b/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/types/HashSetSerializer.java deleted file mode 100644 index 62af6d99800..00000000000 --- a/storm-compatibility/v0.10.2/src/java/org/apache/storm/serialization/types/HashSetSerializer.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.storm.serialization.types; - -import java.util.HashSet; - -import com.esotericsoftware.kryo.Kryo; -import com.esotericsoftware.kryo.io.Input; -import com.esotericsoftware.kryo.serializers.CollectionSerializer; - -public class HashSetSerializer extends CollectionSerializer> { - @Override - public HashSet create(Kryo kryo, Input input, Class> type, int size) { - return new HashSet<>(size); - } -} diff --git a/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/SerializationFactory.java b/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/SerializationFactory.java index ec8ed20c790..059323edfe9 100644 --- a/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/SerializationFactory.java +++ b/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/SerializationFactory.java @@ -36,7 +36,6 @@ import com.esotericsoftware.kryo.serializers.DefaultSerializers.BigIntegerSerializer; import org.apache.storm.Config; -import org.apache.storm.serialization.types.HashSetSerializer; import org.apache.storm.tuple.Values; import org.apache.storm.utils.ListDelegate; import org.apache.storm.utils.Utils; @@ -62,7 +61,7 @@ public static Kryo getKryo(Map conf) { k.register(ListDelegate.class); k.register(ArrayList.class); k.register(HashMap.class); - k.register(HashSet.class, new HashSetSerializer()); + k.register(HashSet.class); k.register(BigInteger.class, new BigIntegerSerializer()); // k.register(TransactionAttempt.class); k.register(Values.class); diff --git a/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/types/HashSetSerializer.java b/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/types/HashSetSerializer.java deleted file mode 100644 index 62af6d99800..00000000000 --- a/storm-compatibility/v2.2.0/src/java/org/apache/storm/serialization/types/HashSetSerializer.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.storm.serialization.types; - -import java.util.HashSet; - -import com.esotericsoftware.kryo.Kryo; -import com.esotericsoftware.kryo.io.Input; -import com.esotericsoftware.kryo.serializers.CollectionSerializer; - -public class HashSetSerializer extends CollectionSerializer> { - @Override - public HashSet create(Kryo kryo, Input input, Class> type, int size) { - return new HashSet<>(size); - } -} From 40332c0e9b71e495c3905af1a7a6394e14b93f1f Mon Sep 17 00:00:00 2001 From: Nicholas Nezis Date: Thu, 6 Aug 2020 08:40:59 -0400 Subject: [PATCH 11/13] Removing unused import --- .../src/java/org/apache/heron/api/serializer/KryoSerializer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/heron/api/src/java/org/apache/heron/api/serializer/KryoSerializer.java b/heron/api/src/java/org/apache/heron/api/serializer/KryoSerializer.java index 732b14fdf03..7e709dc6a0e 100644 --- a/heron/api/src/java/org/apache/heron/api/serializer/KryoSerializer.java +++ b/heron/api/src/java/org/apache/heron/api/serializer/KryoSerializer.java @@ -34,7 +34,6 @@ import com.esotericsoftware.kryo.Serializer; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; -import com.esotericsoftware.kryo.serializers.CollectionSerializer; import com.esotericsoftware.kryo.serializers.DefaultSerializers; import org.apache.heron.api.Config; From b4a35a4fcbb11aa332c5bdd03d6a56f921ee0da6 Mon Sep 17 00:00:00 2001 From: Nicholas Nezis Date: Thu, 6 Aug 2020 19:17:09 +0000 Subject: [PATCH 12/13] Updating Kryo to 5.0.0-RC8 --- WORKSPACE | 2 +- maven_install.json | 30 +++++++++++----------- release/maven/heron-with-kryo.template.pom | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 5cbf58108ff..5c62348db3f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -68,7 +68,7 @@ maven_install( "antlr:antlr:2.7.7", "org.apache.zookeeper:zookeeper:3.5.8", "io.kubernetes:client-java:" + kubernetes_client_version, - "com.esotericsoftware:kryo:5.0.0-RC7", + "com.esotericsoftware:kryo:5.0.0-RC8", "org.apache.avro:avro:1.7.4", "org.apache.mesos:mesos:0.22.0", "com.hashicorp.nomad:nomad-sdk:0.7.0", diff --git a/maven_install.json b/maven_install.json index 8cef8e66c40..d1b795cb203 100644 --- a/maven_install.json +++ b/maven_install.json @@ -1,6 +1,6 @@ { "dependency_tree": { - "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": 1408980268, + "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": -1812247192, "conflict_resolution": {}, "dependencies": [ { @@ -374,7 +374,7 @@ "url": "https://jcenter.bintray.com/com/beust/jcommander/1.48/jcommander-1.48-sources.jar" }, { - "coord": "com.esotericsoftware:kryo:5.0.0-RC7", + "coord": "com.esotericsoftware:kryo:5.0.0-RC8", "dependencies": [ "com.esotericsoftware:minlog:1.3.1", "com.esotericsoftware:reflectasm:1.11.8", @@ -385,17 +385,17 @@ "com.esotericsoftware:reflectasm:1.11.8", "org.objenesis:objenesis:2.1" ], - "file": "v1/https/jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC7/kryo-5.0.0-RC7.jar", + "file": "v1/https/jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC8/kryo-5.0.0-RC8.jar", "mirror_urls": [ - "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC7/kryo-5.0.0-RC7.jar", - "https://maven.google.com/com/esotericsoftware/kryo/5.0.0-RC7/kryo-5.0.0-RC7.jar", - "https://repo1.maven.org/maven2/com/esotericsoftware/kryo/5.0.0-RC7/kryo-5.0.0-RC7.jar" + "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC8/kryo-5.0.0-RC8.jar", + "https://maven.google.com/com/esotericsoftware/kryo/5.0.0-RC8/kryo-5.0.0-RC8.jar", + "https://repo1.maven.org/maven2/com/esotericsoftware/kryo/5.0.0-RC8/kryo-5.0.0-RC8.jar" ], - "sha256": "017c613db166b9d896d9d89975f4bcf70b16e987efe0dcc6fcf2fd898533d078", - "url": "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC7/kryo-5.0.0-RC7.jar" + "sha256": "4e803e03a463594bd59c30fd8c00bc4077e410454795399d5b393ecc95ee936e", + "url": "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC8/kryo-5.0.0-RC8.jar" }, { - "coord": "com.esotericsoftware:kryo:jar:sources:5.0.0-RC7", + "coord": "com.esotericsoftware:kryo:jar:sources:5.0.0-RC8", "dependencies": [ "com.esotericsoftware:reflectasm:jar:sources:1.11.8", "com.esotericsoftware:minlog:jar:sources:1.3.1", @@ -406,14 +406,14 @@ "com.esotericsoftware:reflectasm:jar:sources:1.11.8", "org.objenesis:objenesis:jar:sources:2.1" ], - "file": "v1/https/jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC7/kryo-5.0.0-RC7-sources.jar", + "file": "v1/https/jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC8/kryo-5.0.0-RC8-sources.jar", "mirror_urls": [ - "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC7/kryo-5.0.0-RC7-sources.jar", - "https://maven.google.com/com/esotericsoftware/kryo/5.0.0-RC7/kryo-5.0.0-RC7-sources.jar", - "https://repo1.maven.org/maven2/com/esotericsoftware/kryo/5.0.0-RC7/kryo-5.0.0-RC7-sources.jar" + "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC8/kryo-5.0.0-RC8-sources.jar", + "https://maven.google.com/com/esotericsoftware/kryo/5.0.0-RC8/kryo-5.0.0-RC8-sources.jar", + "https://repo1.maven.org/maven2/com/esotericsoftware/kryo/5.0.0-RC8/kryo-5.0.0-RC8-sources.jar" ], - "sha256": "0a9e84c625be8e7ba710b78cc55a741e8c90203debe0f871de7fcaeaa50cb2ca", - "url": "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC7/kryo-5.0.0-RC7-sources.jar" + "sha256": "0481f0acedb5c0a1fed9005bb287e030a287634bf80110d8c39711a59b923d84", + "url": "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC8/kryo-5.0.0-RC8-sources.jar" }, { "coord": "com.esotericsoftware:minlog:1.3.1", diff --git a/release/maven/heron-with-kryo.template.pom b/release/maven/heron-with-kryo.template.pom index 3bb9b3db0a2..baf79730ed9 100644 --- a/release/maven/heron-with-kryo.template.pom +++ b/release/maven/heron-with-kryo.template.pom @@ -36,7 +36,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma com.esotericsoftware kryo - 5.0.0-RC7 + 5.0.0-RC8 compile From bb1509bc56a873ffc91c914a8f5f973ab2981718 Mon Sep 17 00:00:00 2001 From: Nicholas Nezis Date: Fri, 14 Aug 2020 13:37:09 -0400 Subject: [PATCH 13/13] Updated to Kryo 5.0.0-RC9 --- WORKSPACE | 2 +- maven_install.json | 30 +++++++++++----------- release/maven/heron-with-kryo.template.pom | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 5c62348db3f..f9ab9709d4b 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -68,7 +68,7 @@ maven_install( "antlr:antlr:2.7.7", "org.apache.zookeeper:zookeeper:3.5.8", "io.kubernetes:client-java:" + kubernetes_client_version, - "com.esotericsoftware:kryo:5.0.0-RC8", + "com.esotericsoftware:kryo:5.0.0-RC9", "org.apache.avro:avro:1.7.4", "org.apache.mesos:mesos:0.22.0", "com.hashicorp.nomad:nomad-sdk:0.7.0", diff --git a/maven_install.json b/maven_install.json index d1b795cb203..70392fd8267 100644 --- a/maven_install.json +++ b/maven_install.json @@ -1,6 +1,6 @@ { "dependency_tree": { - "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": -1812247192, + "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": -790274667, "conflict_resolution": {}, "dependencies": [ { @@ -374,7 +374,7 @@ "url": "https://jcenter.bintray.com/com/beust/jcommander/1.48/jcommander-1.48-sources.jar" }, { - "coord": "com.esotericsoftware:kryo:5.0.0-RC8", + "coord": "com.esotericsoftware:kryo:5.0.0-RC9", "dependencies": [ "com.esotericsoftware:minlog:1.3.1", "com.esotericsoftware:reflectasm:1.11.8", @@ -385,17 +385,17 @@ "com.esotericsoftware:reflectasm:1.11.8", "org.objenesis:objenesis:2.1" ], - "file": "v1/https/jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC8/kryo-5.0.0-RC8.jar", + "file": "v1/https/jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC9/kryo-5.0.0-RC9.jar", "mirror_urls": [ - "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC8/kryo-5.0.0-RC8.jar", - "https://maven.google.com/com/esotericsoftware/kryo/5.0.0-RC8/kryo-5.0.0-RC8.jar", - "https://repo1.maven.org/maven2/com/esotericsoftware/kryo/5.0.0-RC8/kryo-5.0.0-RC8.jar" + "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC9/kryo-5.0.0-RC9.jar", + "https://maven.google.com/com/esotericsoftware/kryo/5.0.0-RC9/kryo-5.0.0-RC9.jar", + "https://repo1.maven.org/maven2/com/esotericsoftware/kryo/5.0.0-RC9/kryo-5.0.0-RC9.jar" ], - "sha256": "4e803e03a463594bd59c30fd8c00bc4077e410454795399d5b393ecc95ee936e", - "url": "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC8/kryo-5.0.0-RC8.jar" + "sha256": "3d9ef4b1e3c1741e5a59938b8e730b950dbed99b171103b61088cb2d66f3987d", + "url": "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC9/kryo-5.0.0-RC9.jar" }, { - "coord": "com.esotericsoftware:kryo:jar:sources:5.0.0-RC8", + "coord": "com.esotericsoftware:kryo:jar:sources:5.0.0-RC9", "dependencies": [ "com.esotericsoftware:reflectasm:jar:sources:1.11.8", "com.esotericsoftware:minlog:jar:sources:1.3.1", @@ -406,14 +406,14 @@ "com.esotericsoftware:reflectasm:jar:sources:1.11.8", "org.objenesis:objenesis:jar:sources:2.1" ], - "file": "v1/https/jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC8/kryo-5.0.0-RC8-sources.jar", + "file": "v1/https/jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC9/kryo-5.0.0-RC9-sources.jar", "mirror_urls": [ - "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC8/kryo-5.0.0-RC8-sources.jar", - "https://maven.google.com/com/esotericsoftware/kryo/5.0.0-RC8/kryo-5.0.0-RC8-sources.jar", - "https://repo1.maven.org/maven2/com/esotericsoftware/kryo/5.0.0-RC8/kryo-5.0.0-RC8-sources.jar" + "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC9/kryo-5.0.0-RC9-sources.jar", + "https://maven.google.com/com/esotericsoftware/kryo/5.0.0-RC9/kryo-5.0.0-RC9-sources.jar", + "https://repo1.maven.org/maven2/com/esotericsoftware/kryo/5.0.0-RC9/kryo-5.0.0-RC9-sources.jar" ], - "sha256": "0481f0acedb5c0a1fed9005bb287e030a287634bf80110d8c39711a59b923d84", - "url": "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC8/kryo-5.0.0-RC8-sources.jar" + "sha256": "c26d03e45c3840341a1e5ac953f1fa1e3c7c958eb9e129b5014cadff88663e5b", + "url": "https://jcenter.bintray.com/com/esotericsoftware/kryo/5.0.0-RC9/kryo-5.0.0-RC9-sources.jar" }, { "coord": "com.esotericsoftware:minlog:1.3.1", diff --git a/release/maven/heron-with-kryo.template.pom b/release/maven/heron-with-kryo.template.pom index baf79730ed9..40bbd6801ce 100644 --- a/release/maven/heron-with-kryo.template.pom +++ b/release/maven/heron-with-kryo.template.pom @@ -36,7 +36,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma com.esotericsoftware kryo - 5.0.0-RC8 + 5.0.0-RC9 compile