From e3cf0aa8b8dea942009a9ec3f29a75f451102f6c Mon Sep 17 00:00:00 2001 From: Yadong Qi Date: Mon, 28 Jul 2014 16:08:50 +0800 Subject: [PATCH 1/3] Test --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f87e07aa5cc90..a0e57eb95f1d9 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +Test # Apache Spark Spark is a fast and general cluster computing system for Big Data. It provides From 7773b3d2603dfe9bb1e27588e12b3e18f81042da Mon Sep 17 00:00:00 2001 From: Yadong Qi Date: Fri, 7 Nov 2014 15:16:21 +0800 Subject: [PATCH 2/3] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index a0e57eb95f1d9..f87e07aa5cc90 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -Test # Apache Spark Spark is a fast and general cluster computing system for Big Data. It provides From 3f982575b4f8bd66b672760ec6d2733b37082874 Mon Sep 17 00:00:00 2001 From: Yadong Qi Date: Fri, 7 Nov 2014 15:18:51 +0800 Subject: [PATCH 3/3] The same function should have the same realization. --- .../spark/streaming/dstream/UnionDStream.scala | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/streaming/src/main/scala/org/apache/spark/streaming/dstream/UnionDStream.scala b/streaming/src/main/scala/org/apache/spark/streaming/dstream/UnionDStream.scala index 57429a15329a1..095160398bef5 100644 --- a/streaming/src/main/scala/org/apache/spark/streaming/dstream/UnionDStream.scala +++ b/streaming/src/main/scala/org/apache/spark/streaming/dstream/UnionDStream.scala @@ -27,18 +27,11 @@ import scala.reflect.ClassTag private[streaming] class UnionDStream[T: ClassTag](parents: Array[DStream[T]]) extends DStream[T](parents.head.ssc) { - - if (parents.length == 0) { - throw new IllegalArgumentException("Empty array of parents") - } - - if (parents.map(_.ssc).distinct.size > 1) { - throw new IllegalArgumentException("Array of parents have different StreamingContexts") - } - - if (parents.map(_.slideDuration).distinct.size > 1) { - throw new IllegalArgumentException("Array of parents have different slide times") - } + + require(parents.length > 0, "List of DStreams to transform is empty") + require(parents.map(_.ssc).distinct.size == 1, "Some of the DStreams have different contexts") + require(parents.map(_.slideDuration).distinct.size == 1, + "Some of the DStreams have different slide durations") override def dependencies = parents.toList