ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update SQLConf.scala

Browse source 
use concurrent.ConcurrentHashMap instead of util.Collections.synchronizedMap

Author: baishuo(白硕) <vc_java@hotmail.com>

Closes #1272 from baishuo/master and squashes the following commits:

51ec55d [baishuo(白硕)] Update SQLConf.scala
63da043 [baishuo(白硕)] Update SQLConf.scala
36b6dbd [baishuo(白硕)] Update SQLConf.scala
864faa0 [baishuo(白硕)] Update SQLConf.scala
593096b [baishuo(白硕)] Update SQLConf.scala
7304d9b [baishuo(白硕)] Update SQLConf.scala
843581c [baishuo(白硕)] Update SQLConf.scala
1d3e4a2 [baishuo(白硕)] Update SQLConf.scala
0740f28 [baishuo(白硕)] Update SQLConf.scala
This commit is contained in:
baishuo(白硕) 2014-07-04 00:25:31 -07:00 committed by Reynold Xin
parent d43415075b
commit 0bbe61223e
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sql/core/src/main/scala/org/apache/spark/sql/SQLConf.scala
View file

@ -64,20 +64,17 @@ trait SQLConf {
} }
def get(key: String): String = { def get(key: String): String = {
if (!settings.containsKey(key)) { Option(settings.get(key)).getOrElse(throw new NoSuchElementException(key))
throw new NoSuchElementException(key)
}
settings.get(key)
} }
def get(key: String, defaultValue: String): String = { def get(key: String, defaultValue: String): String = {
if (!settings.containsKey(key)) defaultValue else settings.get(key) Option(settings.get(key)).getOrElse(defaultValue)
} }
def getAll: Array[(String, String)] = settings.asScala.toArray def getAll: Array[(String, String)] = settings.asScala.toArray
def getOption(key: String): Option[String] = { def getOption(key: String): Option[String] = {
if (!settings.containsKey(key)) None else Some(settings.get(key)) Option(settings.get(key))
} }
def contains(key: String): Boolean = settings.containsKey(key) def contains(key: String): Boolean = settings.containsKey(key)