You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pr...@apache.org on 2015/04/23 13:24:43 UTC

spark git commit: [HOTFIX] [SQL] Fix compilation for scala 2.11.

Repository: spark
Updated Branches:
  refs/heads/master f60bece14 -> a7d65d38f


[HOTFIX] [SQL] Fix compilation for scala 2.11.

Author: Prashant Sharma <pr...@imaginea.com>

Closes #5652 from ScrapCodes/hf/compilation-fix-scala-2.11 and squashes the following commits:

819ff06 [Prashant Sharma] [HOTFIX] Fix compilation for scala 2.11.


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

Branch: refs/heads/master
Commit: a7d65d38f934c5c751ba32aa7ab648c6d16044ab
Parents: f60bece
Author: Prashant Sharma <pr...@imaginea.com>
Authored: Thu Apr 23 16:45:26 2015 +0530
Committer: Prashant Sharma <pr...@imaginea.com>
Committed: Thu Apr 23 16:45:26 2015 +0530

----------------------------------------------------------------------
 .../test/java/test/org/apache/spark/sql/JavaDataFrameSuite.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/a7d65d38/sql/core/src/test/java/test/org/apache/spark/sql/JavaDataFrameSuite.java
----------------------------------------------------------------------
diff --git a/sql/core/src/test/java/test/org/apache/spark/sql/JavaDataFrameSuite.java b/sql/core/src/test/java/test/org/apache/spark/sql/JavaDataFrameSuite.java
index fc3ed4a..e02c848 100644
--- a/sql/core/src/test/java/test/org/apache/spark/sql/JavaDataFrameSuite.java
+++ b/sql/core/src/test/java/test/org/apache/spark/sql/JavaDataFrameSuite.java
@@ -162,7 +162,7 @@ public class JavaDataFrameSuite {
     Buffer<Integer> outputBuffer = (Buffer<Integer>) first.getJavaMap(2).get("hello");
     Assert.assertArrayEquals(
       bean.getC().get("hello"),
-      Ints.toArray(JavaConversions.asJavaList(outputBuffer)));
+      Ints.toArray(JavaConversions.bufferAsJavaList(outputBuffer)));
     Seq<String> d = first.getAs(3);
     Assert.assertEquals(bean.getD().size(), d.length());
     for (int i = 0; i < d.length(); i++) {


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