From f36f6bfd8dc81463f0d03925675ec5df55bd06f4 Mon Sep 17 00:00:00 2001 From: angerszhu Date: Tue, 5 Jan 2021 03:43:03 +0800 Subject: [PATCH 1/3] [SPARK-33908][CORE][FLLOW-UP] Refactor SparkSubmitUtils.resolveMavenCoordinates() 's return parameter --- core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala | 4 ++-- .../main/scala/org/apache/spark/util/DependencyUtils.scala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala index 0cf309f14815..d572bf048434 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala @@ -1197,8 +1197,8 @@ private[spark] object SparkSubmitUtils { * Output a comma-delimited list of paths for the downloaded jars to be added to the classpath * (will append to jars in SparkSubmit). * @param artifacts Sequence of dependencies that were resolved and retrieved - * @param cacheDirectory directory where jars are cached - * @return a comma-delimited list of paths for the dependencies + * @param cacheDirectory Directory where jars are cached + * @return List of paths for the dependencies */ def resolveDependencyPaths( artifacts: Array[AnyRef], diff --git a/core/src/main/scala/org/apache/spark/util/DependencyUtils.scala b/core/src/main/scala/org/apache/spark/util/DependencyUtils.scala index 789811fa5f3a..60e866a55679 100644 --- a/core/src/main/scala/org/apache/spark/util/DependencyUtils.scala +++ b/core/src/main/scala/org/apache/spark/util/DependencyUtils.scala @@ -129,7 +129,7 @@ private[spark] object DependencyUtils extends Logging { * 2. exclude: exclusion list when download Ivy URI jar and dependency jars. * The `exclude` parameter content is a ',' separated `group:module` pair string : * `exclude=group:module,group:module...` - * @return Comma separated string list of jars downloaded. + * @return List of jars downloaded. */ def resolveMavenDependencies(uri: URI): Seq[String] = { val ivyProperties = DependencyUtils.getIvyProperties() From 72eacfe1315c5f7b6af7c12e46ef4e2f42e07609 Mon Sep 17 00:00:00 2001 From: angerszhu Date: Tue, 5 Jan 2021 03:44:47 +0800 Subject: [PATCH 2/3] Update SparkSubmit.scala --- core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala index d572bf048434..e648395e4b27 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala @@ -1198,7 +1198,7 @@ private[spark] object SparkSubmitUtils { * (will append to jars in SparkSubmit). * @param artifacts Sequence of dependencies that were resolved and retrieved * @param cacheDirectory Directory where jars are cached - * @return List of paths for the dependencies + * @return List of paths for the dependencies */ def resolveDependencyPaths( artifacts: Array[AnyRef], From 43672aee21022f26cba08a51c90ffe3ca6eafffc Mon Sep 17 00:00:00 2001 From: angerszhu Date: Tue, 5 Jan 2021 03:57:34 +0800 Subject: [PATCH 3/3] Update SparkSubmit.scala --- core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala index e648395e4b27..8bf7795b7bfe 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala @@ -1194,7 +1194,7 @@ private[spark] object SparkSubmitUtils { } /** - * Output a comma-delimited list of paths for the downloaded jars to be added to the classpath + * Output a list of paths for the downloaded jars to be added to the classpath * (will append to jars in SparkSubmit). * @param artifacts Sequence of dependencies that were resolved and retrieved * @param cacheDirectory Directory where jars are cached