From 7ba8bf288de721d897c8ea23ed01cb2adc32df80 Mon Sep 17 00:00:00 2001
From: liuxian <liu.xian3@zte.com.cn>
Date: Tue, 13 Jun 2017 10:12:28 -0700
Subject: [PATCH] [SPARK-21016][CORE] Improve code fault tolerance for
converting string to number
## What changes were proposed in this pull request?
When converting `string` to `number`(int, long or double), if the string has a space before or after,will lead to unnecessary mistakes.
## How was this patch tested?
unit test
Author: liuxian <liu.xian3@zte.com.cn>
Closes #18238 from 10110346/lx-wip-0608.
---
.../org/apache/spark/internal/config/ConfigBuilder.scala | 4 ++--
.../org/apache/spark/sql/internal/SQLConfEntrySuite.scala | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/core/src/main/scala/org/apache/spark/internal/config/ConfigBuilder.scala b/core/src/main/scala/org/apache/spark/internal/config/ConfigBuilder.scala
index 515c9c24a9..8f4c1b6092 100644
--- a/core/src/main/scala/org/apache/spark/internal/config/ConfigBuilder.scala
+++ b/core/src/main/scala/org/apache/spark/internal/config/ConfigBuilder.scala
@@ -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")
@@ -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")
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/internal/SQLConfEntrySuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/internal/SQLConfEntrySuite.scala
index f2456c7704..135370bd1d 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/internal/SQLConfEntrySuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/internal/SQLConfEntrySuite.scala
@@ -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")
}
@@ -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")
}
--
GitLab