Skip to content

Commit 06dec37

Browse files
zsxwingrxin
authored andcommitted
[SPARK-13843][STREAMING] Remove streaming-flume, streaming-mqtt, streaming-zeromq, streaming-akka, streaming-twitter to Spark packages
## What changes were proposed in this pull request? Currently there are a few sub-projects, each for integrating with different external sources for Streaming. Now that we have better ability to include external libraries (spark packages) and with Spark 2.0 coming up, we can move the following projects out of Spark to https://github.com/spark-packages - streaming-flume - streaming-akka - streaming-mqtt - streaming-zeromq - streaming-twitter They are just some ancillary packages and considering the overhead of maintenance, running tests and PR failures, it's better to maintain them out of Spark. In addition, these projects can have their different release cycles and we can release them faster. I have already copied these projects to https://github.com/spark-packages ## How was this patch tested? Jenkins tests Author: Shixiong Zhu <shixiong@databricks.com> Closes apache#11672 from zsxwing/remove-external-pkg.
1 parent 8301fad commit 06dec37

File tree

84 files changed

+13
-7734
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+13
-7734
lines changed

dev/audit-release/audit_release.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,7 @@ def ensure_path_not_present(path):
116116
# dependencies within those projects.
117117
modules = [
118118
"spark-core", "spark-mllib", "spark-streaming", "spark-repl",
119-
"spark-graphx", "spark-streaming-flume", "spark-streaming-kafka",
120-
"spark-streaming-mqtt", "spark-streaming-twitter", "spark-streaming-zeromq",
119+
"spark-graphx", "spark-streaming-kafka",
121120
"spark-catalyst", "spark-sql", "spark-hive", "spark-streaming-kinesis-asl"
122121
]
123122
modules = map(lambda m: "%s_%s" % (m, SCALA_BINARY_VERSION), modules)

dev/run-tests.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,9 +337,6 @@ def build_spark_sbt(hadoop_version):
337337
build_profiles = get_hadoop_profiles(hadoop_version) + modules.root.build_profile_flags
338338
sbt_goals = ["package",
339339
"streaming-kafka-assembly/assembly",
340-
"streaming-flume-assembly/assembly",
341-
"streaming-mqtt-assembly/assembly",
342-
"streaming-mqtt/test:assembly",
343340
"streaming-kinesis-asl-assembly/assembly"]
344341
profiles_and_goals = build_profiles + sbt_goals
345342

dev/sparktestsupport/modules.py

Lines changed: 0 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -210,43 +210,6 @@ def __hash__(self):
210210
)
211211

212212

213-
streaming_zeromq = Module(
214-
name="streaming-zeromq",
215-
dependencies=[streaming],
216-
source_file_regexes=[
217-
"external/zeromq",
218-
],
219-
sbt_test_goals=[
220-
"streaming-zeromq/test",
221-
]
222-
)
223-
224-
225-
streaming_twitter = Module(
226-
name="streaming-twitter",
227-
dependencies=[streaming],
228-
source_file_regexes=[
229-
"external/twitter",
230-
],
231-
sbt_test_goals=[
232-
"streaming-twitter/test",
233-
]
234-
)
235-
236-
237-
streaming_mqtt = Module(
238-
name="streaming-mqtt",
239-
dependencies=[streaming],
240-
source_file_regexes=[
241-
"external/mqtt",
242-
"external/mqtt-assembly",
243-
],
244-
sbt_test_goals=[
245-
"streaming-mqtt/test",
246-
]
247-
)
248-
249-
250213
streaming_kafka = Module(
251214
name="streaming-kafka",
252215
dependencies=[streaming],
@@ -260,51 +223,6 @@ def __hash__(self):
260223
)
261224

262225

263-
streaming_flume_sink = Module(
264-
name="streaming-flume-sink",
265-
dependencies=[streaming],
266-
source_file_regexes=[
267-
"external/flume-sink",
268-
],
269-
sbt_test_goals=[
270-
"streaming-flume-sink/test",
271-
]
272-
)
273-
274-
275-
streaming_akka = Module(
276-
name="streaming-akka",
277-
dependencies=[streaming],
278-
source_file_regexes=[
279-
"external/akka",
280-
],
281-
sbt_test_goals=[
282-
"streaming-akka/test",
283-
]
284-
)
285-
286-
287-
streaming_flume = Module(
288-
name="streaming-flume",
289-
dependencies=[streaming],
290-
source_file_regexes=[
291-
"external/flume",
292-
],
293-
sbt_test_goals=[
294-
"streaming-flume/test",
295-
]
296-
)
297-
298-
299-
streaming_flume_assembly = Module(
300-
name="streaming-flume-assembly",
301-
dependencies=[streaming_flume, streaming_flume_sink],
302-
source_file_regexes=[
303-
"external/flume-assembly",
304-
]
305-
)
306-
307-
308226
mllib = Module(
309227
name="mllib",
310228
dependencies=[streaming, sql],
@@ -376,8 +294,6 @@ def __hash__(self):
376294
pyspark_core,
377295
streaming,
378296
streaming_kafka,
379-
streaming_flume_assembly,
380-
streaming_mqtt,
381297
streaming_kinesis_asl
382298
],
383299
source_file_regexes=[

examples/pom.xml

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -65,37 +65,6 @@
6565
<version>${project.version}</version>
6666
<scope>provided</scope>
6767
</dependency>
68-
<dependency>
69-
<groupId>org.apache.spark</groupId>
70-
<artifactId>spark-streaming-twitter_${scala.binary.version}</artifactId>
71-
<version>${project.version}</version>
72-
</dependency>
73-
<dependency>
74-
<groupId>org.apache.spark</groupId>
75-
<artifactId>spark-streaming-flume_${scala.binary.version}</artifactId>
76-
<version>${project.version}</version>
77-
</dependency>
78-
<dependency>
79-
<groupId>org.apache.spark</groupId>
80-
<artifactId>spark-streaming-akka_${scala.binary.version}</artifactId>
81-
<version>${project.version}</version>
82-
</dependency>
83-
<dependency>
84-
<groupId>org.apache.spark</groupId>
85-
<artifactId>spark-streaming-mqtt_${scala.binary.version}</artifactId>
86-
<version>${project.version}</version>
87-
</dependency>
88-
<dependency>
89-
<groupId>org.apache.spark</groupId>
90-
<artifactId>spark-streaming-zeromq_${scala.binary.version}</artifactId>
91-
<version>${project.version}</version>
92-
<exclusions>
93-
<exclusion>
94-
<groupId>org.spark-project.protobuf</groupId>
95-
<artifactId>protobuf-java</artifactId>
96-
</exclusion>
97-
</exclusions>
98-
</dependency>
9968
<dependency>
10069
<groupId>org.apache.spark</groupId>
10170
<artifactId>spark-streaming-kafka_${scala.binary.version}</artifactId>

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

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

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

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

0 commit comments

Comments
 (0)