Skip to content

Commit 74e5c7c

Browse files
committed
updated per TD's feedback. simplified examples, updated docs
1 parent e33cbeb commit 74e5c7c

File tree

22 files changed

+658
-943
lines changed

22 files changed

+658
-943
lines changed

assembly/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
<dependencies>
191191
<dependency>
192192
<groupId>org.apache.spark</groupId>
193-
<artifactId>kinesis-asl_${scala.binary.version}</artifactId>
193+
<artifactId>spark-streaming-kinesis-asl_${scala.binary.version}</artifactId>
194194
<version>${project.version}</version>
195195
</dependency>
196196
</dependencies>

bin/run-example

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ if [ -n "$1" ]; then
2929
else
3030
echo "Usage: ./bin/run-example <example-class> [example-args]" 1>&2
3131
echo " - set MASTER=XX to use a specific master" 1>&2
32-
echo " - can use abbreviated example class name (e.g. SparkPi, mllib.LinearRegression)" 1>&2
32+
echo " - can use abbreviated example class name relative to com.apache.spark.examples" 1>&2
33+
echo " (e.g. SparkPi, mllib.LinearRegression, streaming.KinesisWordCountASL)" 1>&2
34+
echo " - to run the Kinesis Spark Streaming example, make sure you build with -Pkinesis-asl" 1>&2
3335
exit 1
3436
fi
3537

dev/audit-release/sbt_app_core/src/main/scala/SparkApp.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ object SimpleApp {
4747
System.exit(-1)
4848
}
4949
if (foundGanglia) {
50-
println("Ganglia sink was loaded via spark-ganglia-lgpl")
50+
println("Ganglia sink was loaded via spark-core")
5151
System.exit(-1)
5252
}
5353

5454
// Remove kinesis from default build due to ASL license issue
5555
val foundKinesis = Try(Class.forName("org.apache.spark.streaming.kinesis.KinesisUtils")).isSuccess
5656
if (foundKinesis) {
57-
println("Kinesis was loaded via kinesis-asl")
57+
println("Kinesis was loaded via spark-core")
5858
System.exit(-1)
5959
}
6060
}

dev/audit-release/sbt_app_kinesis/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ scalaVersion := System.getenv.get("SCALA_VERSION")
2323

2424
libraryDependencies += "org.apache.spark" %% "spark-core" % System.getenv.get("SPARK_VERSION")
2525
libraryDependencies += "org.apache.spark" %% "spark-streaming" % System.getenv.get("SPARK_VERSION")
26-
libraryDependencies += "org.apache.spark" %% "kinesis-asl" % System.getenv.get("SPARK_VERSION")
26+
libraryDependencies += "org.apache.spark" %% "spark-streaming-kinesis-asl" % System.getenv.get("SPARK_VERSION")
2727

2828
resolvers ++= Seq(
2929
"Spark Release Repository" at System.getenv.get("SPARK_RELEASE_REPOSITORY"),

docs/streaming-kinesis.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Deployment and runtime notes:
1616
<li>Each shard of a stream is processed by one or more KinesisReceiver's managed by the Kinesis Client Library (KCL) Worker.</li>
1717
<li>Said differently, a single KinesisReceiver can process many shards of a stream.</li>
1818
<li>You never need more KinesisReceivers than the number of shards in your stream.</li>
19+
<li>You can horizontally scale the receiving by creating more KinesisReceiver/DStreams (up to the number of shards for a given stream)</li>
1920
<li>The Kinesis assembly jar must also be present on all worker nodes, as they will need access to the Kinesis Client Library.</li>
2021
<li>/tmp/checkpoint is a valid and accessible directory on all workers (or locally if running in local mode)</li>
2122
<li>This code uses the DefaultAWSCredentialsProviderChain and searches for credentials in the following order of precedence:<br/>

examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
</dependency>
9999
<dependency>
100100
<groupId>org.apache.spark</groupId>
101-
<artifactId>kinesis-asl_${scala.binary.version}</artifactId>
101+
<artifactId>spark-streaming-kinesis-asl_${scala.binary.version}</artifactId>
102102
<version>${project.version}</version>
103103
</dependency>
104104
<dependency>

examples/src/main/java/org/apache/spark/examples/streaming/JavaKinesisWordCount.java

Lines changed: 0 additions & 294 deletions
This file was deleted.

0 commit comments

Comments
 (0)