spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject spark git commit: [HOTFIX] [SQL] Fixes compilation error
Date Sat, 05 Sep 2015 08:58:24 GMT
Repository: spark
Updated Branches:
  refs/heads/master 47058ca5d -> 6c751940e


[HOTFIX] [SQL] Fixes compilation error

Jenkins master builders are currently broken by a merge conflict between PR #8584 and PR #8155.

Author: Cheng Lian <lian@databricks.com>

Closes #8614 from liancheng/hotfix/fix-pr-8155-8584-conflict.


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

Branch: refs/heads/master
Commit: 6c751940ea8449b7540ba956a00ed19ba0af599b
Parents: 47058ca
Author: Cheng Lian <lian@databricks.com>
Authored: Fri Sep 4 22:57:52 2015 -1000
Committer: Reynold Xin <rxin@databricks.com>
Committed: Fri Sep 4 22:57:52 2015 -1000

----------------------------------------------------------------------
 sql/core/src/test/scala/org/apache/spark/sql/SQLConfSuite.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/6c751940/sql/core/src/test/scala/org/apache/spark/sql/SQLConfSuite.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/SQLConfSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/SQLConfSuite.scala
index 589ba86..3d2bd23 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/SQLConfSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/SQLConfSuite.scala
@@ -80,7 +80,7 @@ class SQLConfSuite extends QueryTest with SharedSQLContext {
     val original = sqlContext.conf.numShufflePartitions
     try{
       sql(s"set ${SQLConf.Deprecated.MAPRED_REDUCE_TASKS}=10")
-      assert(ctx.conf.numShufflePartitions === 10)
+      assert(sqlContext.conf.numShufflePartitions === 10)
     } finally {
       sql(s"set ${SQLConf.SHUFFLE_PARTITIONS}=$original")
     }


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


Mime
View raw message