Skip to content

Merged Apache bug fixes #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markhamstra merged 5 commits into from
Nov 14, 2015
Merged

Merged Apache bug fixes #124

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b478ee3
[SPARK-11595][SQL][BRANCH-1.5] Fixes ADD JAR when the input path cont…
liancheng Nov 12, 2015
3676d4c
Fixed error in scaladoc of convertToCanonicalEdges
gauravkumar37 Nov 12, 2015
330961b
[SPARK-8029] robust shuffle writer (for 1.5 branch)
Nov 13, 2015
cac9641
Merge branch 'branch-1.5' of github.com:apache/spark into csd-1.5
markhamstra Nov 13, 2015
bf70090
bumped version in extras
markhamstra Nov 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
[SPARK-11595][SQL][BRANCH-1.5] Fixes ADD JAR when the input path cont… 
…ains URL scheme

This PR backports apache#9569 to branch-1.5.

Author: Cheng Lian <[email protected]>

Closes apache#9570 from liancheng/spark-11595.for-branch-1.5.
  • Loading branch information
@liancheng @yhuai
liancheng authored and yhuai committed Nov 12, 2015
commit b478ee3743dd542004f2715e6d00eb999d1a06dd
15 changes: 14 additions & 1 deletion sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/commands.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@

package org.apache.spark.sql.hive.execution

import java.io.File

import org.apache.hadoop.fs.Path
import org.apache.hadoop.hive.metastore.MetaStoreUtils
import org.apache.spark.sql._
import org.apache.spark.sql.catalyst.{TableIdentifier, SqlParser}
Expand Down Expand Up @@ -90,7 +93,17 @@ case class AddJar(path: String) extends RunnableCommand {
val currentClassLoader = Utils.getContextOrSparkClassLoader

// Add jar to current context
val jarURL = new java.io.File(path).toURI.toURL
val jarURL = {
val uri = new Path(path).toUri
if (uri.getScheme == null) {
// `path` is a local file path without a URL scheme
new File(path).toURI.toURL
} else {
// `path` is a URL with a scheme
uri.toURL
}
}

val newClassLoader = new java.net.URLClassLoader(Array(jarURL), currentClassLoader)
Thread.currentThread.setContextClassLoader(newClassLoader)
// We need to explicitly set the class loader associated with the conf in executionHive's
Expand Down
7 changes: 6 additions & 1 deletion sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,12 @@ class SQLQuerySuite extends QueryTest with SQLTestUtils {
private val sqlContext = _sqlContext

test("UDTF") {
sql(s"ADD JAR ${TestHive.getHiveFile("TestUDTF.jar").getCanonicalPath()}")
val jarPath = TestHive.getHiveFile("TestUDTF.jar").getCanonicalPath

// SPARK-11595 Fixes ADD JAR when input path contains URL scheme
val jarURL = s"file://$jarPath"

sql(s"ADD JAR $jarURL")
// The function source code can be found at:
// https://cwiki.apache.org/confluence/display/Hive/DeveloperGuide+UDTF
sql(
Expand Down