Skip to content

[SPARK-2409] Make SQLConf thread safe. #1334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[SPARK-2409] Make SQLConf thread safe. #1334

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7614372
[SPARK-2409] Make SQLConf thread safe.
rxin Jul 8, 2014
c1e0a5a
Fixed the duplicate comment.
rxin Jul 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions sql/core/src/main/scala/org/apache/spark/sql/SQLConf.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ import scala.collection.JavaConverters._
* SQLConf holds mutable config parameters and hints. These can be set and
* queried either by passing SET commands into Spark SQL's DSL
* functions (sql(), hql(), etc.), or by programmatically using setters and
* getters of this class. This class is thread-safe.
* getters of this class.
*
Copy link
Contributor

@concretevitamin concretevitamin Jul 8, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps remove the last sentence of the first paragraph

* SQLConf is thread-safe (internally synchronized so safe to be used in multiple threads).
*/
trait SQLConf {

Expand Down Expand Up @@ -71,11 +73,9 @@ trait SQLConf {
Option(settings.get(key)).getOrElse(defaultValue)
}

def getAll: Array[(String, String)] = settings.asScala.toArray
def getAll: Array[(String, String)] = settings.synchronized { settings.asScala.toArray }

def getOption(key: String): Option[String] = {
Option(settings.get(key))
}
def getOption(key: String): Option[String] = Option(settings.get(key))

def contains(key: String): Boolean = settings.containsKey(key)

Expand Down