[1/3] spark git commit: [EXAMPLE][MINOR] Add missing awaitTermination in click stream example
Repository: spark Updated Branches: refs/heads/branch-1.6 e8390e1ab -> 92496b56d [EXAMPLE][MINOR] Add missing awaitTermination in click stream example Author: jerryshao Closes #9730 from jerryshao/clickstream-fix. (cherry picked from commit bd10eb81c98e5e9df453f721943a3e82d9f74ae4) Signed-off-by: Michael Armbrust Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/92496b56 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/92496b56 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/92496b56 Branch: refs/heads/branch-1.6 Commit: 92496b56d0fe81180ce3d69f16da63857290e54d Parents: 24cf704 Author: jerryshao Authored: Mon Nov 16 17:02:21 2015 -0800 Committer: Michael Armbrust Committed: Wed Nov 18 15:03:37 2015 -0800 -- .../spark/examples/streaming/clickstream/PageViewStream.scala| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/spark/blob/92496b56/examples/src/main/scala/org/apache/spark/examples/streaming/clickstream/PageViewStream.scala -- diff --git a/examples/src/main/scala/org/apache/spark/examples/streaming/clickstream/PageViewStream.scala b/examples/src/main/scala/org/apache/spark/examples/streaming/clickstream/PageViewStream.scala index ec7d39d..4ef2386 100644 --- a/examples/src/main/scala/org/apache/spark/examples/streaming/clickstream/PageViewStream.scala +++ b/examples/src/main/scala/org/apache/spark/examples/streaming/clickstream/PageViewStream.scala @@ -18,7 +18,6 @@ // scalastyle:off println package org.apache.spark.examples.streaming.clickstream -import org.apache.spark.SparkContext._ import org.apache.spark.streaming.{Seconds, StreamingContext} import org.apache.spark.examples.streaming.StreamingExamples // scalastyle:off @@ -88,7 +87,7 @@ object PageViewStream { // An external dataset we want to join to this stream val userList = ssc.sparkContext.parallelize( - Map(1 -> "Patrick Wendell", 2->"Reynold Xin", 3->"Matei Zaharia").toSeq) + Map(1 -> "Patrick Wendell", 2 -> "Reynold Xin", 3 -> "Matei Zaharia").toSeq) metric match { case "pageCounts" => pageCounts.print() @@ -106,6 +105,7 @@ object PageViewStream { } ssc.start() +ssc.awaitTermination() } } // scalastyle:on println - To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
spark git commit: [EXAMPLE][MINOR] Add missing awaitTermination in click stream example
Repository: spark Updated Branches: refs/heads/master 33a0ec937 -> bd10eb81c [EXAMPLE][MINOR] Add missing awaitTermination in click stream example Author: jerryshao Closes #9730 from jerryshao/clickstream-fix. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/bd10eb81 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/bd10eb81 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/bd10eb81 Branch: refs/heads/master Commit: bd10eb81c98e5e9df453f721943a3e82d9f74ae4 Parents: 33a0ec9 Author: jerryshao Authored: Mon Nov 16 17:02:21 2015 -0800 Committer: Andrew Or Committed: Mon Nov 16 17:02:21 2015 -0800 -- .../spark/examples/streaming/clickstream/PageViewStream.scala| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/spark/blob/bd10eb81/examples/src/main/scala/org/apache/spark/examples/streaming/clickstream/PageViewStream.scala -- diff --git a/examples/src/main/scala/org/apache/spark/examples/streaming/clickstream/PageViewStream.scala b/examples/src/main/scala/org/apache/spark/examples/streaming/clickstream/PageViewStream.scala index ec7d39d..4ef2386 100644 --- a/examples/src/main/scala/org/apache/spark/examples/streaming/clickstream/PageViewStream.scala +++ b/examples/src/main/scala/org/apache/spark/examples/streaming/clickstream/PageViewStream.scala @@ -18,7 +18,6 @@ // scalastyle:off println package org.apache.spark.examples.streaming.clickstream -import org.apache.spark.SparkContext._ import org.apache.spark.streaming.{Seconds, StreamingContext} import org.apache.spark.examples.streaming.StreamingExamples // scalastyle:off @@ -88,7 +87,7 @@ object PageViewStream { // An external dataset we want to join to this stream val userList = ssc.sparkContext.parallelize( - Map(1 -> "Patrick Wendell", 2->"Reynold Xin", 3->"Matei Zaharia").toSeq) + Map(1 -> "Patrick Wendell", 2 -> "Reynold Xin", 3 -> "Matei Zaharia").toSeq) metric match { case "pageCounts" => pageCounts.print() @@ -106,6 +105,7 @@ object PageViewStream { } ssc.start() +ssc.awaitTermination() } } // scalastyle:on println - To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org