diff options
| author | Cheng Lian <lian@databricks.com> | 2015-09-04 22:57:52 -1000 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2015-09-04 22:57:52 -1000 |
| commit | 6c751940ea8449b7540ba956a00ed19ba0af599b (patch) | |
| tree | d824f1667e6648d3d28541fa33cb028fbf774100 /sql | |
| parent | 47058ca5db3135a33feea9f485fcda455e430054 (diff) | |
| download | spark-6c751940ea8449b7540ba956a00ed19ba0af599b.tar.gz spark-6c751940ea8449b7540ba956a00ed19ba0af599b.tar.bz2 spark-6c751940ea8449b7540ba956a00ed19ba0af599b.zip | |
[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.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/core/src/test/scala/org/apache/spark/sql/SQLConfSuite.scala | 2 |
1 files changed, 1 insertions, 1 deletions
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 589ba86a84..3d2bd236ce 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") } |