You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by hs...@apache.org on 2015/03/24 23:32:45 UTC
flink git commit: Update Javadoc from Nephele task manager to Task
Manager; add missing Javadoc params in RegularPactTask#getOutputCollector.
Repository: flink
Updated Branches:
refs/heads/master de45c06f1 -> ed1b30f3a
Update Javadoc from Nephele task manager to Task Manager; add missing Javadoc params in RegularPactTask#getOutputCollector.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/ed1b30f3
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/ed1b30f3
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/ed1b30f3
Branch: refs/heads/master
Commit: ed1b30f3aa21088463e9b539bb956dc2525cd140
Parents: de45c06
Author: Henry Saputra <he...@gmail.com>
Authored: Tue Mar 24 15:32:03 2015 -0700
Committer: Henry Saputra <he...@gmail.com>
Committed: Tue Mar 24 15:32:03 2015 -0700
----------------------------------------------------------------------
.../apache/flink/runtime/operators/AllGroupReduceDriver.java | 2 +-
.../org/apache/flink/runtime/operators/AllReduceDriver.java | 2 +-
.../java/org/apache/flink/runtime/operators/CoGroupDriver.java | 2 +-
.../org/apache/flink/runtime/operators/CollectorMapDriver.java | 2 +-
.../java/org/apache/flink/runtime/operators/CrossDriver.java | 2 +-
.../java/org/apache/flink/runtime/operators/FlatMapDriver.java | 2 +-
.../org/apache/flink/runtime/operators/GroupReduceDriver.java | 2 +-
.../java/org/apache/flink/runtime/operators/MapDriver.java | 2 +-
.../org/apache/flink/runtime/operators/MapPartitionDriver.java | 2 +-
.../java/org/apache/flink/runtime/operators/MatchDriver.java | 2 +-
.../java/org/apache/flink/runtime/operators/ReduceDriver.java | 2 +-
.../org/apache/flink/runtime/operators/RegularPactTask.java | 6 ++++--
12 files changed, 15 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/ed1b30f3/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllGroupReduceDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllGroupReduceDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllGroupReduceDriver.java
index 9b9b5f6..ad1afdb 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllGroupReduceDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllGroupReduceDriver.java
@@ -32,7 +32,7 @@ import org.apache.flink.util.Collector;
import org.apache.flink.util.MutableObjectIterator;
/**
- * GroupReduceDriver task which is executed by a Nephele task manager. The task has a
+ * GroupReduceDriver task which is executed by a Task Manager. The task has a
* single input and one or multiple outputs. It is provided with a GroupReduceFunction
* implementation or a RichGroupFunction. This Driver performs
* multiple tasks depending on the DriverStrategy. In case of a ALL_GROUP_REDUCE_COMBINE
http://git-wip-us.apache.org/repos/asf/flink/blob/ed1b30f3/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllReduceDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllReduceDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllReduceDriver.java
index dff2dbd..1f58c1b 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllReduceDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllReduceDriver.java
@@ -29,7 +29,7 @@ import org.apache.flink.runtime.operators.util.TaskConfig;
import org.apache.flink.util.MutableObjectIterator;
/**
- * Reduce task which is executed by a Nephele task manager. The task has a
+ * Reduce task which is executed by a Task Manager. The task has a
* single input and one or multiple outputs. It is provided with a ReduceFunction
* implementation.
* <p>
http://git-wip-us.apache.org/repos/asf/flink/blob/ed1b30f3/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupDriver.java
index 6ace918..dfc4e91 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupDriver.java
@@ -34,7 +34,7 @@ import org.apache.flink.util.Collector;
import org.apache.flink.util.MutableObjectIterator;
/**
- * CoGroup task which is executed by a Nephele task manager. The task has two
+ * CoGroup task which is executed by a Task Manager. The task has two
* inputs and one or multiple outputs. It is provided with a CoGroupFunction
* implementation.
* <p>
http://git-wip-us.apache.org/repos/asf/flink/blob/ed1b30f3/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CollectorMapDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CollectorMapDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CollectorMapDriver.java
index 766a9d9..7e6376f 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CollectorMapDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CollectorMapDriver.java
@@ -27,7 +27,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Map task which is executed by a Nephele task manager. The task has a single
+ * Map task which is executed by a Task Manager. The task has a single
* input and one or multiple outputs. It is provided with a MapFunction
* implementation.
* <p>
http://git-wip-us.apache.org/repos/asf/flink/blob/ed1b30f3/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CrossDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CrossDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CrossDriver.java
index 197c08d..cc39341 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CrossDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CrossDriver.java
@@ -32,7 +32,7 @@ import org.apache.flink.util.Collector;
import org.apache.flink.util.MutableObjectIterator;
/**
- * Cross task which is executed by a Nephele task manager. The task has two
+ * Cross task which is executed by a Task Manager. The task has two
* inputs and one or multiple outputs. It is provided with a CrossFunction
* implementation.
* <p>
http://git-wip-us.apache.org/repos/asf/flink/blob/ed1b30f3/flink-runtime/src/main/java/org/apache/flink/runtime/operators/FlatMapDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/FlatMapDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/FlatMapDriver.java
index d63a3e3..fd245bd 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/FlatMapDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/FlatMapDriver.java
@@ -27,7 +27,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Map task which is executed by a Nephele task manager. The task has a single
+ * Map task which is executed by a Task Manager. The task has a single
* input and one or multiple outputs. It is provided with a MapFunction
* implementation.
* <p>
http://git-wip-us.apache.org/repos/asf/flink/blob/ed1b30f3/flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceDriver.java
index 211622c..59fb603 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceDriver.java
@@ -31,7 +31,7 @@ import org.apache.flink.util.Collector;
import org.apache.flink.util.MutableObjectIterator;
/**
- * GroupReduce task which is executed by a Nephele task manager. The task has a
+ * GroupReduce task which is executed by a Task Manager. The task has a
* single input and one or multiple outputs. It is provided with a GroupReduceFunction
* implementation.
* <p>
http://git-wip-us.apache.org/repos/asf/flink/blob/ed1b30f3/flink-runtime/src/main/java/org/apache/flink/runtime/operators/MapDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/MapDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/MapDriver.java
index d750fd9..d861cbd 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/MapDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/MapDriver.java
@@ -24,7 +24,7 @@ import org.apache.flink.util.Collector;
import org.apache.flink.util.MutableObjectIterator;
/**
- * Map task which is executed by a Nephele task manager. The task has a single
+ * Map task which is executed by a Task Manager. The task has a single
* input and one or multiple outputs. It is provided with a MapFunction
* implementation.
* <p>
http://git-wip-us.apache.org/repos/asf/flink/blob/ed1b30f3/flink-runtime/src/main/java/org/apache/flink/runtime/operators/MapPartitionDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/MapPartitionDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/MapPartitionDriver.java
index 401c951..eaab904 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/MapPartitionDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/MapPartitionDriver.java
@@ -29,7 +29,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * MapPartition task which is executed by a Nephele task manager. The task has a single
+ * MapPartition task which is executed by a Task Manager. The task has a single
* input and one or multiple outputs. It is provided with a MapFunction
* implementation.
* <p>
http://git-wip-us.apache.org/repos/asf/flink/blob/ed1b30f3/flink-runtime/src/main/java/org/apache/flink/runtime/operators/MatchDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/MatchDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/MatchDriver.java
index f8e4a29..0381aab 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/MatchDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/MatchDriver.java
@@ -40,7 +40,7 @@ import org.apache.flink.util.Collector;
import org.apache.flink.util.MutableObjectIterator;
/**
- * Match task which is executed by a Nephele task manager. The task has two inputs and one or multiple outputs.
+ * Match task which is executed by a Task Manager. The task has two inputs and one or multiple outputs.
* It is provided with a JoinFunction implementation.
* <p>
* The MatchTask matches all pairs of records that share the same key and come from different inputs. Each pair of
http://git-wip-us.apache.org/repos/asf/flink/blob/ed1b30f3/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceDriver.java
index 6528f30..8d15ef2 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceDriver.java
@@ -30,7 +30,7 @@ import org.apache.flink.util.Collector;
import org.apache.flink.util.MutableObjectIterator;
/**
- * Reduce task which is executed by a Nephele task manager. The task has a
+ * Reduce task which is executed by a Task Manager. The task has a
* single input and one or multiple outputs. It is provided with a ReduceFunction
* implementation.
* <p>
http://git-wip-us.apache.org/repos/asf/flink/blob/ed1b30f3/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RegularPactTask.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RegularPactTask.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RegularPactTask.java
index 081d498..ca110c2 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RegularPactTask.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RegularPactTask.java
@@ -1237,12 +1237,14 @@ public class RegularPactTask<S extends Function, OT> extends AbstractInvokable i
* @param task The task that the output collector is created for.
* @param config The configuration describing the output shipping strategies.
* @param cl The classloader used to load user defined types.
+ * @param eventualOutputs The output writers that this task forwards to the next task for each output.
+ * @param outputOffset The offset to start to get the writers for the outputs
* @param numOutputs The number of outputs described in the configuration.
*
* @return The OutputCollector that data produced in this task is submitted to.
*/
- public static <T> Collector<T> getOutputCollector(AbstractInvokable task, TaskConfig config, ClassLoader cl, List<RecordWriter<?>> eventualOutputs, int outputOffset, int numOutputs)
- throws Exception
+ public static <T> Collector<T> getOutputCollector(AbstractInvokable task, TaskConfig config, ClassLoader cl,
+ List<RecordWriter<?>> eventualOutputs, int outputOffset, int numOutputs) throws Exception
{
if (numOutputs == 0) {
return null;