Skip to content

[SPARK-8607] SparkR -- jars not being added to application classpath correctly #7001

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
cafreeman wants to merge 9 commits into from
+85 −1
Closed

[SPARK-8607] SparkR -- jars not being added to application classpath correctly #7001

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7c6bd0c
[SPARK-8607] SparkR
Jun 24, 2015
5a80844
Fix style nits
Jun 24, 2015
9101223
Merge branch 'branch-1.4' of github.com:apache/spark into branch-1.4
Jun 25, 2015
9a5c362
test for including JAR when launching sparkContext
Jun 25, 2015
ee25e60
Merge branch 'branch-1.4' of github.com:apache/spark into branch-1.4
Jun 25, 2015
0bea809
Fixed relative path issue and added smaller JAR
Jun 25, 2015
2c22073
Merge branch 'branch-1.4' of github.com:apache/spark into branch-1.4
Jun 26, 2015
31aedcf
Refactor test to call an external R script
Jun 26, 2015
8f81194
Add missing license
Jun 26, 2015
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
15 changes: 14 additions & 1 deletion core/src/main/scala/org/apache/spark/api/r/RBackendHandler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,19 @@ private[r] class RBackendHandler(server: RBackend)
ctx.close()
}

//get classPath for static object. This addresses SPARK-5185
Copy link
Contributor

@shivaram shivaram Jun 24, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Style nit: Space after // - Also could you expand the comment to say Looks up a class given a class name. This function first checks the current class loader and if a class is not found, it looks up the class in the context class loader.

def getStaticClass(objId: String): Class[_] = {
try {
val clsCurrent = Class.forName(objId)
clsCurrent
} catch {
Copy link
Contributor

@shivaram shivaram Jun 24, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Align } with the beginning of try

//use contextLoader if we can't find the JAR in the system class loader
Copy link
Contributor

@shivaram shivaram Jun 24, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same style nit space after //-- Also very minor nit -- Use instead of use

case e: ClassNotFoundException =>
val clsContext = Class.forName(objId, true, Thread.currentThread().getContextClassLoader)
clsContext
}
}

def handleMethodCall(
isStatic: Boolean,
objId: String,
Expand All @@ -98,7 +111,7 @@ private[r] class RBackendHandler(server: RBackend)
var obj: Object = null
try {
val cls = if (isStatic) {
Class.forName(objId)
getStaticClass(objId)
} else {
JVMObjectTracker.get(objId) match {
case None => throw new IllegalArgumentException("Object not found " + objId)
Expand Down