Skip to content

Commit

Permalink
Update IsolatedClientLoader.scala
Browse files Browse the repository at this point in the history
  • Loading branch information
AngersZhuuuu committed Nov 22, 2020
1 parent c4543ef commit 568150a
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ private[hive] object IsolatedClientLoader extends Logging {
val hiveArtifacts = version.extraDeps ++
Seq("hive-metastore", "hive-exec", "hive-common", "hive-serde")
.map(a => s"org.apache.hive:$a:${version.fullVersion}") ++
Seq("com.google.guava:guava:14.0.1") ++ hadoopJarNames
Seq("com.google.guava:guava:14.0.1") ++ hadoopJarNames

val extraExclusions = if (hadoopVersion.startsWith("3")) {
// this introduced from lower version of Hive could conflict with jars in Hadoop 3.2+, so
Expand All @@ -131,15 +131,15 @@ private[hive] object IsolatedClientLoader extends Logging {
Seq.empty
}

val jarsClasspath = quietly {
val classpath = quietly {
SparkSubmitUtils.resolveMavenCoordinates(
hiveArtifacts.mkString(","),
SparkSubmitUtils.buildIvySettings(
Some(remoteRepos),
ivyPath),
exclusions = version.exclusions ++ extraExclusions)
}
val allFiles = jarsClasspath.split(",").map(new File(_)).toSet
val allFiles = classpath.split(",").map(new File(_)).toSet

// TODO: Remove copy logic.
val tempDir = Utils.createTempDir(namePrefix = s"hive-${version}")
Expand Down

0 comments on commit 568150a

Please sign in to comment.