Skip to content

[SPARK-11191] [SQL] Looks up temporary function using execution Hive client #9664

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.

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

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,51 @@ class HiveThriftBinaryServerSuite extends HiveThriftJdbcTest {
assert(conf.get("spark.sql.hive.version") === Some("1.2.1"))
}
}

test("SPARK-11595 ADD JAR with input path having URL scheme") {
withJdbcStatement { statement =>
val jarPath = "../hive/src/test/resources/TestUDTF.jar"
val jarURL = s"file://${System.getProperty("user.dir")}/$jarPath"

Seq(
s"ADD JAR $jarURL",
s"""CREATE TEMPORARY FUNCTION udtf_count2
|AS 'org.apache.spark.sql.hive.execution.GenericUDTFCount2'
""".stripMargin
).foreach(statement.execute)

val rs1 = statement.executeQuery("DESCRIBE FUNCTION udtf_count2")

assert(rs1.next())
assert(rs1.getString(1) === "Function: udtf_count2")

assert(rs1.next())
assertResult("Class: org.apache.spark.sql.hive.execution.GenericUDTFCount2") {
rs1.getString(1)
}

assert(rs1.next())
assert(rs1.getString(1) === "Usage: To be added.")

val dataPath = "../hive/src/test/resources/data/files/kv1.txt"

Seq(
s"CREATE TABLE test_udtf(key INT, value STRING)",
s"LOAD DATA LOCAL INPATH '$dataPath' OVERWRITE INTO TABLE test_udtf"
).foreach(statement.execute)

val rs2 = statement.executeQuery(
"SELECT key, cc FROM test_udtf LATERAL VIEW udtf_count2(value) dd AS cc")

assert(rs2.next())
assert(rs2.getInt(1) === 97)
assert(rs2.getInt(2) === 500)

assert(rs2.next())
assert(rs2.getInt(1) === 97)
assert(rs2.getInt(2) === 500)
}
}
}

class HiveThriftHttpServerSuite extends HiveThriftJdbcTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ class HiveContext private[hive](
// Note that HiveUDFs will be overridden by functions registered in this context.
@transient
override protected[sql] lazy val functionRegistry: FunctionRegistry =
new HiveFunctionRegistry(FunctionRegistry.builtin.copy()) {
new HiveFunctionRegistry(FunctionRegistry.builtin.copy(), this) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@liancheng ah, I just noticed that we override lookupFunction at here and wrap the super.lookupFunction(name, children) in executionHive.withHiveState. Does that already resolve the problem?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for pointing this out. At first I didn't notice this part either. Just reading the code, I'd assume that this already fixes the issue. But it wasn't the case.

After some investigation, I'm quite puzzled by the behavior here. Without this PR, we can add a jar, create a UDTF from the jar, and apply this UDTF in SQL queries successfully. However, DESCRIBE FUNCTION still returns "Function: is not found". I tried single-step debugging DescribeFunction and noticed that the sqlContext.functionRegistry.lookupFunction call goes directly to HiveFunctionRegistry.lookupFunction without calling the overriden version defined in this anonymous class. I probably missed something important here.

Anyway, now we can remove this anonymous class.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we have a PR to remove this anonymous class from master?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opened #9737 to clean this up.

override def lookupFunction(name: String, children: Seq[Expression]): Expression = {
// Hive Registry need current database to lookup function
// TODO: the current database of executionHive should be consistent with metadataHive
Expand Down
14 changes: 10 additions & 4 deletions sql/hive/src/main/scala/org/apache/spark/sql/hive/hiveUDFs.scala
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,23 @@ import org.apache.spark.sql.hive.HiveShim._
import org.apache.spark.sql.types._


private[hive] class HiveFunctionRegistry(underlying: analysis.FunctionRegistry)
private[hive] class HiveFunctionRegistry(
underlying: analysis.FunctionRegistry,
hiveContext: HiveContext)
extends analysis.FunctionRegistry with HiveInspectors {

def getFunctionInfo(name: String): FunctionInfo = FunctionRegistry.getFunctionInfo(name)
def getFunctionInfo(name: String): FunctionInfo = {
hiveContext.executionHive.withHiveState {
FunctionRegistry.getFunctionInfo(name)
}
}

override def lookupFunction(name: String, children: Seq[Expression]): Expression = {
Try(underlying.lookupFunction(name, children)).getOrElse {
// We only look it up to see if it exists, but do not include it in the HiveUDF since it is
// not always serializable.
val functionInfo: FunctionInfo =
Option(FunctionRegistry.getFunctionInfo(name.toLowerCase)).getOrElse(
Option(getFunctionInfo(name.toLowerCase)).getOrElse(
throw new AnalysisException(s"undefined function $name"))

val functionClassName = functionInfo.getFunctionClass.getName
Expand Down Expand Up @@ -110,7 +116,7 @@ private[hive] class HiveFunctionRegistry(underlying: analysis.FunctionRegistry)
override def lookupFunction(name: String): Option[ExpressionInfo] = {
underlying.lookupFunction(name).orElse(
Try {
val info = FunctionRegistry.getFunctionInfo(name)
val info = getFunctionInfo(name)
val annotation = info.getFunctionClass.getAnnotation(classOf[Description])
if (annotation != null) {
Some(new ExpressionInfo(
Expand Down