Skip to content
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

Jump to bottom

[VL] support spark nanvl function #4446

Merged
merged 2 commits into from
Jan 19, 2024
Merged

[VL] support spark nanvl function #4446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16ccbdd
[VL] support spark nanvl function
zhli1142015 Jan 18, 2024
b87b8cd
address comments
zhli1142015 Jan 19, 2024
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
22 changes: 20 additions & 2 deletions backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/SparkPlanExecApiImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import org.apache.spark.sql.catalyst.{AggregateFunctionRewriteRule, FlushableHas
import org.apache.spark.sql.catalyst.analysis.FunctionRegistry.FunctionBuilder
import org.apache.spark.sql.catalyst.catalog.BucketSpec
import org.apache.spark.sql.catalyst.catalog.CatalogTypes.TablePartitionSpec
import org.apache.spark.sql.catalyst.expressions.{Attribute, Cast, CreateNamedStruct, ElementAt, Expression, ExpressionInfo, GetArrayItem, GetMapValue, GetStructField, Literal, NamedExpression, StringSplit, StringTrim}
import org.apache.spark.sql.catalyst.expressions.{Attribute, Cast, CreateNamedStruct, ElementAt, Expression, ExpressionInfo, GetArrayItem, GetMapValue, GetStructField, If, IsNaN, Literal, NamedExpression, NaNvl, StringSplit, StringTrim}
import org.apache.spark.sql.catalyst.expressions.aggregate.{AggregateExpression, HLLAdapter}
import org.apache.spark.sql.catalyst.optimizer.BuildSide
import org.apache.spark.sql.catalyst.plans.JoinType
Expand Down Expand Up @@ -112,6 +112,23 @@ class SparkPlanExecApiImpl extends SparkPlanExecApi {
new IfThenNode(Lists.newArrayList(lessThanFuncNode), Lists.newArrayList(nullNode), resultNode)
}

/** Transform NaNvl to Substrait. */
override def genNaNvlTransformer(
substraitExprName: String,
left: ExpressionTransformer,
right: ExpressionTransformer,
original: NaNvl): ExpressionTransformer = {
val condExpr = IsNaN(original.left)
val condFuncName = ExpressionMappings.expressionsMap(classOf[IsNaN])
val newExpr = If(condExpr, original.right, original.left)
IfTransformer(
GenericExpressionTransformer(condFuncName, Seq(left), condExpr),
right,
left,
newExpr
)
}

/**
* * Plans.
*/
Expand Down Expand Up @@ -518,7 +535,8 @@ class SparkPlanExecApiImpl extends SparkPlanExecApi {
override def extraExpressionMappings: Seq[Sig] = {
Seq(
Sig[HLLAdapter](ExpressionNames.APPROX_DISTINCT),
Sig[UDFExpression](ExpressionNames.UDF_PLACEHOLDER))
Sig[UDFExpression](ExpressionNames.UDF_PLACEHOLDER),
Sig[NaNvl](ExpressionNames.NANVL))
}

override def genInjectedFunctions()
Expand Down
11 changes: 11 additions & 0 deletions backends-velox/src/test/scala/io/glutenproject/execution/VeloxFunctionsValidateSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,4 +372,15 @@ class VeloxFunctionsValidateSuite extends VeloxWholeStageTransformerSuite {
checkOperatorMatch[ProjectExecTransformer]
}
}

test("Test nanvl function") {
runQueryAndCompare("""SELECT nanvl(cast('nan' as float), 1f),
| nanvl(l_orderkey, cast('null' as double)),
| nanvl(cast('null' as double), l_orderkey),
| nanvl(l_orderkey, l_orderkey / 0.0d),
| nanvl(cast('nan' as float), l_orderkey)
| from lineitem limit 1""".stripMargin) {
checkOperatorMatch[ProjectExecTransformer]
}
}
}
2 changes: 1 addition & 1 deletion docs/velox-backend-support-progress.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ Gluten supports 199 functions. (Draw to right to see all data types)
| least | least | least | S | | | | | | S | S | S | S | S | | | | | | | | | |
| md5 | md5 | | S | | | S | | | | | | | | | | | | | | | | |
| monotonically_increasing_id | | | | | | | | | | | | | | | | | | | | | | |
| nanvl | | | | | | | | | | | | | | | | | | | | | | |
| nanvl | | | S | | | | | | | | | | | | | | | | | | | |
| nvl | | | | | | | | | | | | | | | | | | | | | | |
| nvl2 | | | | | | | | | | | | | | | | | | | | | | |
| raise_error | | | | | | | | | | | | | | | | | | | | | | |
Expand Down
9 changes: 9 additions & 0 deletions gluten-core/src/main/scala/io/glutenproject/backendsapi/SparkPlanExecApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,15 @@ trait SparkPlanExecApi {
PosExplodeTransformer(substraitExprName, child, original, attributeSeq)
}

/** Transform NaNvl to Substrait. */
def genNaNvlTransformer(
substraitExprName: String,
left: ExpressionTransformer,
right: ExpressionTransformer,
original: NaNvl): ExpressionTransformer = {
throw new UnsupportedOperationException("NaNvl is not supported")
}

/**
* Generate ShuffleDependency for ColumnarShuffleExchangeExec.
*
Expand Down
7 changes: 7 additions & 0 deletions gluten-core/src/main/scala/io/glutenproject/expression/ExpressionConverter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,13 @@ object ExpressionConverter extends SQLConfHelper with Logging {
rightChild,
resultType,
b)
case n: NaNvl =>
BackendsApiManager.getSparkPlanExecApiInstance.genNaNvlTransformer(
substraitExprName,
replaceWithExpressionTransformerInternal(n.left, attributeSeq, expressionsMap),
replaceWithExpressionTransformerInternal(n.right, attributeSeq, expressionsMap),
n
)
Copy link
Contributor

@rui-mo rui-mo Jan 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Does CH backend need this replacement? cc @zzcclp

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't know, but let me to limit this replacement for velox only now, thanks.

case e: Transformable =>
val childrenTransformers =
e.children.map(replaceWithExpressionTransformerInternal(_, attributeSeq, expressionsMap))
Expand Down
1 change: 1 addition & 0 deletions shims/common/src/main/scala/io/glutenproject/expression/ExpressionNames.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ object ExpressionNames {
final val IS_NULL = "is_null"
final val NOT = "not"
final val IS_NAN = "isnan"
final val NANVL = "nanvl"

// SparkSQL String functions
final val ASCII = "ascii"
Expand Down
Loading