Skip to content

[SPARK-1897] Respect spark.jars (and --jars) in spark-shell #849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
andrewor14 wants to merge 4 commits into from
Closed

[SPARK-1897] Respect spark.jars (and --jars) in spark-shell #849

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8549f7
Respect spark.jars and --jars in spark-shell
andrewor14 May 21, 2014
c6da113
Do not set spark.jars to ""
andrewor14 May 21, 2014
afc357c
Handle spark.jars == "" in SparkILoop, not SparkSubmit
andrewor14 May 22, 2014
928a7e6
',' -> "," (minor)
andrewor14 May 22, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -993,7 +993,13 @@ object SparkILoop {
implicit def loopToInterpreter(repl: SparkILoop): SparkIMain = repl.intp
private def echo(msg: String) = Console println msg

def getAddedJars: Array[String] = Option(System.getenv("ADD_JARS")).map(_.split(',')).getOrElse(new Array[String](0))
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)
}
propJars.orElse(envJars).map(_.split(",")).getOrElse(Array.empty)
}

// Designed primarily for use by test code: take a String with a
// bunch of code, and prints out a transcript of what it would look
Expand Down