remove z.load() error for spark 1.2, spark 1.3

Leemoonsoo · Leemoonsoo · commit 13bf6c1308a2 · 2015-05-24T10:06:44.000+09:00
diff --git a/spark/src/main/java/org/apache/zeppelin/spark/dep/DependencyResolver.java b/spark/src/main/java/org/apache/zeppelin/spark/dep/DependencyResolver.java
@@ -143,8 +143,9 @@ private void updateCompilerClassPath(URL[] urls) throws IllegalAccessException,
 
   // Until spark 1.1.x
   // check https://github.com/apache/spark/commit/191d7cf2a655d032f160b9fa181730364681d0e7
-  private void updateRuntimeClassPath(URL[] urls) throws SecurityException, IllegalAccessException,
-      IllegalArgumentException, InvocationTargetException, NoSuchMethodException {
+  private void updateRuntimeClassPath_1_x(URL[] urls) throws SecurityException,
+      IllegalAccessException, IllegalArgumentException,
+      InvocationTargetException, NoSuchMethodException {
     ClassLoader cl = intp.classLoader().getParent();
     Method addURL;
     addURL = cl.getClass().getDeclaredMethod("addURL", new Class[] {URL.class});
@@ -154,6 +155,18 @@ private void updateRuntimeClassPath(URL[] urls) throws SecurityException, Illega
     }
   }
 
+  private void updateRuntimeClassPath_2_x(URL[] urls) throws SecurityException,
+      IllegalAccessException, IllegalArgumentException,
+      InvocationTargetException, NoSuchMethodException {
+    ClassLoader cl = intp.classLoader().getParent();
+    Method addURL;
+    addURL = cl.getClass().getDeclaredMethod("addNewUrl", new Class[] {URL.class});
+    addURL.setAccessible(true);
+    for (URL url : urls) {
+      addURL.invoke(cl, url);
+    }
+  }
+
   private MergedClassPath<AbstractFile> mergeUrlsIntoClassPath(JavaPlatform platform, URL[] urls) {
     IndexedSeq<ClassPath<AbstractFile>> entries =
         ((MergedClassPath<AbstractFile>) platform.classPath()).entries();
@@ -217,8 +230,11 @@ private void loadFromFs(String artifact, boolean addSparkContext) throws Excepti
 
     intp.global().new Run();
 
-    updateRuntimeClassPath(new URL[] {jarFile.toURI().toURL()});
-    updateCompilerClassPath(new URL[] {jarFile.toURI().toURL()});
+    if (sc.version().startsWith("1.1")) {
+      updateRuntimeClassPath_1_x(new URL[] {jarFile.toURI().toURL()});
+    } else {
+      updateRuntimeClassPath_2_x(new URL[] {jarFile.toURI().toURL()});
+    }
 
     if (addSparkContext) {
       sc.addJar(jarFile.getAbsolutePath());
@@ -261,7 +277,11 @@ private List<String> loadFromMvn(String artifact, Collection<String> excludes,
     }
 
     intp.global().new Run();
-    updateRuntimeClassPath(newClassPathList.toArray(new URL[0]));
+    if (sc.version().startsWith("1.1")) {
+      updateRuntimeClassPath_1_x(newClassPathList.toArray(new URL[0]));
+    } else {
+      updateRuntimeClassPath_2_x(newClassPathList.toArray(new URL[0]));
+    }
     updateCompilerClassPath(newClassPathList.toArray(new URL[0]));
 
     if (addSparkContext) {
