aboutsummaryrefslogtreecommitdiff
path: root/core/src/test
diff options
context:
space:
mode:
authorAndrew Or <andrew@databricks.com>2015-03-02 16:36:42 -0800
committerPatrick Wendell <patrick@databricks.com>2015-03-02 16:36:42 -0800
commit258d154c9f1afdd52dce19f03d81683ee34effac (patch)
treec5a94b159950d22902d90d0c5adcc1a014ad73bf /core/src/test
parent6776cb33ea691f7843b956b3e80979282967e826 (diff)
downloadspark-258d154c9f1afdd52dce19f03d81683ee34effac.tar.gz
spark-258d154c9f1afdd52dce19f03d81683ee34effac.tar.bz2
spark-258d154c9f1afdd52dce19f03d81683ee34effac.zip
[SPARK-6048] SparkConf should not translate deprecated configs on set
There are multiple issues with translating on set outlined in the JIRA. This PR reverts the translation logic added to `SparkConf`. In the future, after the 1.3.0 release we will figure out a way to reorganize the internal structure more elegantly. For now, let's preserve the existing semantics of `SparkConf` since it's a public interface. Unfortunately this means duplicating some code for now, but this is all internal and we can always clean it up later. Author: Andrew Or <andrew@databricks.com> Closes #4799 from andrewor14/conf-set-translate and squashes the following commits: 11c525b [Andrew Or] Move warning to driver 10e77b5 [Andrew Or] Add documentation for deprecation precedence a369cb1 [Andrew Or] Merge branch 'master' of github.com:apache/spark into conf-set-translate c26a9e3 [Andrew Or] Revert all translate logic in SparkConf fef6c9c [Andrew Or] Restore deprecation logic for spark.executor.userClassPathFirst 94b4dfa [Andrew Or] Translate on get, not set
Diffstat (limited to 'core/src/test')
-rw-r--r--core/src/test/scala/org/apache/spark/SparkConfSuite.scala12
1 files changed, 0 insertions, 12 deletions
diff --git a/core/src/test/scala/org/apache/spark/SparkConfSuite.scala b/core/src/test/scala/org/apache/spark/SparkConfSuite.scala
index ea6b73bc68..e08210ae60 100644
--- a/core/src/test/scala/org/apache/spark/SparkConfSuite.scala
+++ b/core/src/test/scala/org/apache/spark/SparkConfSuite.scala
@@ -197,18 +197,6 @@ class SparkConfSuite extends FunSuite with LocalSparkContext with ResetSystemPro
serializer.newInstance().serialize(new StringBuffer())
}
- test("deprecated config keys") {
- val conf = new SparkConf()
- .set("spark.files.userClassPathFirst", "true")
- .set("spark.yarn.user.classpath.first", "true")
- assert(conf.contains("spark.files.userClassPathFirst"))
- assert(conf.contains("spark.executor.userClassPathFirst"))
- assert(conf.contains("spark.yarn.user.classpath.first"))
- assert(conf.getBoolean("spark.files.userClassPathFirst", false))
- assert(conf.getBoolean("spark.executor.userClassPathFirst", false))
- assert(conf.getBoolean("spark.yarn.user.classpath.first", false))
- }
-
}
class Class1 {}