clear active SQLContext before and after tests

mengxr · mengxr · commit 62b09a31c837 · 2015-11-12T15:57:54.000-08:00
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
@@ -32,11 +32,13 @@ trait MLlibTestSparkContext extends BeforeAndAfterAll { self: Suite =>
       .setMaster("local[2]")
       .setAppName("MLlibUnitTest")
     sc = new SparkContext(conf)
+    SQLContext.clearActive()
     sqlContext = new SQLContext(sc)
   }
 
   override def afterAll() {
     sqlContext = null
+    SQLContext.clearActive()
     if (sc != null) {
       sc.stop()
     }

Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,13 @@ trait MLlibTestSparkContext extends BeforeAndAfterAll { self: Suite =>`
`32`	`32`	`.setMaster("local[2]")`
`33`	`33`	`.setAppName("MLlibUnitTest")`
`34`	`34`	`sc = new SparkContext(conf)`
	`35`	`+ SQLContext.clearActive()`
`35`	`36`	`sqlContext = new SQLContext(sc)`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`override def afterAll() {`
`39`	`40`	`sqlContext = null`
	`41`	`+ SQLContext.clearActive()`
`40`	`42`	`if (sc != null) {`
`41`	`43`	`sc.stop()`
`42`	`44`	`}`