Initialize properly

Author: Patrick Woody

sql/core/src/test/scala/org/apache/spark/sql/streaming/StreamingSymmetricHashJoinHelperSuite.scala

@@ -35,8 +35,14 @@ class StreamingSymmetricHashJoinHelperSuite extends StreamTest {
   val rightColC = new Column(rightAttributeC)
   val rightColD = new Column(rightAttributeD)
 
-  val left = new LocalTableScanExec(Seq(leftAttributeA, leftAttributeB), Seq())
-  val right = new LocalTableScanExec(Seq(rightAttributeC, rightAttributeD), Seq())
+  var left: LocalTableScanExec = _
+  var right: LocalTableScanExec = _
+
+  protected override def beforeAll(): Unit = {
+    super.beforeAll()
+    left = new LocalTableScanExec(Seq(leftAttributeA, leftAttributeB), Seq())
+    right = new LocalTableScanExec(Seq(rightAttributeC, rightAttributeD), Seq())
+  }
 
   test("empty") {
     val split = JoinConditionSplitPredicates(None, left, right)
@@ -123,4 +129,5 @@ class StreamingSymmetricHashJoinHelperSuite extends StreamTest {
     assert(split.bothSides.contains((leftColA === rightColC && randCol > lit(0)).expr))
     assert(split.full.contains(predicate))
   }
+
 }

sql/core/src/test/scala/org/apache/spark/sql/test/SharedSparkSession.scala

@@ -83,7 +83,9 @@ trait SharedSparkSession
    * Make sure the [[TestSparkSession]] is initialized before any tests are run.
    */
   protected override def beforeAll(): Unit = {
-    initializeSession()
+    this.synchronized {
+      initializeSession()
+    }
 
     // Ensure we have initialized the context before calling parent code
     super.beforeAll()
@@ -97,12 +99,14 @@ trait SharedSparkSession
       super.afterAll()
     } finally {
       try {
-        if (_spark != null) {
-          try {
-            _spark.sessionState.catalog.reset()
-          } finally {
-            _spark.stop()
-            _spark = null
+        this.synchronized {
+          if (_spark != null) {
+            try {
+              _spark.sessionState.catalog.reset()
+            } finally {
+              _spark.stop()
+              _spark = null
+            }
           }
         }
       } finally {