flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmetz...@apache.org
Subject git commit: Fix Quickstart example (by using the latest 0.5.2 Stratosphere release)
Date Wed, 16 Jul 2014 14:59:38 GMT
Repository: incubator-flink
Updated Branches:
  refs/heads/master f982d40cb -> 688f1c11c


Fix Quickstart example (by using the latest 0.5.2 Stratosphere release)


Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/688f1c11
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/688f1c11
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/688f1c11

Branch: refs/heads/master
Commit: 688f1c11caba63897b7119f4618a1eb7917fd87b
Parents: f982d40
Author: Robert Metzger <rmetzger@apache.org>
Authored: Tue Jul 15 15:45:24 2014 +0200
Committer: Robert Metzger <rmetzger@apache.org>
Committed: Wed Jul 16 16:58:40 2014 +0200

----------------------------------------------------------------------
 docs/_config.yml                     |  2 ++
 docs/run_example_quickstart.md       | 40 ++++++++++++++++++++++++-------
 flink-quickstart/quickstart-scala.sh |  2 +-
 flink-quickstart/quickstart.sh       |  2 +-
 4 files changed, 36 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/688f1c11/docs/_config.yml
----------------------------------------------------------------------
diff --git a/docs/_config.yml b/docs/_config.yml
index a28715b..e418aab 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -10,6 +10,8 @@ FLINK_VERSION_SHORT: 0.6
 FLINK_ISSUES_URL: https://issues.apache.org/jira/browse/FLINK
 FLINK_GITHUB_URL:  https://github.com/apache/incubator-flink
 
+FLINK_DOWNLOAD_URL_HADOOP_1_STABLE: https://github.com/stratosphere/stratosphere/releases/download/release-0.5.2/stratosphere-0.5.2-bin.tgz
+
 #------------------------------------------------------------------------------
 # BUILD CONFIG
 #------------------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/688f1c11/docs/run_example_quickstart.md
----------------------------------------------------------------------
diff --git a/docs/run_example_quickstart.md b/docs/run_example_quickstart.md
index bc122c0..24cdc1e 100644
--- a/docs/run_example_quickstart.md
+++ b/docs/run_example_quickstart.md
@@ -2,21 +2,44 @@
 title: "Quick Start: Run K-Means Example"
 ---
 
-This guide will Peter demonstrate Flink's features by example. You will see how you can leverage
Flink's Iteration-feature to find clusters in a dataset using [K-Means clustering](http://en.wikipedia.org/wiki/K-means_clustering).

+<div class="panel panel-warning">
+  <div class="panel-heading">
+    Note
+  </div>
+  <div class="panel-body">
+  	This page is using both names "Flink" and "Stratosphere" to refer to the system. We recently
changed the name to Apache Flink, but there is no stable release available for it yet, therefore
the example here refers to the latest stable Stratosphere release (0.5.2).
+  </div>
+</div>
+
+
+This guide will demonstrate Flink's features by example. You will see how you can leverage
Flink's Iteration-feature to find clusters in a dataset using [K-Means clustering](http://en.wikipedia.org/wiki/K-means_clustering).

 On the way, you will see the compiler, the status interface and the result of the algorithm.
 
 
 #  Generate Input Data
 Flink contains a data generator for K-Means.
+<!--
+	REACTIVATE WHEN WE HAVE A FIRST APACHE FLINK RELEASE
 
 	# Download Flink
-	wget {{ site.FLINK_VERSION_STABLE_dl }}
+	wget {{ site.FLINK_DOWNLOAD_URL_HADOOP_1_STABLE }}
 	tar xzf flink-*.tgz 
 	cd flink-*
 	mkdir kmeans
 	cd kmeans
 	# Run data generator
-	java -cp  ../examples/flink-java-examples-{{ site.FLINK_VERSION_STABLE }}-KMeans.jar org.apache.flinkexample.java.clustering.util.KMeansDataGenerator
500 10 0.08
+	java -cp  ../examples/flink-java-examples-{{ site.FLINK_VERSION_STABLE }}-KMeans.jar org.apache.flink.example.java.clustering.util.KMeansDataGenerator
500 10 0.08
+	cp /tmp/points .
+	cp /tmp/centers .
+-->
+	# Download Flink (still called Stratosphere in the 0.5.2 release)
+	wget https://github.com/stratosphere/stratosphere/releases/download/release-0.5.2/stratosphere-0.5.2-bin.tgz
+	tar xzf stratosphere-*.tgz 
+	cd stratosphere
+	mkdir kmeans
+	cd kmeans
+	# Run data generator
+	java -cp  ../examples/stratosphere-java-examples-0.5.2-KMeans.jar eu.stratosphere.example.java.clustering.util.KMeansDataGenerator
500 10 0.08
 	cp /tmp/points .
 	cp /tmp/centers .
 
@@ -32,12 +55,13 @@ The `kmeans/` directory should now contain two files: `centers` and `points`.
 # Review Input Data
 Use the `plotPoints.py` tool to review the result of the data generator. [Download Python
Script](quickstart/plotPoints.py)
 ```bash
-python2.7 plotPoints.py points points input
+python plotPoints.py points points input
 ```
 
 
 Note: You might have to install [matplotlib](http://matplotlib.org/) (`python-matplotlib`
package on Ubuntu) to use the Python script.
 
+You can review the input data stored in the `input-plot.pdf`, for example with Evince (`evince
input-plot.pdf`).
 
 The following overview presents the impact of the different standard deviations on the input
data.
 
@@ -50,10 +74,10 @@ The following overview presents the impact of the different standard deviations
 We are using the generated input data to run the clustering using a Flink job.
 
 	# go to the Flink-root directory
-	cd flink
-	# start Flink (use ./bin/start-cluster.sh if you're on a cluster)
+	cd stratosphere
+	# start Stratosphere/Flink (use ./bin/start-cluster.sh if you're on a cluster)
 	./bin/start-local.sh
-	# Start Flink web client
+	# Start Stratosphere/Flink web client
 	./bin/start-webclient.sh
 
 # Review Flink Compiler
@@ -67,7 +91,7 @@ The Flink webclient allows to submit Flink programs using a graphical user
inter
 		1. <a href="http://localhost:8080/launch.html">Open webclient on localhost:8080</a>
<br>
 		2. Upload the file. 
 			{% highlight bash %}
-			examples/flink-java-examples-0.5-SNAPSHOT-KMeansIterative.jar
+			examples/stratosphere-java-examples-0.5-SNAPSHOT-KMeans.jar
 			{% endhighlight %} </br>
 		3. Select it in the left box to see how the operators in the plan are connected to each
other. <br>
 		4. Enter the arguments in the lower left box:

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/688f1c11/flink-quickstart/quickstart-scala.sh
----------------------------------------------------------------------
diff --git a/flink-quickstart/quickstart-scala.sh b/flink-quickstart/quickstart-scala.sh
index 6e1d6b3..30d534b 100755
--- a/flink-quickstart/quickstart-scala.sh
+++ b/flink-quickstart/quickstart-scala.sh
@@ -24,7 +24,7 @@ PACKAGE=quickstart
 mvn archetype:generate								\
   -DarchetypeGroupId=eu.stratosphere 				\
   -DarchetypeArtifactId=quickstart-scala			\
-  -DarchetypeVersion=0.5.1 							\
+  -DarchetypeVersion=0.5.2 							\
   -DgroupId=eu.stratosphere 						\
   -DartifactId=$PACKAGE								\
   -Dversion=0.1										\

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/688f1c11/flink-quickstart/quickstart.sh
----------------------------------------------------------------------
diff --git a/flink-quickstart/quickstart.sh b/flink-quickstart/quickstart.sh
index bc56ab8..eaab3e8 100755
--- a/flink-quickstart/quickstart.sh
+++ b/flink-quickstart/quickstart.sh
@@ -24,7 +24,7 @@ PACKAGE=quickstart
 mvn archetype:generate								\
   -DarchetypeGroupId=eu.stratosphere 				\
   -DarchetypeArtifactId=quickstart-java				\
-  -DarchetypeVersion=0.5.1							\
+  -DarchetypeVersion=0.5.2							\
   -DgroupId=eu.stratosphere 						\
   -DartifactId=$PACKAGE								\
   -Dversion=0.1										\


Mime
View raw message