You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by fh...@apache.org on 2016/01/25 18:35:29 UTC
[4/6] flink git commit: [hotfix] [docs] Tidy up documentation. Fix
some non-idiomatic usage of return in scala code.
[hotfix] [docs] Tidy up documentation. Fix some non-idiomatic usage of return in scala code.
This closes #1531
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/2ad1d5ed
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/2ad1d5ed
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/2ad1d5ed
Branch: refs/heads/master
Commit: 2ad1d5edc2e6f982acfcfb61a442b7b2df583537
Parents: 0240c8e
Author: sksamuel <sa...@sksamuel.com>
Authored: Wed Jan 20 23:26:02 2016 +0000
Committer: Fabian Hueske <fh...@apache.org>
Committed: Mon Jan 25 18:28:11 2016 +0100
----------------------------------------------------------------------
.../scala/org/apache/flink/api/scala/ClosureCleaner.scala | 4 ++--
.../org/apache/flink/api/scala/ExecutionEnvironment.scala | 4 ++--
.../flink/api/scala/hadoop/mapred/HadoopInputFormat.scala | 7 ++++---
.../flink/api/scala/hadoop/mapreduce/HadoopInputFormat.scala | 7 ++++---
.../main/scala/org/apache/flink/api/scala/joinDataSet.scala | 2 --
.../src/main/scala/org/apache/flink/api/scala/package.scala | 8 +++++---
.../apache/flink/api/scala/typeutils/NothingSerializer.scala | 6 +++---
.../elasticsearch/examples/ElasticsearchExample.java | 2 +-
8 files changed, 21 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/2ad1d5ed/flink-scala/src/main/scala/org/apache/flink/api/scala/ClosureCleaner.scala
----------------------------------------------------------------------
diff --git a/flink-scala/src/main/scala/org/apache/flink/api/scala/ClosureCleaner.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/ClosureCleaner.scala
index 00ffcfc..9b0d62e 100644
--- a/flink-scala/src/main/scala/org/apache/flink/api/scala/ClosureCleaner.scala
+++ b/flink-scala/src/main/scala/org/apache/flink/api/scala/ClosureCleaner.scala
@@ -96,7 +96,7 @@ object ClosureCleaner {
stack = cls :: stack
}
}
- return (seen - obj.getClass).toList
+ (seen - obj.getClass).toList
}
private def createNullValue(cls: Class[_]): AnyRef = {
@@ -192,7 +192,7 @@ object ClosureCleaner {
if (outer != null) {
params(0) = outer // First param is always outer object
}
- return cons.newInstance(params: _*).asInstanceOf[AnyRef]
+ cons.newInstance(params: _*).asInstanceOf[AnyRef]
} else {
// Use reflection to instantiate object without calling constructor
val rf = sun.reflect.ReflectionFactory.getReflectionFactory()
http://git-wip-us.apache.org/repos/asf/flink/blob/2ad1d5ed/flink-scala/src/main/scala/org/apache/flink/api/scala/ExecutionEnvironment.scala
----------------------------------------------------------------------
diff --git a/flink-scala/src/main/scala/org/apache/flink/api/scala/ExecutionEnvironment.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/ExecutionEnvironment.scala
index cb576dd..b6c10bb 100644
--- a/flink-scala/src/main/scala/org/apache/flink/api/scala/ExecutionEnvironment.scala
+++ b/flink-scala/src/main/scala/org/apache/flink/api/scala/ExecutionEnvironment.scala
@@ -39,7 +39,6 @@ import org.apache.hadoop.mapreduce.lib.input.{FileInputFormat => MapreduceFileIn
import org.apache.hadoop.mapreduce.{InputFormat => MapreduceInputFormat, Job}
import scala.collection.JavaConverters._
-import scala.collection.mutable.ArrayBuffer
import scala.reflect.ClassTag
/**
@@ -67,6 +66,7 @@ class ExecutionEnvironment(javaEnv: JavaEnv) {
* @return the Java Execution environment.
*/
def getJavaEnv: JavaEnv = javaEnv
+
/**
* Gets the config object.
*/
@@ -249,7 +249,7 @@ class ExecutionEnvironment(javaEnv: JavaEnv) {
* to only read specific fields.
*
* @param filePath The path of the file, as a URI (e.g., "file:///some/local/file" or
- * "hdfs://host:port/file/path"). * @param lineDelimiter
+ * "hdfs://host:port/file/path").
* @param lineDelimiter The string that separates lines, defaults to newline.
* @param fieldDelimiter The string that separates individual fields, defaults to ",".
* @param quoteCharacter The character to use for quoted String parsing, disabled by default.
http://git-wip-us.apache.org/repos/asf/flink/blob/2ad1d5ed/flink-scala/src/main/scala/org/apache/flink/api/scala/hadoop/mapred/HadoopInputFormat.scala
----------------------------------------------------------------------
diff --git a/flink-scala/src/main/scala/org/apache/flink/api/scala/hadoop/mapred/HadoopInputFormat.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/hadoop/mapred/HadoopInputFormat.scala
index 0e23cab..6aa4e08 100644
--- a/flink-scala/src/main/scala/org/apache/flink/api/scala/hadoop/mapred/HadoopInputFormat.scala
+++ b/flink-scala/src/main/scala/org/apache/flink/api/scala/hadoop/mapred/HadoopInputFormat.scala
@@ -36,10 +36,11 @@ class HadoopInputFormat[K, V](
fetchNext()
}
if (!hasNext) {
- return null
+ null
+ } else {
+ fetched = false
+ (key, value)
}
- fetched = false
- (key, value)
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/2ad1d5ed/flink-scala/src/main/scala/org/apache/flink/api/scala/hadoop/mapreduce/HadoopInputFormat.scala
----------------------------------------------------------------------
diff --git a/flink-scala/src/main/scala/org/apache/flink/api/scala/hadoop/mapreduce/HadoopInputFormat.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/hadoop/mapreduce/HadoopInputFormat.scala
index 9079db5..6de658a 100644
--- a/flink-scala/src/main/scala/org/apache/flink/api/scala/hadoop/mapreduce/HadoopInputFormat.scala
+++ b/flink-scala/src/main/scala/org/apache/flink/api/scala/hadoop/mapreduce/HadoopInputFormat.scala
@@ -37,10 +37,11 @@ class HadoopInputFormat[K, V](
fetchNext()
}
if (!hasNext) {
- return null
+ null
+ } else {
+ fetched = false
+ (recordReader.getCurrentKey, recordReader.getCurrentValue)
}
- fetched = false
- (recordReader.getCurrentKey, recordReader.getCurrentValue)
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/2ad1d5ed/flink-scala/src/main/scala/org/apache/flink/api/scala/joinDataSet.scala
----------------------------------------------------------------------
diff --git a/flink-scala/src/main/scala/org/apache/flink/api/scala/joinDataSet.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/joinDataSet.scala
index d94b809..49b2701 100644
--- a/flink-scala/src/main/scala/org/apache/flink/api/scala/joinDataSet.scala
+++ b/flink-scala/src/main/scala/org/apache/flink/api/scala/joinDataSet.scala
@@ -17,8 +17,6 @@
*/
package org.apache.flink.api.scala
-import org.apache.flink.api.common.operators.Operator
-import org.apache.flink.api.common.operators.base.JoinOperatorBase
import org.apache.flink.api.common.functions.{FlatJoinFunction, JoinFunction, Partitioner, RichFlatJoinFunction}
import org.apache.flink.api.common.operators.base.JoinOperatorBase.JoinHint
import org.apache.flink.api.common.typeinfo.TypeInformation
http://git-wip-us.apache.org/repos/asf/flink/blob/2ad1d5ed/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 c006888..e5ca465 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
@@ -71,12 +71,14 @@ package object scala {
"supported on Case Classes (for now).")
}
}
+
def getCallLocationName(depth: Int = 3) : String = {
val st = Thread.currentThread().getStackTrace()
- if(st.length < depth) {
- return "<unknown>"
+ if (st.length < depth) {
+ "<unknown>"
+ } else {
+ st(depth).toString
}
- st(depth).toString
}
def createTuple2TypeInformation[T1, T2](
http://git-wip-us.apache.org/repos/asf/flink/blob/2ad1d5ed/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/NothingSerializer.scala
----------------------------------------------------------------------
diff --git a/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/NothingSerializer.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/NothingSerializer.scala
index a6a7954..8c34fa7 100644
--- a/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/NothingSerializer.scala
+++ b/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/NothingSerializer.scala
@@ -21,9 +21,9 @@ import org.apache.flink.api.common.typeutils.TypeSerializer
import org.apache.flink.core.memory.{DataOutputView, DataInputView}
/**
- * Serializer for cases where not serializer is required but the system still expects one. This
- * happens for OptionTypeInfo when None ist used, or for Either when one of the sides is
- * Nothing.
+ * Serializer for cases where no serializer is required but the system still expects one. This
+ * happens for OptionTypeInfo when None is used, or for Either when one of the type parameters
+ * is Nothing.
*/
class NothingSerializer extends TypeSerializer[Any] {
http://git-wip-us.apache.org/repos/asf/flink/blob/2ad1d5ed/flink-streaming-connectors/flink-connector-elasticsearch/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/examples/ElasticsearchExample.java
----------------------------------------------------------------------
diff --git a/flink-streaming-connectors/flink-connector-elasticsearch/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/examples/ElasticsearchExample.java b/flink-streaming-connectors/flink-connector-elasticsearch/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/examples/ElasticsearchExample.java
index 298eb64..f8f658b 100644
--- a/flink-streaming-connectors/flink-connector-elasticsearch/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/examples/ElasticsearchExample.java
+++ b/flink-streaming-connectors/flink-connector-elasticsearch/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/examples/ElasticsearchExample.java
@@ -32,7 +32,7 @@ import java.util.Map;
/**
* This example shows how to use the Elasticsearch Sink. Before running it you must ensure that
- * you have a cluster names "elasticsearch" running or change the cluster name in the config map.
+ * you have a cluster named "elasticsearch" running or change the cluster name in the config map.
*/
public class ElasticsearchExample {