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 2015/09/17 15:38:30 UTC
[1/3] flink git commit: [FLINK-2691] [documentation] Fix broken links
to Python script on QuickStart docs
Repository: flink
Updated Branches:
refs/heads/release-0.9 c007f72e6 -> ad09721fb
[FLINK-2691] [documentation] Fix broken links to Python script on QuickStart docs
This closes #1140
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/45e2a2a8
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/45e2a2a8
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/45e2a2a8
Branch: refs/heads/release-0.9
Commit: 45e2a2a82c4aa95d6946a956f9ef5d9c4bb9da77
Parents: c007f72
Author: Felix Cheung <fe...@hotmail.com>
Authored: Wed Sep 16 17:00:39 2015 -0700
Committer: Fabian Hueske <fh...@apache.org>
Committed: Thu Sep 17 11:57:50 2015 +0200
----------------------------------------------------------------------
docs/quickstart/run_example_quickstart.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/45e2a2a8/docs/quickstart/run_example_quickstart.md
----------------------------------------------------------------------
diff --git a/docs/quickstart/run_example_quickstart.md b/docs/quickstart/run_example_quickstart.md
index b7f21c4..66fd332 100644
--- a/docs/quickstart/run_example_quickstart.md
+++ b/docs/quickstart/run_example_quickstart.md
@@ -53,7 +53,7 @@ The `kmeans/` directory should now contain two files: `centers` and `points`. Th
## Inspect the Input Data
-Use the `plotPoints.py` tool to review the generated data points. [Download Python Script](quickstart/plotPoints.py)
+Use the `plotPoints.py` tool to review the generated data points. [Download Python Script](plotPoints.py)
~~~ bash
python plotPoints.py points ./points input
@@ -140,7 +140,7 @@ Stop Flink when you are done.
~~~
## Analyze the Result
-Use the [Python Script](quickstart/plotPoints.py) again to visualize the result.
+Use the [Python Script](plotPoints.py) again to visualize the result.
~~~bash
cd kmeans
[2/3] flink git commit: [FLINK-2689] [runtime] Fix reuse of null
object for solution set Joins and CoGroups.
Posted by fh...@apache.org.
[FLINK-2689] [runtime] Fix reuse of null object for solution set Joins and CoGroups.
This closes #1136
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/43e23ba5
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/43e23ba5
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/43e23ba5
Branch: refs/heads/release-0.9
Commit: 43e23ba5efb509f08882df6c2a5d774840bf87a5
Parents: 45e2a2a
Author: Fabian Hueske <fh...@apache.org>
Authored: Wed Sep 16 16:56:06 2015 +0200
Committer: Fabian Hueske <fh...@apache.org>
Committed: Thu Sep 17 11:58:01 2015 +0200
----------------------------------------------------------------------
.../runtime/operators/CoGroupWithSolutionSetFirstDriver.java | 6 +++---
.../runtime/operators/CoGroupWithSolutionSetSecondDriver.java | 6 +++---
.../runtime/operators/JoinWithSolutionSetFirstDriver.java | 4 ++--
.../runtime/operators/JoinWithSolutionSetSecondDriver.java | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/43e23ba5/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetFirstDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetFirstDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetFirstDriver.java
index b27b6b9..97d6e51 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetFirstDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetFirstDriver.java
@@ -175,9 +175,9 @@ public class CoGroupWithSolutionSetFirstDriver<IT1, IT2, OT> implements Resettab
while (this.running && probeSideInput.nextKey()) {
IT2 current = probeSideInput.getCurrent();
- buildSideRecord = prober.getMatchFor(current, buildSideRecord);
- if (buildSideRecord != null) {
- siIter.set(buildSideRecord);
+ IT1 matchedRecord = prober.getMatchFor(current, buildSideRecord);
+ if (matchedRecord != null) {
+ siIter.set(matchedRecord);
coGroupStub.coGroup(siIter, probeSideInput.getValues(), collector);
} else {
coGroupStub.coGroup(emptySolutionSide, probeSideInput.getValues(), collector);
http://git-wip-us.apache.org/repos/asf/flink/blob/43e23ba5/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetSecondDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetSecondDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetSecondDriver.java
index ba0f8f9..9e8a81c 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetSecondDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetSecondDriver.java
@@ -174,9 +174,9 @@ public class CoGroupWithSolutionSetSecondDriver<IT1, IT2, OT> implements Resetta
while (this.running && probeSideInput.nextKey()) {
IT1 current = probeSideInput.getCurrent();
- buildSideRecord = prober.getMatchFor(current, buildSideRecord);
- if (buildSideRecord != null) {
- siIter.set(buildSideRecord);
+ IT2 matchedRecord = prober.getMatchFor(current, buildSideRecord);
+ if (matchedRecord != null) {
+ siIter.set(matchedRecord);
coGroupStub.coGroup(probeSideInput.getValues(), siIter, collector);
} else {
coGroupStub.coGroup(probeSideInput.getValues(), emptySolutionSide, collector);
http://git-wip-us.apache.org/repos/asf/flink/blob/43e23ba5/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetFirstDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetFirstDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetFirstDriver.java
index a1c8a4a..fe926cb 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetFirstDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetFirstDriver.java
@@ -166,8 +166,8 @@ public class JoinWithSolutionSetFirstDriver<IT1, IT2, OT> implements ResettableP
IT1 buildSideRecord = this.solutionSideRecord;
while (this.running && ((probeSideRecord = probeSideInput.next(probeSideRecord)) != null)) {
- buildSideRecord = prober.getMatchFor(probeSideRecord, buildSideRecord);
- joinFunction.join(buildSideRecord, probeSideRecord, collector);
+ IT1 matchedRecord = prober.getMatchFor(probeSideRecord, buildSideRecord);
+ joinFunction.join(matchedRecord, probeSideRecord, collector);
}
} else if (objectMap != null) {
final JoinHashMap<IT1> hashTable = this.objectMap;
http://git-wip-us.apache.org/repos/asf/flink/blob/43e23ba5/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetSecondDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetSecondDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetSecondDriver.java
index 32a75dc..20079fc 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetSecondDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetSecondDriver.java
@@ -168,8 +168,8 @@ public class JoinWithSolutionSetSecondDriver<IT1, IT2, OT> implements Resettable
IT2 buildSideRecord = this.solutionSideRecord;
while (this.running && ((probeSideRecord = probeSideInput.next(probeSideRecord)) != null)) {
- buildSideRecord = prober.getMatchFor(probeSideRecord, buildSideRecord);
- joinFunction.join(probeSideRecord, buildSideRecord, collector);
+ IT2 matchedRecord = prober.getMatchFor(probeSideRecord, buildSideRecord);
+ joinFunction.join(probeSideRecord, matchedRecord, collector);
}
} else if (objectMap != null) {
final JoinHashMap<IT2> hashTable = this.objectMap;
[3/3] flink git commit: [FLINK-2659] [runtime] Fix object reuse in
UnionWithTempOperator
Posted by fh...@apache.org.
[FLINK-2659] [runtime] Fix object reuse in UnionWithTempOperator
This closes #1130
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/ad09721f
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/ad09721f
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/ad09721f
Branch: refs/heads/release-0.9
Commit: ad09721fbf40e1136009a81db3f8a458d5d4a6ac
Parents: 43e23ba
Author: Greg Hogan <co...@greghogan.com>
Authored: Mon Sep 14 11:29:49 2015 -0400
Committer: Fabian Hueske <fh...@apache.org>
Committed: Thu Sep 17 11:58:10 2015 +0200
----------------------------------------------------------------------
.../apache/flink/runtime/operators/UnionWithTempOperator.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/ad09721f/flink-runtime/src/main/java/org/apache/flink/runtime/operators/UnionWithTempOperator.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/UnionWithTempOperator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/UnionWithTempOperator.java
index d8437a9..098686c 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/UnionWithTempOperator.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/UnionWithTempOperator.java
@@ -60,15 +60,16 @@ public class UnionWithTempOperator<T> implements PactDriver<Function, T> {
public void run() throws Exception {
final Collector<T> output = this.taskContext.getOutputCollector();
- T record = this.taskContext.<T>getInputSerializer(STREAMED_INPUT).getSerializer().createInstance();
+ T reuse = this.taskContext.<T>getInputSerializer(STREAMED_INPUT).getSerializer().createInstance();
+ T record;
final MutableObjectIterator<T> input = this.taskContext.getInput(STREAMED_INPUT);
- while (this.running && ((record = input.next(record)) != null)) {
+ while (this.running && ((record = input.next(reuse)) != null)) {
output.collect(record);
}
final MutableObjectIterator<T> cache = this.taskContext.getInput(CACHED_INPUT);
- while (this.running && ((record = cache.next(record)) != null)) {
+ while (this.running && ((record = cache.next(reuse)) != null)) {
output.collect(record);
}
}