Skip to content

Fix Some(null) in ExpressionConverter bypassing expression transformation fallback #11757

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

Open
acvictor wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −15
Open

Fix Some(null) in ExpressionConverter bypassing expression transformation fallback #11757

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 15 additions & 15 deletions gluten-substrait/src/main/scala/org/apache/gluten/expression/ExpressionConverter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,21 +284,21 @@ object ExpressionConverter extends SQLConfHelper with Logging {
expr: Expression,
attributeSeq: Seq[Attribute],
expressionsMap: Map[Class[_], String]): Option[ExpressionTransformer] = {
Option {
expr match {
case pythonUDF: PythonUDF =>
replacePythonUDFWithExpressionTransformer(pythonUDF, attributeSeq, expressionsMap)
case scalaUDF: ScalaUDF =>
replaceScalaUDFWithExpressionTransformer(scalaUDF, attributeSeq, expressionsMap)
case _ if HiveUDFTransformer.isHiveUDF(expr) =>
BackendsApiManager.getSparkPlanExecApiInstance.genHiveUDFTransformer(expr, attributeSeq)
case staticInvoke: StaticInvoke =>
replaceStaticInvokeWithExpressionTransformer(staticInvoke, attributeSeq, expressionsMap)
case invoke: Invoke =>
replaceInvokeWithExpressionTransformer(invoke, attributeSeq, expressionsMap)
case _ =>
null
}
expr match {
case pythonUDF: PythonUDF =>
Some(replacePythonUDFWithExpressionTransformer(pythonUDF, attributeSeq, expressionsMap))
case scalaUDF: ScalaUDF =>
Some(replaceScalaUDFWithExpressionTransformer(scalaUDF, attributeSeq, expressionsMap))
case _ if HiveUDFTransformer.isHiveUDF(expr) =>
Some(
BackendsApiManager.getSparkPlanExecApiInstance.genHiveUDFTransformer(expr, attributeSeq))
case staticInvoke: StaticInvoke =>
Some(
replaceStaticInvokeWithExpressionTransformer(staticInvoke, attributeSeq, expressionsMap))
case invoke: Invoke =>
Some(replaceInvokeWithExpressionTransformer(invoke, attributeSeq, expressionsMap))
case _ =>
None
}
}

Expand Down
Loading