Return-Path: X-Original-To: apmail-spark-commits-archive@minotaur.apache.org Delivered-To: apmail-spark-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CFB4418B48 for ; Sat, 26 Dec 2015 01:42:32 +0000 (UTC) Received: (qmail 96611 invoked by uid 500); 26 Dec 2015 01:42:32 -0000 Delivered-To: apmail-spark-commits-archive@spark.apache.org Received: (qmail 96578 invoked by uid 500); 26 Dec 2015 01:42:32 -0000 Mailing-List: contact commits-help@spark.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@spark.apache.org Received: (qmail 96541 invoked by uid 99); 26 Dec 2015 01:42:32 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Dec 2015 01:42:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7450DDFFD8; Sat, 26 Dec 2015 01:42:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: joshrosen@apache.org To: commits@spark.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: spark git commit: [SPARK-12477][HOTIFX] Fix test compilation in branch-1.5 Date: Sat, 26 Dec 2015 01:42:31 +0000 (UTC) Repository: spark Updated Branches: refs/heads/branch-1.5 e7e0540eb -> 86161a4f7 [SPARK-12477][HOTIFX] Fix test compilation in branch-1.5 This fixes a test compilation break in branch-1.5; the break was introduced by #10429. Author: Josh Rosen Closes #10478 from JoshRosen/SPARK-12477-branch-1.5-compile-fix. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/86161a4f Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/86161a4f Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/86161a4f Branch: refs/heads/branch-1.5 Commit: 86161a4f742ac37aebb064d76eca93873b8f5a4e Parents: e7e0540 Author: Josh Rosen Authored: Fri Dec 25 17:41:59 2015 -0800 Committer: Josh Rosen Committed: Fri Dec 25 17:41:59 2015 -0800 ---------------------------------------------------------------------- .../scala/org/apache/spark/sql/DataFrameComplexTypeSuite.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/86161a4f/sql/core/src/test/scala/org/apache/spark/sql/DataFrameComplexTypeSuite.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameComplexTypeSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameComplexTypeSuite.scala index 06d711f..0b9e8d2 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameComplexTypeSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameComplexTypeSuite.scala @@ -45,7 +45,7 @@ class DataFrameComplexTypeSuite extends QueryTest with SharedSQLContext { } test("SPARK-12477 accessing null element in array field") { - val df = sparkContext.parallelize(Seq((Seq("val1", null, "val2"), + val df = sqlContext.sparkContext.parallelize(Seq((Seq("val1", null, "val2"), Seq(Some(1), None, Some(2))))).toDF("s", "i") val nullStringRow = df.selectExpr("s[1]").collect()(0) assert(nullStringRow == org.apache.spark.sql.Row(null)) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org For additional commands, e-mail: commits-help@spark.apache.org