You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2015/02/27 07:39:49 UTC
spark git commit: [SPARK-6046] Privatize SparkConf.translateConfKey
Repository: spark
Updated Branches:
refs/heads/master 4a8a0a8ec -> 7c99a014f
[SPARK-6046] Privatize SparkConf.translateConfKey
The warning of deprecated configs is actually done when the configs are set, not when they are get. As a result we don't need to explicitly call `translateConfKey` outside of `SparkConf` just to print the warning again in vain.
Author: Andrew Or <an...@databricks.com>
Closes #4797 from andrewor14/warn-deprecated-config and squashes the following commits:
8fb43e6 [Andrew Or] Privatize SparkConf.translateConfKey
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7c99a014
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7c99a014
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7c99a014
Branch: refs/heads/master
Commit: 7c99a014fb1e370e038e0f537c2301ca8138e620
Parents: 4a8a0a8
Author: Andrew Or <an...@databricks.com>
Authored: Thu Feb 26 22:39:46 2015 -0800
Committer: Andrew Or <an...@databricks.com>
Committed: Thu Feb 26 22:39:46 2015 -0800
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/SparkConf.scala | 2 +-
.../org/apache/spark/deploy/history/FsHistoryProvider.scala | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/7c99a014/core/src/main/scala/org/apache/spark/SparkConf.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/SparkConf.scala b/core/src/main/scala/org/apache/spark/SparkConf.scala
index 0f4922a..61b34d5 100644
--- a/core/src/main/scala/org/apache/spark/SparkConf.scala
+++ b/core/src/main/scala/org/apache/spark/SparkConf.scala
@@ -407,7 +407,7 @@ private[spark] object SparkConf extends Logging {
* @param warn Whether to print a warning if the key is deprecated. Warnings will be printed
* only once for each key.
*/
- def translateConfKey(userKey: String, warn: Boolean = false): String = {
+ private def translateConfKey(userKey: String, warn: Boolean = false): String = {
deprecatedConfigs.get(userKey)
.map { deprecatedKey =>
if (warn) {
http://git-wip-us.apache.org/repos/asf/spark/blob/7c99a014/core/src/main/scala/org/apache/spark/deploy/history/FsHistoryProvider.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/deploy/history/FsHistoryProvider.scala b/core/src/main/scala/org/apache/spark/deploy/history/FsHistoryProvider.scala
index 1aaa7b7..3e3d6ff 100644
--- a/core/src/main/scala/org/apache/spark/deploy/history/FsHistoryProvider.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/history/FsHistoryProvider.scala
@@ -49,8 +49,8 @@ private[history] class FsHistoryProvider(conf: SparkConf) extends ApplicationHis
// Interval between each check for event log updates
private val UPDATE_INTERVAL_MS = conf.getOption("spark.history.fs.update.interval.seconds")
- .orElse(conf.getOption(SparkConf.translateConfKey("spark.history.fs.updateInterval", true)))
- .orElse(conf.getOption(SparkConf.translateConfKey("spark.history.updateInterval", true)))
+ .orElse(conf.getOption("spark.history.fs.updateInterval"))
+ .orElse(conf.getOption("spark.history.updateInterval"))
.map(_.toInt)
.getOrElse(10) * 1000
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org