Github user andrewor14 commented on a diff in the pull request:
https://github.com/apache/spark/pull/8909#discussion_r41464483
--- Diff: sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala ---
@@ -1196,49 +1174,101 @@ class SQLContext(@transient val sparkContext:
SparkContext)
// Register a succesfully instantiatd context to the singleton. This
should be at the end of
// the class definition so that the singleton is updated only if there
is no exception in the
// construction of the instance.
- SQLContext.setLastInstantiatedContext(self)
+ sparkContext.addSparkListener(new SparkListener{
+ override def onApplicationEnd(applicationEnd:
SparkListenerApplicationEnd) {
+ SQLContext.clearTheInstantiatedContext(self)
+ }
+ })
+
+ SQLContext.setInstantiatedContext(self)
}
/**
* This SQLContext object contains utility functions to create a singleton
SQLContext instance,
- * or to get the last created SQLContext instance.
+ * or to get the created SQLContext instance.
*/
object SQLContext {
private val INSTANTIATION_LOCK = new Object()
/**
- * Reference to the last created SQLContext.
+ * The active SQLContext for the current thread.
*/
- @transient private val lastInstantiatedContext = new
AtomicReference[SQLContext]()
+ private val activeContext: InheritableThreadLocal[SQLContext] =
+ new InheritableThreadLocal[SQLContext]
+
+ /**
+ * Reference to the created SQLContext.
+ */
+ @transient private val instantiatedContext = new
AtomicReference[SQLContext]()
/**
* Get the singleton SQLContext if it exists or create a new one using
the given SparkContext.
+ *
* This function can be used to create a singleton SQLContext object
that can be shared across
* the JVM.
+ *
+ * If there is an active SQLContext for current thread, it will returned
instead of the global
+ * one.
+ *
+ * @since 1.5.0
*/
def getOrCreate(sparkContext: SparkContext): SQLContext = {
+ val ctx = activeContext.get()
+ if (ctx != null) {
+ return ctx
+ }
+
INSTANTIATION_LOCK.synchronized {
- if (lastInstantiatedContext.get() == null) {
+ val ctx = instantiatedContext.get()
+ if (ctx == null) {
new SQLContext(sparkContext)
+ } else {
+ ctx
}
}
- lastInstantiatedContext.get()
}
- private[sql] def clearLastInstantiatedContext(): Unit = {
+ private[sql] def clearInstantiatedContext(): Unit = {
--- End diff --
this isn't used anymore except in tests is it? Do we still need it?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
