From 6b3c3a1780b1270226a76f6a81a9ad2029578a7a Mon Sep 17 00:00:00 2001 From: mbalassi Date: Fri, 26 Dec 2014 18:02:55 +0100 Subject: [PATCH 1/2] [FLINK-1225] Fix for quickstart packaging This closes #279 --- 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(-) diff --git a/flink-quickstart/quickstart-SNAPSHOT.sh b/flink-quickstart/quickstart-SNAPSHOT.sh index 47ce1f41bb40c..92e2263e31485 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/ diff --git a/flink-quickstart/quickstart-scala-SNAPSHOT.sh b/flink-quickstart/quickstart-scala-SNAPSHOT.sh index 943c5303a86d4..885be4bc07c2d 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/ diff --git a/flink-quickstart/quickstart-scala.sh b/flink-quickstart/quickstart-scala.sh index fddcf32552d71..4842b558afac6 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 # diff --git a/flink-quickstart/quickstart.sh b/flink-quickstart/quickstart.sh index b02e9f72159ff..2533605e26ce7 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 # From 2467f36c80830e83b43271c89cf1ec827882b424 Mon Sep 17 00:00:00 2001 From: mbalassi Date: Fri, 26 Dec 2014 18:06:51 +0100 Subject: [PATCH 2/2] [streaming] Temporal fix for streaming source parallelism --- .../streaming/api/environment/StreamExecutionEnvironment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 783fa28b29e08..59d56aa05c196 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 DataStreamSource addSource(SourceFunction function) { DataStreamSource returnStream = new DataStreamSource(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"); }