Skip to content

Commit

Permalink
[HOTFIX] [SQL] Fixes compilation error
Browse files Browse the repository at this point in the history
Jenkins master builders are currently broken by a merge conflict between PR #8584 and PR #8155.

Author: Cheng Lian <[email protected]>

Closes #8614 from liancheng/hotfix/fix-pr-8155-8584-conflict.
  • Loading branch information
liancheng authored and rxin committed Sep 5, 2015
1 parent 47058ca commit 6c75194
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down

0 comments on commit 6c75194

Please sign in to comment.