You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2017/10/14 17:08:13 UTC
[8/8] flink git commit: [hotfix] [scala api] Fix compiler warnings in
Scala API
[hotfix] [scala api] Fix compiler warnings in Scala API
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/76e9b09b
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/76e9b09b
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/76e9b09b
Branch: refs/heads/master
Commit: 76e9b09b0f8ca64037ab495a61144e2c15abb56a
Parents: 6a93597
Author: Stephan Ewen <se...@apache.org>
Authored: Sat Oct 14 01:00:53 2017 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Sat Oct 14 17:04:20 2017 +0200
----------------------------------------------------------------------
.../org/apache/flink/api/scala/package.scala | 2 +-
.../scala/typeutils/EnumValueSerializer.scala | 78 ++++++++++----------
.../scala/typeutils/OptionTypeComparator.scala | 6 +-
3 files changed, 41 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/76e9b09b/flink-scala/src/main/scala/org/apache/flink/api/scala/package.scala
----------------------------------------------------------------------
diff --git a/flink-scala/src/main/scala/org/apache/flink/api/scala/package.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/package.scala
index 1899b13..4fd559a 100644
--- a/flink-scala/src/main/scala/org/apache/flink/api/scala/package.scala
+++ b/flink-scala/src/main/scala/org/apache/flink/api/scala/package.scala
@@ -57,7 +57,7 @@ package object scala {
private[flink] def explicitFirst[T](
funcOrInputFormat: AnyRef,
typeInfo: TypeInformation[T]): TypeInformation[T] = funcOrInputFormat match {
- case rtq: ResultTypeQueryable[T] => rtq.getProducedType
+ case rtq: ResultTypeQueryable[_] => rtq.asInstanceOf[ResultTypeQueryable[T]].getProducedType
case _ => typeInfo
}
http://git-wip-us.apache.org/repos/asf/flink/blob/76e9b09b/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/EnumValueSerializer.scala
----------------------------------------------------------------------
diff --git a/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/EnumValueSerializer.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/EnumValueSerializer.scala
index b7ca32d..abc56d1 100644
--- a/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/EnumValueSerializer.scala
+++ b/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/EnumValueSerializer.scala
@@ -136,57 +136,53 @@ object EnumValueSerializer {
override def write(out: DataOutputView): Unit = {
super.write(out)
+ val outViewWrapper = new DataOutputViewStream(out)
try {
- val outViewWrapper = new DataOutputViewStream(out)
- try {
- out.writeUTF(enumClass.getName)
-
- out.writeInt(enumConstants.length)
- for ((name, idx) <- enumConstants) {
- out.writeUTF(name)
- out.writeInt(idx)
- }
- } finally if (outViewWrapper != null) outViewWrapper.close()
- }
+ out.writeUTF(enumClass.getName)
+
+ out.writeInt(enumConstants.length)
+ for ((name, idx) <- enumConstants) {
+ out.writeUTF(name)
+ out.writeInt(idx)
+ }
+ } finally if (outViewWrapper != null) outViewWrapper.close()
}
override def read(in: DataInputView): Unit = {
super.read(in)
+ val inViewWrapper = new DataInputViewStream(in)
try {
- val inViewWrapper = new DataInputViewStream(in)
- try {
- if (getReadVersion == 1) {
- enumClass = InstantiationUtil.deserializeObject(
- inViewWrapper, getUserCodeClassLoader)
-
- // read null from input stream
- InstantiationUtil.deserializeObject(inViewWrapper, getUserCodeClassLoader)
- enumConstants = List()
- } else if (getReadVersion == ScalaEnumSerializerConfigSnapshot.VERSION) {
- enumClass = Class.forName(
- in.readUTF(), true, getUserCodeClassLoader).asInstanceOf[Class[E]]
-
- val length = in.readInt()
- val listBuffer = ListBuffer[(String, Int)]()
-
- for (_ <- 0 until length) {
- val name = in.readUTF()
- val idx = in.readInt()
- listBuffer += ((name, idx))
- }
-
- enumConstants = listBuffer.toList
- } else {
- throw new IOException(
- s"Cannot deserialize ${getClass.getSimpleName} with version $getReadVersion.")
+ if (getReadVersion == 1) {
+ enumClass = InstantiationUtil.deserializeObject(
+ inViewWrapper, getUserCodeClassLoader)
+
+ // read null from input stream
+ InstantiationUtil.deserializeObject(inViewWrapper, getUserCodeClassLoader)
+ enumConstants = List()
+ } else if (getReadVersion == ScalaEnumSerializerConfigSnapshot.VERSION) {
+ enumClass = Class.forName(
+ in.readUTF(), true, getUserCodeClassLoader).asInstanceOf[Class[E]]
+
+ val length = in.readInt()
+ val listBuffer = ListBuffer[(String, Int)]()
+
+ for (_ <- 0 until length) {
+ val name = in.readUTF()
+ val idx = in.readInt()
+ listBuffer += ((name, idx))
}
- } catch {
- case e: ClassNotFoundException =>
- throw new IOException("The requested enum class cannot be found in classpath.", e)
+
+ enumConstants = listBuffer.toList
+ } else {
+ throw new IOException(
+ s"Cannot deserialize ${getClass.getSimpleName} with version $getReadVersion.")
}
- finally if (inViewWrapper != null) inViewWrapper.close()
+ } catch {
+ case e: ClassNotFoundException =>
+ throw new IOException("The requested enum class cannot be found in classpath.", e)
}
+ finally if (inViewWrapper != null) inViewWrapper.close()
}
override def getVersion: Int = ScalaEnumSerializerConfigSnapshot.VERSION
http://git-wip-us.apache.org/repos/asf/flink/blob/76e9b09b/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/OptionTypeComparator.scala
----------------------------------------------------------------------
diff --git a/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/OptionTypeComparator.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/OptionTypeComparator.scala
index e20ec16..eab1009 100644
--- a/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/OptionTypeComparator.scala
+++ b/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/OptionTypeComparator.scala
@@ -35,9 +35,9 @@ class OptionTypeComparator[A](
override def compare(first: Option[A], second: Option[A]) = {
first match {
- case Some(firstValue: A) =>
+ case Some(firstValue) =>
second match {
- case Some(secondValue: A) => typeComparator.compare(firstValue, secondValue)
+ case Some(secondValue) => typeComparator.compare(firstValue, secondValue)
case None =>
if (ascending) {
1
@@ -116,7 +116,7 @@ class OptionTypeComparator[A](
) = {
if (numBytes >= 1) {
record match {
- case Some(v: A) =>
+ case Some(v) =>
target.put(offset, OptionTypeComparator.OneInByte)
typeComparator.putNormalizedKey(v, target, offset + 1, numBytes - 1)
case None =>