Update SQLConf.scala

baishuo · rxin · commit dc73ee13c83e · 2014-07-04T00:25:46.000-07:00
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 (cherry picked from commit 0bbe612) Signed-off-by: Reynold Xin <rxin@apache.org>
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/SQLConf.scala b/sql/core/src/main/scala/org/apache/spark/sql/SQLConf.scala
@@ -47,20 +47,17 @@ trait SQLConf {
   }
 
   def get(key: String): String = {
-    if (!settings.containsKey(key)) {
-      throw new NoSuchElementException(key)
-    }
-    settings.get(key)
+    Option(settings.get(key)).getOrElse(throw new NoSuchElementException(key))
   }
 
   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 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)

Original file line number	Diff line number	Diff line change
`@@ -47,20 +47,17 @@ trait SQLConf {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`def get(key: String): String = {`
`50`		`- if (!settings.containsKey(key)) {`
`51`		`- throw new NoSuchElementException(key)`
`52`		`- }`
`53`		`- settings.get(key)`
	`50`	`+ Option(settings.get(key)).getOrElse(throw new NoSuchElementException(key))`
`54`	`51`	`}`
`55`	`52`
`56`	`53`	`def get(key: String, defaultValue: String): String = {`
`57`		`- if (!settings.containsKey(key)) defaultValue else settings.get(key)`
	`54`	`+ Option(settings.get(key)).getOrElse(defaultValue)`
`58`	`55`	`}`
`59`	`56`
`60`	`57`	`def getAll: Array[(String, String)] = settings.asScala.toArray`
`61`	`58`
`62`	`59`	`def getOption(key: String): Option[String] = {`
`63`		`- if (!settings.containsKey(key)) None else Some(settings.get(key))`
	`60`	`+ Option(settings.get(key))`
`64`	`61`	`}`
`65`	`62`
`66`	`63`	`def contains(key: String): Boolean = settings.containsKey(key)`