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.

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

[VL] Support regexp_replace function with position argument #4411

Merged
merged 2 commits into from
Mar 20, 2024
Merged
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 @@ -581,6 +581,13 @@ class CHSparkPlanExecApi extends SparkPlanExecApi {
CHPosExplodeTransformer(substraitExprName, child, original, attributeSeq)
}

override def genRegexpReplaceTransformer(
substraitExprName: String,
children: Seq[ExpressionTransformer],
expr: RegExpReplace): ExpressionTransformer = {
CHRegExpReplaceTransformer(substraitExprName, children, expr)
}

override def createColumnarWriteFilesExec(
child: SparkPlan,
fileFormat: FileFormat,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,3 +197,28 @@ case class CHPosExplodeTransformer(
}
}
}

case class CHRegExpReplaceTransformer(
substraitExprName: String,
children: Seq[ExpressionTransformer],
original: RegExpReplace)
extends ExpressionTransformer {

override def doTransform(args: java.lang.Object): ExpressionNode = {
// In CH: replaceRegexpAll(subject, regexp, rep), which is equivalent
// In Spark: regexp_replace(subject, regexp, rep, pos=1)
val posNode = children(3).doTransform(args)
if (
!posNode.isInstanceOf[IntLiteralNode] ||
posNode.asInstanceOf[IntLiteralNode].getValue != 1
) {
throw new UnsupportedOperationException(s"$original not supported yet.")
}

GenericExpressionTransformer(
substraitExprName,
Seq(children(0), children(1), children(2)),
original)
.doTransform(args)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -512,4 +512,16 @@ class VeloxFunctionsValidateSuite extends VeloxWholeStageTransformerSuite {
}
}
}

test("regexp_replace") {
runQueryAndCompare(
"SELECT regexp_replace(l_partkey, '\\w', 'something') FROM lineitem limit 100") {
checkOperatorMatch[ProjectExecTransformer]
}
runQueryAndCompare(
"SELECT regexp_replace(l_partkey, '\\w', 'something', 3) FROM lineitem limit 100") {
checkOperatorMatch[ProjectExecTransformer]
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -466,12 +466,9 @@ class VeloxStringFunctionsSuite extends VeloxWholeStageTransformerSuite {
runQueryAndCompare(
s"select l_orderkey, regexp_replace(l_comment, '([a-z])', '1', 1) " +
s"from $LINEITEM_TABLE limit 5")(checkOperatorMatch[ProjectExecTransformer])
// todo incorrect results
runQueryAndCompare(
s"select l_orderkey, regexp_replace(l_comment, '([a-z])', '1', 10) " +
s"from $LINEITEM_TABLE limit 5",
true,
false)(_ => {})
s"from $LINEITEM_TABLE limit 5")(checkOperatorMatch[ProjectExecTransformer])
}

test("regex invalid") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,13 @@ trait SparkPlanExecApi {
throw new GlutenNotSupportException("make_timestamp is not supported")
}

def genRegexpReplaceTransformer(
substraitExprName: String,
children: Seq[ExpressionTransformer],
expr: RegExpReplace): ExpressionTransformer = {
GenericExpressionTransformer(substraitExprName, children, expr)
}

/**
* Generate ShuffleDependency for ColumnarShuffleExchangeExec.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -372,12 +372,14 @@ object ExpressionConverter extends SQLConfHelper with Logging {
s
)
case r: RegExpReplace =>
RegExpReplaceTransformer(
substraitExprName,
replaceWithExpressionTransformerInternal(r.subject, attributeSeq, expressionsMap),
replaceWithExpressionTransformerInternal(r.regexp, attributeSeq, expressionsMap),
replaceWithExpressionTransformerInternal(r.rep, attributeSeq, expressionsMap),
replaceWithExpressionTransformerInternal(r.pos, attributeSeq, expressionsMap),
BackendsApiManager.getSparkPlanExecApiInstance.genRegexpReplaceTransformer(
substraitExprName,
Seq(
replaceWithExpressionTransformerInternal(r.subject, attributeSeq, expressionsMap),
replaceWithExpressionTransformerInternal(r.regexp, attributeSeq, expressionsMap),
replaceWithExpressionTransformerInternal(r.rep, attributeSeq, expressionsMap),
replaceWithExpressionTransformerInternal(r.pos, attributeSeq, expressionsMap)
),
r
)
case equal: EqualNullSafe =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/
package io.glutenproject.expression

import io.glutenproject.exception.GlutenNotSupportException
import io.glutenproject.expression.ConverterUtils.FunctionConfig
import io.glutenproject.substrait.expression._

Expand Down Expand Up @@ -48,28 +47,3 @@ case class String2TrimExpressionTransformer(
ExpressionBuilder.makeScalarFunction(functionId, expressNodes, typeNode)
}
}

case class RegExpReplaceTransformer(
substraitExprName: String,
subject: ExpressionTransformer,
regexp: ExpressionTransformer,
rep: ExpressionTransformer,
pos: ExpressionTransformer,
original: RegExpReplace)
extends ExpressionTransformer {

override def doTransform(args: java.lang.Object): ExpressionNode = {
// In CH: replaceRegexpAll(subject, regexp, rep), which is equivalent
// In Spark: regexp_replace(subject, regexp, rep, pos=1)
val posNode = pos.doTransform(args)
if (
!posNode.isInstanceOf[IntLiteralNode] ||
posNode.asInstanceOf[IntLiteralNode].getValue != 1
) {
throw new GlutenNotSupportException(s"$original not supported yet.")
}

GenericExpressionTransformer(substraitExprName, Seq(subject, regexp, rep), original)
.doTransform(args)
}
}
Loading