[HOTFIX] [SQL] Fixes compilation error

liancheng · rxin · commit 6c751940ea84 · 2015-09-04T22:57:52.000-10:00
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.
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
@@ -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")
     }

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ class SQLConfSuite extends QueryTest with SharedSQLContext {`
`80`	`80`	`val original = sqlContext.conf.numShufflePartitions`
`81`	`81`	`try{`
`82`	`82`	`sql(s"set ${SQLConf.Deprecated.MAPRED_REDUCE_TASKS}=10")`
`83`		`- assert(ctx.conf.numShufflePartitions === 10)`
	`83`	`+ assert(sqlContext.conf.numShufflePartitions === 10)`
`84`	`84`	`} finally {`
`85`	`85`	`sql(s"set ${SQLConf.SHUFFLE_PARTITIONS}=$original")`
`86`	`86`	`}`