You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by gu...@apache.org on 2018/09/24 01:30:13 UTC
spark git commit: [SPARK-25415][SQL][FOLLOW-UP] Add Locale.ROOT when
toUpperCase
Repository: spark
Updated Branches:
refs/heads/master 9bf04d854 -> d522a563a
[SPARK-25415][SQL][FOLLOW-UP] Add Locale.ROOT when toUpperCase
## What changes were proposed in this pull request?
Add `Locale.ROOT` when `toUpperCase`.
## How was this patch tested?
manual tests
Closes #22531 from wangyum/SPARK-25415.
Authored-by: Yuming Wang <yu...@ebay.com>
Signed-off-by: hyukjinkwon <gu...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/d522a563
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/d522a563
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/d522a563
Branch: refs/heads/master
Commit: d522a563ad5ab157993a19f406a3cc6f443ccb9e
Parents: 9bf04d8
Author: Yuming Wang <yu...@ebay.com>
Authored: Mon Sep 24 09:30:07 2018 +0800
Committer: hyukjinkwon <gu...@apache.org>
Committed: Mon Sep 24 09:30:07 2018 +0800
----------------------------------------------------------------------
.../scala/org/apache/spark/sql/catalyst/rules/RuleExecutor.scala | 2 +-
.../src/main/scala/org/apache/spark/sql/internal/SQLConf.scala | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/d522a563/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/rules/RuleExecutor.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/rules/RuleExecutor.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/rules/RuleExecutor.scala
index 183be5a..e991a2d 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/rules/RuleExecutor.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/rules/RuleExecutor.scala
@@ -144,7 +144,7 @@ abstract class RuleExecutor[TreeType <: TreeNode[_]] extends Logging {
private class PlanChangeLogger {
- private val logLevel = SQLConf.get.optimizerPlanChangeLogLevel.toUpperCase
+ private val logLevel = SQLConf.get.optimizerPlanChangeLogLevel
private val logRules = SQLConf.get.optimizerPlanChangeRules.map(Utils.stringToSeq)
http://git-wip-us.apache.org/repos/asf/spark/blob/d522a563/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala
index ddf17fa..0e0a01d 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala
@@ -177,8 +177,8 @@ object SQLConf {
"plan after a rule is applied. The value can be 'trace', 'debug', 'info', 'warn', or " +
"'error'. The default log level is 'trace'.")
.stringConf
- .checkValue(
- str => Set("TRACE", "DEBUG", "INFO", "WARN", "ERROR").contains(str.toUpperCase),
+ .transform(_.toUpperCase(Locale.ROOT))
+ .checkValue(logLevel => Set("TRACE", "DEBUG", "INFO", "WARN", "ERROR").contains(logLevel),
"Invalid value for 'spark.sql.optimizer.planChangeLog.level'. Valid values are " +
"'trace', 'debug', 'info', 'warn' and 'error'.")
.createWithDefault("trace")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org