Skip to content

[SPARK-21016][core]Improve code fault tolerance for converting string to number #18238

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
10110346 wants to merge 1 commit into from
Closed

[SPARK-21016][core]Improve code fault tolerance for converting string to number #18238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions core/src/main/scala/org/apache/spark/internal/config/ConfigBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ private object ConfigHelpers {

def toNumber[T](s: String, converter: String => T, key: String, configType: String): T = {
try {
converter(s)
converter(s.trim)
} catch {
case _: NumberFormatException =>
throw new IllegalArgumentException(s"$key should be $configType, but was $s")
Expand All @@ -37,7 +37,7 @@ private object ConfigHelpers {

def toBoolean(s: String, key: String): Boolean = {
try {
s.toBoolean
s.trim.toBoolean
} catch {
case _: IllegalArgumentException =>
throw new IllegalArgumentException(s"$key should be boolean, but was $s")
Expand Down
5 changes: 5 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/internal/SQLConfEntrySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ class SQLConfEntrySuite extends SparkFunSuite {
assert(conf.getConfString(key) === "20")
assert(conf.getConf(confEntry, 5) === 20)

conf.setConfString(key, " 20")
assert(conf.getConf(confEntry, 5) === 20)

val e = intercept[IllegalArgumentException] {
conf.setConfString(key, "abc")
}
Expand Down Expand Up @@ -75,6 +78,8 @@ class SQLConfEntrySuite extends SparkFunSuite {
assert(conf.getConfString(key) === "true")
assert(conf.getConf(confEntry, false) === true)

conf.setConfString(key, " true ")
assert(conf.getConf(confEntry, false) === true)
val e = intercept[IllegalArgumentException] {
conf.setConfString(key, "abc")
}
Expand Down