aboutsummaryrefslogtreecommitdiff
path: root/repl/scala-2.10/src/main
diff options
context:
space:
mode:
authorazagrebin <azagrebin@gmail.com>2015-02-16 18:06:19 -0800
committerAndrew Or <andrew@databricks.com>2015-02-16 18:06:58 -0800
commit16687651f05bde8ff2e2fcef100383168958bf7f (patch)
tree38171dd79bf81b1cf7a58298e1ef9413e61ff7d7 /repl/scala-2.10/src/main
parentb1bd1dd3228ef50fa7310d466afd834b8cb1f22e (diff)
downloadspark-16687651f05bde8ff2e2fcef100383168958bf7f.tar.gz
spark-16687651f05bde8ff2e2fcef100383168958bf7f.tar.bz2
spark-16687651f05bde8ff2e2fcef100383168958bf7f.zip
[SPARK-3340] Deprecate ADD_JARS and ADD_FILES
I created a patch that disables the environment variables. Thereby scala or python shell log a warning message to notify user about the deprecation with the following message: scala: "ADD_JARS environment variable is deprecated, use --jar spark submit argument instead" python: "Warning: ADD_FILES environment variable is deprecated, use --py-files argument instead" Is it what is expected or the code associated with the variables should be just completely removed? Should it be somewhere documented? Author: azagrebin <azagrebin@gmail.com> Closes #4616 from azagrebin/master and squashes the following commits: bab1aa9 [azagrebin] [SPARK-3340] Deprecate ADD_JARS and ADD_FILES: minor readability issue 0643895 [azagrebin] [SPARK-3340] Deprecate ADD_JARS and ADD_FILES: add warning messages 42f0107 [azagrebin] [SPARK-3340] Deprecate ADD_JARS and ADD_FILES
Diffstat (limited to 'repl/scala-2.10/src/main')
-rw-r--r--repl/scala-2.10/src/main/scala/org/apache/spark/repl/SparkILoop.scala7
1 files changed, 4 insertions, 3 deletions
diff --git a/repl/scala-2.10/src/main/scala/org/apache/spark/repl/SparkILoop.scala b/repl/scala-2.10/src/main/scala/org/apache/spark/repl/SparkILoop.scala
index b4db3df795..8dc0e0c965 100644
--- a/repl/scala-2.10/src/main/scala/org/apache/spark/repl/SparkILoop.scala
+++ b/repl/scala-2.10/src/main/scala/org/apache/spark/repl/SparkILoop.scala
@@ -1064,15 +1064,16 @@ class SparkILoop(
private def main(settings: Settings): Unit = process(settings)
}
-object SparkILoop {
+object SparkILoop extends Logging {
implicit def loopToInterpreter(repl: SparkILoop): SparkIMain = repl.intp
private def echo(msg: String) = Console println msg
def getAddedJars: Array[String] = {
val envJars = sys.env.get("ADD_JARS")
- val propJars = sys.props.get("spark.jars").flatMap { p =>
- if (p == "") None else Some(p)
+ if (envJars.isDefined) {
+ logWarning("ADD_JARS environment variable is deprecated, use --jar spark submit argument instead")
}
+ val propJars = sys.props.get("spark.jars").flatMap { p => if (p == "") None else Some(p) }
val jars = propJars.orElse(envJars).getOrElse("")
Utils.resolveURIs(jars).split(",").filter(_.nonEmpty)
}