From 6f068636539530e510867314da6db4beebda987b Mon Sep 17 00:00:00 2001 From: Ruifeng Zheng Date: Tue, 6 Dec 2022 11:39:55 +0800 Subject: [PATCH] simplify --- .../spark/sql/connect/planner/SparkConnectPlanner.scala | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/connector/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/SparkConnectPlanner.scala b/connector/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/SparkConnectPlanner.scala index 7f9def8395ca9..27a0d82dc9731 100644 --- a/connector/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/SparkConnectPlanner.scala +++ b/connector/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/SparkConnectPlanner.scala @@ -406,7 +406,8 @@ class SparkConnectPlanner(session: SparkSession) { case proto.Expression.ExprTypeCase.UNRESOLVED_ATTRIBUTE => transformUnresolvedExpression(exp) case proto.Expression.ExprTypeCase.UNRESOLVED_FUNCTION => - transformUnresolvedFunction(exp.getUnresolvedFunction) + transformUnregisteredFunction(exp.getUnresolvedFunction) + .getOrElse(transformUnresolvedFunction(exp.getUnresolvedFunction)) case proto.Expression.ExprTypeCase.ALIAS => transformAlias(exp.getAlias) case proto.Expression.ExprTypeCase.EXPRESSION_STRING => transformExpressionString(exp.getExpressionString) @@ -540,11 +541,6 @@ class SparkConnectPlanner(session: SparkSession) { */ private def transformUnresolvedFunction( fun: proto.Expression.UnresolvedFunction): Expression = { - val functionOpt = transformUnregisteredFunction(fun) - if (functionOpt.nonEmpty) { - return functionOpt.get - } - if (fun.getIsUserDefinedFunction) { UnresolvedFunction( session.sessionState.sqlParser.parseFunctionIdentifier(fun.getFunctionName),