Exclude certain local properties from being inherited

such as, cough cough, the SQL execution ID. This was a problem
because scala's parallel collections spawns threads as children
of the existing threads, causing the execution ID to be inherited
when it shouldn't be.

core/src/main/scala/org/apache/spark/SparkContext.scala

@@ -29,7 +29,7 @@ import java.util.UUID.randomUUID
 import scala.collection.JavaConverters._
 import scala.collection.{Map, Set}
 import scala.collection.generic.Growable
-import scala.collection.mutable.HashMap
+import scala.collection.mutable.{HashMap, HashSet}
 import scala.reflect.{ClassTag, classTag}
 import scala.util.control.NonFatal
 
@@ -348,10 +348,19 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli
 
   // Thread Local variable that can be used by users to pass information down the stack
   private val localProperties = new InheritableThreadLocal[Properties] {
-    override protected def childValue(parent: Properties): Properties = new Properties(parent)
+    override protected def childValue(parent: Properties): Properties = {
+      val p = new Properties(parent)
+      nonInheritedLocalProperties.foreach(p.remove)
+      p
+    }
     override protected def initialValue(): Properties = new Properties()
   }
 
+  /**
+   * Keys of local properties that should not be inherited by children threads.
+   */
+  private[spark] val nonInheritedLocalProperties: HashSet[String] = new HashSet[String]
+
   /* ------------------------------------------------------------------------------------- *
    | Initialization. This code initializes the context in a manner that is exception-safe. |
    | All internal fields holding state are initialized here, and any error prompts the     |

sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala

@@ -78,6 +78,11 @@ class SQLContext(@transient val sparkContext: SparkContext)
   sparkContext.addSparkListener(listener)
   sparkContext.ui.foreach(new SQLTab(this, _))
 
+  // Ensure query execution IDs are not inherited across the thread hierarchy, which is
+  // the default behavior for SparkContext local properties. Otherwise, we may confuse
+  // the listener as to which query is being executed. (SPARK-10548)
+  sparkContext.nonInheritedLocalProperties.add(SQLExecution.EXECUTION_ID_KEY)
+
   /**
    * Set Spark SQL configuration properties.
    *