Skip to content

Commit 568150a

Browse files
committed
Update IsolatedClientLoader.scala
1 parent c4543ef commit 568150a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

sql/hive/src/main/scala/org/apache/spark/sql/hive/client/IsolatedClientLoader.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ private[hive] object IsolatedClientLoader extends Logging {
121121
val hiveArtifacts = version.extraDeps ++
122122
Seq("hive-metastore", "hive-exec", "hive-common", "hive-serde")
123123
.map(a => s"org.apache.hive:$a:${version.fullVersion}") ++
124-
Seq("com.google.guava:guava:14.0.1") ++ hadoopJarNames
124+
Seq("com.google.guava:guava:14.0.1") ++ hadoopJarNames
125125

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

134-
val jarsClasspath = quietly {
134+
val classpath = quietly {
135135
SparkSubmitUtils.resolveMavenCoordinates(
136136
hiveArtifacts.mkString(","),
137137
SparkSubmitUtils.buildIvySettings(
138138
Some(remoteRepos),
139139
ivyPath),
140140
exclusions = version.exclusions ++ extraExclusions)
141141
}
142-
val allFiles = jarsClasspath.split(",").map(new File(_)).toSet
142+
val allFiles = classpath.split(",").map(new File(_)).toSet
143143

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

0 commit comments

Comments
 (0)