don't zip

Author: brkyvz

core/src/main/scala/org/apache/spark/deploy/RPackageUtils.scala

@@ -190,19 +190,19 @@ private[deploy] object RPackageUtils extends Logging {
     }
   }
 
-  private def listFilesRecursively(dir: File): Seq[File] = {
+  private def listFilesRecursively(dir: File): Set[File] = {
     if (!dir.exists()) {
-      Seq.empty[File]
+      Set.empty[File]
     } else {
       if (dir.isDirectory) {
         val subDir = dir.listFiles(new FilenameFilter {
           override def accept(dir: File, name: String): Boolean = {
-            !dir.getAbsolutePath.contains("SparkR" + File.separator)
+            !dir.getAbsolutePath.contains("SparkR") && !name.contains(".zip")
           }
         })
-        subDir.flatMap(listFilesRecursively)
+        subDir.flatMap(listFilesRecursively).toSet
       } else {
-        Seq(dir)
+        Set(dir)
       }
     }
   }

core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala

@@ -376,11 +376,11 @@ object SparkSubmit {
         printErrorAndExit(s"$SPARKR_PACKAGE_ARCHIVE does not exist for R application in YARN mode.")
       }
       val localURI = Utils.resolveURI(rPackageFile.getAbsolutePath)
-      val rExtras = RPackageUtils.zipRLibraries(new File(rPackagePath.get), SPARKR_EXTRAS_ARCHIVE)
-      val extrasURI = Utils.resolveURI(rExtras.getAbsolutePath).toString + "#sparkr-extras"
+      // val rExtras = RPackageUtils.zipRLibraries(new File(rPackagePath.get), SPARKR_EXTRAS_ARCHIVE)
+      // val extrasURI = Utils.resolveURI(rExtras.getAbsolutePath).toString + "#sparkr-extras"
 
       // Assigns a symbol link name "sparkr" to the shipped package.
-      args.archives = mergeFileLists(args.archives, localURI.toString + "#sparkr", extrasURI)
+      args.archives = mergeFileLists(args.archives, localURI.toString + "#sparkr")
     }
 
     // If we're running a R app, set the main class to our specific R runner