You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by mb...@apache.org on 2014/12/26 18:39:01 UTC
[1/2] incubator-flink git commit: [FLINK-1225] Fix for quickstart
packaging
Repository: incubator-flink
Updated Branches:
refs/heads/release-0.8 9555c827f -> 2467f36c8
[FLINK-1225] Fix for quickstart packaging
This closes #279
Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/6b3c3a17
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/6b3c3a17
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/6b3c3a17
Branch: refs/heads/release-0.8
Commit: 6b3c3a1780b1270226a76f6a81a9ad2029578a7a
Parents: 9555c82
Author: mbalassi <mb...@apache.org>
Authored: Fri Dec 26 18:02:55 2014 +0100
Committer: mbalassi <mb...@apache.org>
Committed: Fri Dec 26 18:02:55 2014 +0100
----------------------------------------------------------------------
flink-quickstart/quickstart-SNAPSHOT.sh | 4 ++--
flink-quickstart/quickstart-scala-SNAPSHOT.sh | 4 ++--
flink-quickstart/quickstart-scala.sh | 4 ++--
flink-quickstart/quickstart.sh | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/6b3c3a17/flink-quickstart/quickstart-SNAPSHOT.sh
----------------------------------------------------------------------
diff --git a/flink-quickstart/quickstart-SNAPSHOT.sh b/flink-quickstart/quickstart-SNAPSHOT.sh
index 47ce1f4..92e2263 100755
--- a/flink-quickstart/quickstart-SNAPSHOT.sh
+++ b/flink-quickstart/quickstart-SNAPSHOT.sh
@@ -24,11 +24,11 @@ PACKAGE=quickstart
mvn archetype:generate \
-DarchetypeGroupId=org.apache.flink \
-DarchetypeArtifactId=flink-quickstart-java \
- -DarchetypeVersion=0.8-incubating-SNAPSHOT \
+ -DarchetypeVersion=0.9-SNAPSHOT \
-DgroupId=org.apache.flink \
-DartifactId=$PACKAGE \
-Dversion=0.1 \
- -Dpackage=org.apache.flink \
+ -Dpackage=org.myorg.quickstart \
-DinteractiveMode=false \
-DarchetypeCatalog=https://repository.apache.org/content/repositories/snapshots/
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/6b3c3a17/flink-quickstart/quickstart-scala-SNAPSHOT.sh
----------------------------------------------------------------------
diff --git a/flink-quickstart/quickstart-scala-SNAPSHOT.sh b/flink-quickstart/quickstart-scala-SNAPSHOT.sh
index 943c530..885be4b 100755
--- a/flink-quickstart/quickstart-scala-SNAPSHOT.sh
+++ b/flink-quickstart/quickstart-scala-SNAPSHOT.sh
@@ -24,11 +24,11 @@ PACKAGE=quickstart
mvn archetype:generate \
-DarchetypeGroupId=org.apache.flink \
-DarchetypeArtifactId=flink-quickstart-scala \
- -DarchetypeVersion=0.8-incubating-SNAPSHOT \
+ -DarchetypeVersion=0.9-SNAPSHOT \
-DgroupId=org.apache.flink \
-DartifactId=$PACKAGE \
-Dversion=0.1 \
- -Dpackage=org.apache.flink \
+ -Dpackage=org.myorg.quickstart \
-DinteractiveMode=false \
-DarchetypeCatalog=https://repository.apache.org/content/repositories/snapshots/
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/6b3c3a17/flink-quickstart/quickstart-scala.sh
----------------------------------------------------------------------
diff --git a/flink-quickstart/quickstart-scala.sh b/flink-quickstart/quickstart-scala.sh
index fddcf32..4842b55 100755
--- a/flink-quickstart/quickstart-scala.sh
+++ b/flink-quickstart/quickstart-scala.sh
@@ -24,11 +24,11 @@ PACKAGE=quickstart
mvn archetype:generate \
-DarchetypeGroupId=org.apache.flink \
-DarchetypeArtifactId=flink-quickstart-scala \
- -DarchetypeVersion=0.7.0-incubating \
+ -DarchetypeVersion=0.8.0 \
-DgroupId=org.apache.flink \
-DartifactId=$PACKAGE \
-Dversion=0.1 \
- -Dpackage=org.apache.flink \
+ -Dpackage=org.myorg.quickstart \
-DinteractiveMode=false
#
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/6b3c3a17/flink-quickstart/quickstart.sh
----------------------------------------------------------------------
diff --git a/flink-quickstart/quickstart.sh b/flink-quickstart/quickstart.sh
index b02e9f7..2533605 100755
--- a/flink-quickstart/quickstart.sh
+++ b/flink-quickstart/quickstart.sh
@@ -24,11 +24,11 @@ PACKAGE=quickstart
mvn archetype:generate \
-DarchetypeGroupId=org.apache.flink \
-DarchetypeArtifactId=flink-quickstart-java \
- -DarchetypeVersion=0.7.0-incubating \
+ -DarchetypeVersion=0.8.0 \
-DgroupId=org.apache.flink \
-DartifactId=$PACKAGE \
-Dversion=0.1 \
- -Dpackage=org.apache.flink \
+ -Dpackage=org.myorg.quickstart \
-DinteractiveMode=false
#
[2/2] incubator-flink git commit: [streaming] Temporal fix for
streaming source parallelism
Posted by mb...@apache.org.
[streaming] Temporal fix for streaming source parallelism
Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/2467f36c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/2467f36c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/2467f36c
Branch: refs/heads/release-0.8
Commit: 2467f36c80830e83b43271c89cf1ec827882b424
Parents: 6b3c3a1
Author: mbalassi <mb...@apache.org>
Authored: Fri Dec 26 18:06:51 2014 +0100
Committer: mbalassi <mb...@apache.org>
Committed: Fri Dec 26 18:06:51 2014 +0100
----------------------------------------------------------------------
.../streaming/api/environment/StreamExecutionEnvironment.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/2467f36c/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
index 783fa28..59d56aa 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
@@ -379,8 +379,9 @@ public abstract class StreamExecutionEnvironment {
DataStreamSource<OUT> returnStream = new DataStreamSource<OUT>(this, "source", outTypeInfo);
try {
+ //currently parallel sources are not directly supported
jobGraphBuilder.addSourceVertex(returnStream.getId(), function, null, outTypeInfo,
- "source", SerializationUtils.serialize(function), getDegreeOfParallelism());
+ "source", SerializationUtils.serialize(function), 1);
} catch (SerializationException e) {
throw new RuntimeException("Cannot serialize SourceFunction");
}