AngersZhuuuu commented on a change in pull request #29054:
URL: https://github.com/apache/spark/pull/29054#discussion_r452901062
##########
File path:
sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveSessionCatalog.scala
##########
@@ -69,49 +69,56 @@ private[sql] class HiveSessionCatalog(
// Current thread context classloader may not be the one loaded the class.
Need to switch
// context classloader to initialize instance properly.
Utils.withContextClassLoader(clazz.getClassLoader) {
- Try(super.makeFunctionExpression(name, clazz, input)).getOrElse {
- var udfExpr: Option[Expression] = None
- try {
- // When we instantiate hive UDF wrapper class, we may throw
exception if the input
- // expressions don't satisfy the hive UDF, such as type mismatch,
input number
- // mismatch, etc. Here we catch the exception and throw
AnalysisException instead.
- if (classOf[UDF].isAssignableFrom(clazz)) {
- udfExpr = Some(HiveSimpleUDF(name, new
HiveFunctionWrapper(clazz.getName), input))
- udfExpr.get.dataType // Force it to check input data types.
- } else if (classOf[GenericUDF].isAssignableFrom(clazz)) {
- udfExpr = Some(HiveGenericUDF(name, new
HiveFunctionWrapper(clazz.getName), input))
- udfExpr.get.dataType // Force it to check input data types.
- } else if
(classOf[AbstractGenericUDAFResolver].isAssignableFrom(clazz)) {
- udfExpr = Some(HiveUDAFFunction(name, new
HiveFunctionWrapper(clazz.getName), input))
- udfExpr.get.dataType // Force it to check input data types.
- } else if (classOf[UDAF].isAssignableFrom(clazz)) {
- udfExpr = Some(HiveUDAFFunction(
- name,
- new HiveFunctionWrapper(clazz.getName),
- input,
- isUDAFBridgeRequired = true))
- udfExpr.get.dataType // Force it to check input data types.
- } else if (classOf[GenericUDTF].isAssignableFrom(clazz)) {
- udfExpr = Some(HiveGenericUDTF(name, new
HiveFunctionWrapper(clazz.getName), input))
- udfExpr.get.asInstanceOf[HiveGenericUDTF].elementSchema // Force
it to check data types.
+ Try(super.makeFunctionExpression(name, clazz, input)) match {
Review comment:
> `try` is the way as in the guideline. But in general I would like to
avoid changing the indentation for unrelated codes and make it difficult to see
what's the real diff. Such pattern makes it more difficult to backport and
revert. Let's avoid this @AngersZhuuuu next time. The actual diff seems just
adding more message in the exception.
Since I always backport pr, I know the point you mentioned, I will notice
this more carefully.
Yea, the actual diff is to show more message but since we need to know the
exception in return Failure(exception), so we can't use `getOrElse()`
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
