spark git commit: [SPARK-12177][TEST] Removed test to avoid compilation issue in scala 2.10

2016-06-30 Thread lian 
Repository: spark
Updated Branches:
  refs/heads/branch-2.0 1d274455c -> 6a4f4c1d7


[SPARK-12177][TEST] Removed test to avoid compilation issue in scala 2.10

## What changes were proposed in this pull request?

The commented lines failed scala 2.10 build. This is because of change in 
behavior of case classes between 2.10 and 2.11. In scala 2.10, if companion 
object of a case class has explicitly defined apply(), then the implicit apply 
method is not generated. In scala 2.11 it is generated. Hence, the lines 
compile fine in 2.11 but not in 2.10.

This simply comments the tests to fix broken build. Correct solution is pending.

Author: Tathagata Das 

Closes #13992 from tdas/SPARK-12177.

(cherry picked from commit de8ab313e1fe59f849a62e59349224581ff0b40a)
Signed-off-by: Cheng Lian 


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/6a4f4c1d
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/6a4f4c1d
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/6a4f4c1d

Branch: refs/heads/branch-2.0
Commit: 6a4f4c1d751db9542ba49755e859b55b42be3236
Parents: 1d27445
Author: Tathagata Das 
Authored: Thu Jun 30 18:06:04 2016 +0800
Committer: Cheng Lian 
Committed: Thu Jun 30 18:06:20 2016 +0800

--
 .../spark/streaming/kafka010/JavaConsumerStrategySuite.java  | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/6a4f4c1d/external/kafka-0-10/src/test/java/org/apache/spark/streaming/kafka010/JavaConsumerStrategySuite.java
--
diff --git 
a/external/kafka-0-10/src/test/java/org/apache/spark/streaming/kafka010/JavaConsumerStrategySuite.java
 
b/external/kafka-0-10/src/test/java/org/apache/spark/streaming/kafka010/JavaConsumerStrategySuite.java
index aba45f5..8d7c05b 100644
--- 
a/external/kafka-0-10/src/test/java/org/apache/spark/streaming/kafka010/JavaConsumerStrategySuite.java
+++ 
b/external/kafka-0-10/src/test/java/org/apache/spark/streaming/kafka010/JavaConsumerStrategySuite.java
@@ -50,8 +50,8 @@ public class JavaConsumerStrategySuite implements 
Serializable {
   JavaConverters.mapAsScalaMapConverter(offsets).asScala();
 
 // make sure constructors can be called from java
-final ConsumerStrategy sub0 =
-  Subscribe.apply(topics, kafkaParams, offsets);
+// final ConsumerStrategy sub0 =  // does not 
compile in Scala 2.10
+//   Subscribe.apply(topics, kafkaParams, offsets);
 final ConsumerStrategy sub1 =
   Subscribe.apply(sTopics, sKafkaParams, sOffsets);
 final ConsumerStrategy sub2 =
@@ -65,8 +65,8 @@ public class JavaConsumerStrategySuite implements 
Serializable {
   sub1.executorKafkaParams().get("bootstrap.servers"),
   sub3.executorKafkaParams().get("bootstrap.servers"));
 
-final ConsumerStrategy asn0 =
-  Assign.apply(parts, kafkaParams, offsets);
+// final ConsumerStrategy asn0 =  // does not 
compile in Scala 2.10
+//   Assign.apply(parts, kafkaParams, offsets);
 final ConsumerStrategy asn1 =
   Assign.apply(sParts, sKafkaParams, sOffsets);
 final ConsumerStrategy asn2 =


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

spark git commit: [SPARK-12177][TEST] Removed test to avoid compilation issue in scala 2.10

2016-06-30 Thread lian 
Repository: spark
Updated Branches:
  refs/heads/master b30a2dc7c -> de8ab313e


[SPARK-12177][TEST] Removed test to avoid compilation issue in scala 2.10

## What changes were proposed in this pull request?

The commented lines failed scala 2.10 build. This is because of change in 
behavior of case classes between 2.10 and 2.11. In scala 2.10, if companion 
object of a case class has explicitly defined apply(), then the implicit apply 
method is not generated. In scala 2.11 it is generated. Hence, the lines 
compile fine in 2.11 but not in 2.10.

This simply comments the tests to fix broken build. Correct solution is pending.

Author: Tathagata Das 

Closes #13992 from tdas/SPARK-12177.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/de8ab313
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/de8ab313
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/de8ab313

Branch: refs/heads/master
Commit: de8ab313e1fe59f849a62e59349224581ff0b40a
Parents: b30a2dc
Author: Tathagata Das 
Authored: Thu Jun 30 18:06:04 2016 +0800
Committer: Cheng Lian 
Committed: Thu Jun 30 18:06:04 2016 +0800

--
 .../spark/streaming/kafka010/JavaConsumerStrategySuite.java  | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/de8ab313/external/kafka-0-10/src/test/java/org/apache/spark/streaming/kafka010/JavaConsumerStrategySuite.java
--
diff --git 
a/external/kafka-0-10/src/test/java/org/apache/spark/streaming/kafka010/JavaConsumerStrategySuite.java
 
b/external/kafka-0-10/src/test/java/org/apache/spark/streaming/kafka010/JavaConsumerStrategySuite.java
index aba45f5..8d7c05b 100644
--- 
a/external/kafka-0-10/src/test/java/org/apache/spark/streaming/kafka010/JavaConsumerStrategySuite.java
+++ 
b/external/kafka-0-10/src/test/java/org/apache/spark/streaming/kafka010/JavaConsumerStrategySuite.java
@@ -50,8 +50,8 @@ public class JavaConsumerStrategySuite implements 
Serializable {
   JavaConverters.mapAsScalaMapConverter(offsets).asScala();
 
 // make sure constructors can be called from java
-final ConsumerStrategy sub0 =
-  Subscribe.apply(topics, kafkaParams, offsets);
+// final ConsumerStrategy sub0 =  // does not 
compile in Scala 2.10
+//   Subscribe.apply(topics, kafkaParams, offsets);
 final ConsumerStrategy sub1 =
   Subscribe.apply(sTopics, sKafkaParams, sOffsets);
 final ConsumerStrategy sub2 =
@@ -65,8 +65,8 @@ public class JavaConsumerStrategySuite implements 
Serializable {
   sub1.executorKafkaParams().get("bootstrap.servers"),
   sub3.executorKafkaParams().get("bootstrap.servers"));
 
-final ConsumerStrategy asn0 =
-  Assign.apply(parts, kafkaParams, offsets);
+// final ConsumerStrategy asn0 =  // does not 
compile in Scala 2.10
+//   Assign.apply(parts, kafkaParams, offsets);
 final ConsumerStrategy asn1 =
   Assign.apply(sParts, sKafkaParams, sOffsets);
 final ConsumerStrategy asn2 =


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org