set active SQLContext manually

mengxr · mengxr · commit 1a2a8661adb0 · 2015-11-13T12:02:01.000-08:00
diff --git a/mllib/src/main/scala/org/apache/spark/ml/util/ReadWrite.scala b/mllib/src/main/scala/org/apache/spark/ml/util/ReadWrite.scala
@@ -50,7 +50,7 @@ private[util] sealed trait BaseReadWrite {
    */
   protected final def sqlContext: SQLContext = {
     if (optionSQLContext.isEmpty) {
-      optionSQLContext = Some(new SQLContext(SparkContext.getOrCreate()))
+      optionSQLContext = Some(SQLContext.getOrCreate(SparkContext.getOrCreate()))
     }
     optionSQLContext.get
   }
diff --git a/mllib/src/test/scala/org/apache/spark/mllib/util/MLlibTestSparkContext.scala b/mllib/src/test/scala/org/apache/spark/mllib/util/MLlibTestSparkContext.scala
@@ -34,6 +34,7 @@ trait MLlibTestSparkContext extends BeforeAndAfterAll { self: Suite =>
     sc = new SparkContext(conf)
     SQLContext.clearActive()
     sqlContext = new SQLContext(sc)
+    SQLContext.setActive(sqlContext)
   }
 
   override def afterAll() {

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ private[util] sealed trait BaseReadWrite {`
`50`	`50`	`*/`
`51`	`51`	`protected final def sqlContext: SQLContext = {`
`52`	`52`	`if (optionSQLContext.isEmpty) {`
`53`		`- optionSQLContext = Some(new SQLContext(SparkContext.getOrCreate()))`
	`53`	`+ optionSQLContext = Some(SQLContext.getOrCreate(SparkContext.getOrCreate()))`
`54`	`54`	`}`
`55`	`55`	`optionSQLContext.get`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ trait MLlibTestSparkContext extends BeforeAndAfterAll { self: Suite =>`
`34`	`34`	`sc = new SparkContext(conf)`
`35`	`35`	`SQLContext.clearActive()`
`36`	`36`	`sqlContext = new SQLContext(sc)`
	`37`	`+ SQLContext.setActive(sqlContext)`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`override def afterAll() {`