Skip to content

Update SQLConf.scala #1272

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 9 commits into from
Closed

Update SQLConf.scala #1272

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0740f28
Update SQLConf.scala
baishuo Jul 1, 2014
1d3e4a2
Update SQLConf.scala
baishuo Jul 1, 2014
843581c
Update SQLConf.scala
baishuo Jul 1, 2014
7304d9b
Update SQLConf.scala
baishuo Jul 1, 2014
593096b
Update SQLConf.scala
baishuo Jul 1, 2014
864faa0
Update SQLConf.scala
baishuo Jul 1, 2014
36b6dbd
Update SQLConf.scala
baishuo Jul 1, 2014
63da043
Update SQLConf.scala
baishuo Jul 3, 2014
51ec55d
Update SQLConf.scala
baishuo Jul 4, 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
9 changes: 3 additions & 6 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 @@ -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))
Copy link
Contributor

@chenghao-intel chenghao-intel Jul 1, 2014

Choose a reason for hiding this comment

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

Probably adding the checking logic is better.

Copy link
Contributor

@cloud-fan cloud-fan Jul 2, 2014

Choose a reason for hiding this comment

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

Agree. How about Option(settings.get(key)).orElse(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)
Expand Down