You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2018/10/31 15:16:32 UTC
[flink] 02/02: [FLINK-10693] [Scala API] Fix incorrect duplication
in EitherSerializer
This is an automated email from the ASF dual-hosted git repository.
trohrmann pushed a commit to branch release-1.6
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 5aa07cd277bad087bbcf901afaac6133c87b6812
Author: Stephan Ewen <se...@apache.org>
AuthorDate: Fri Oct 26 15:35:14 2018 +0200
[FLINK-10693] [Scala API] Fix incorrect duplication in EitherSerializer
This closes #6951.
---
.../api/scala/typeutils/EitherSerializer.scala | 11 ++-
.../api/scala/typeutils/EitherSerializerTest.scala | 90 ++++++++++++++++++++++
2 files changed, 100 insertions(+), 1 deletion(-)
diff --git a/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/EitherSerializer.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/EitherSerializer.scala
index 2974aaf..fbcddc2 100644
--- a/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/EitherSerializer.scala
+++ b/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/EitherSerializer.scala
@@ -32,7 +32,16 @@ class EitherSerializer[A, B](
val rightSerializer: TypeSerializer[B])
extends TypeSerializer[Either[A, B]] {
- override def duplicate: EitherSerializer[A,B] = this
+ override def duplicate: EitherSerializer[A,B] = {
+ val leftDup = leftSerializer.duplicate()
+ val rightDup = rightSerializer.duplicate()
+
+ if (leftDup.eq(leftSerializer) && rightDup.eq(rightSerializer)) {
+ this
+ } else {
+ new EitherSerializer[A, B](leftDup, rightDup)
+ }
+ }
override def createInstance: Either[A, B] = {
Left(null).asInstanceOf[Left[A, B]]
diff --git a/flink-scala/src/test/scala/org/apache/flink/api/scala/typeutils/EitherSerializerTest.scala b/flink-scala/src/test/scala/org/apache/flink/api/scala/typeutils/EitherSerializerTest.scala
new file mode 100644
index 0000000..f62d9a9
--- /dev/null
+++ b/flink-scala/src/test/scala/org/apache/flink/api/scala/typeutils/EitherSerializerTest.scala
@@ -0,0 +1,90 @@
+/*
+ * 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.flink.api.scala.typeutils
+
+import org.apache.flink.api.common.ExecutionConfig
+import org.apache.flink.api.common.typeutils.SerializerTestBase
+import org.apache.flink.api.common.typeutils.base.{IntSerializer, StringSerializer}
+import org.apache.flink.api.java.typeutils.runtime.kryo.KryoSerializer
+
+import org.junit.Test
+import org.junit.Assert.assertNotSame
+import org.junit.Assert.assertSame
+
+/**
+ * Test suite for the [[EitherSerializer]]
+ */
+class EitherSerializerTest extends SerializerTestBase[Either[String, Integer]] {
+
+ // --------------------------------------------------------------------------
+ // test suite
+ // --------------------------------------------------------------------------
+
+ override protected def createSerializer() =
+ new EitherSerializer[String, Integer](
+ StringSerializer.INSTANCE,
+ IntSerializer.INSTANCE)
+
+ override protected def getLength: Int = -1
+
+ override protected def getTypeClass: Class[Either[String, Integer]] =
+ classOf[Either[String, Integer]]
+
+ override protected def getTestData: Array[Either[String, Integer]] =
+ Array[Either[String, Integer]](
+ Left("hello"),
+ Right(17),
+ Right(0),
+ Left("friend"),
+ Right(200),
+ Right(100),
+ Left("foo"),
+ Right(1060876234),
+ Left("bar")
+ )
+
+ // --------------------------------------------------------------------------
+ // either serializer specific tests
+ // --------------------------------------------------------------------------
+
+ @Test
+ def testDuplication(): Unit = {
+ val serializerSS: EitherSerializer[String, String] =
+ new EitherSerializer[String, String](
+ StringSerializer.INSTANCE,
+ StringSerializer.INSTANCE
+ )
+
+ val serializerSO: EitherSerializer[String, Object] =
+ new EitherSerializer[String, Object](
+ StringSerializer.INSTANCE,
+ new KryoSerializer[Object](classOf[Object], new ExecutionConfig())
+ )
+
+ val serializerOS: EitherSerializer[Object, String] =
+ new EitherSerializer[Object, String](
+ new KryoSerializer[Object](classOf[Object], new ExecutionConfig()),
+ StringSerializer.INSTANCE
+ )
+
+ assertSame(serializerSS, serializerSS.duplicate())
+ assertNotSame(serializerSO, serializerSO.duplicate())
+ assertNotSame(serializerOS, serializerOS.duplicate())
+ }
+}