Update SQLConf.scala

baishuo · rxin · commit 0bbe61223eda · 2014-07-04T00:25:31.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
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
@@ -64,20 +64,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
`@@ -64,20 +64,17 @@ trait SQLConf {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`def get(key: String): String = {`
`67`		`- if (!settings.containsKey(key)) {`
`68`		`- throw new NoSuchElementException(key)`
`69`		`- }`
`70`		`- settings.get(key)`
	`67`	`+ Option(settings.get(key)).getOrElse(throw new NoSuchElementException(key))`
`71`	`68`	`}`
`72`	`69`
`73`	`70`	`def get(key: String, defaultValue: String): String = {`
`74`		`- if (!settings.containsKey(key)) defaultValue else settings.get(key)`
	`71`	`+ Option(settings.get(key)).getOrElse(defaultValue)`
`75`	`72`	`}`
`76`	`73`
`77`	`74`	`def getAll: Array[(String, String)] = settings.asScala.toArray`
`78`	`75`
`79`	`76`	`def getOption(key: String): Option[String] = {`
`80`		`- if (!settings.containsKey(key)) None else Some(settings.get(key))`
	`77`	`+ Option(settings.get(key))`
`81`	`78`	`}`
`82`	`79`
`83`	`80`	`def contains(key: String): Boolean = settings.containsKey(key)`