Skip to content

[SPARK-57174][SQL] Simplify Chr codegen by extracting a static Java helper #56224

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
gengliangwang wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −20
Open

[SPARK-57174][SQL] Simplify Chr codegen by extracting a static Java helper #56224

Show file tree
Hide file tree
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
17 changes: 17 additions & 0 deletions ...catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/ExpressionImplUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,4 +342,21 @@ public static UTF8String quote(UTF8String str) {
String sp = str.toString().replaceAll(qtChar, qtCharRep);
return UTF8String.fromString(qtChar + sp + qtChar);
}

/**
* Returns the single-character string for the {@code chr} expression: the
* ASCII/Latin-1 character for {@code longVal & 0xFF}. A negative argument
* yields the empty string. Shared by the eval and codegen paths so the
* generated Java is a single call rather than an inline if/else chain.
*/
public static UTF8String chr(long longVal) {
if (longVal < 0) {
return UTF8String.EMPTY_UTF8;
} else if ((longVal & 0xFF) == 0) {
return UTF8String.fromString(String.valueOf(Character.MIN_VALUE));
} else {
char c = (char) (longVal & 0xFF);
return UTF8String.fromString(String.valueOf(c));
}
}
}
23 changes: 3 additions & 20 deletions ...catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringExpressions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2822,31 +2822,14 @@ case class Chr(child: Expression)
override def inputTypes: Seq[DataType] = Seq(LongType)

protected override def nullSafeEval(lon: Any): Any = {
val longVal = lon.asInstanceOf[Long]
if (longVal < 0) {
UTF8String.EMPTY_UTF8
} else if ((longVal & 0xFF) == 0) {
UTF8String.fromString(Character.MIN_VALUE.toString)
} else {
UTF8String.fromString((longVal & 0xFF).toChar.toString)
}
ExpressionImplUtils.chr(lon.asInstanceOf[Long])
}

override def contextIndependentFoldable: Boolean = child.contextIndependentFoldable

override def doGenCode(ctx: CodegenContext, ev: ExprCode): ExprCode = {
nullSafeCodeGen(ctx, ev, lon => {
s"""
if ($lon < 0) {
${ev.value} = UTF8String.EMPTY_UTF8;
} else if (($lon & 0xFF) == 0) {
${ev.value} = UTF8String.fromString(String.valueOf(Character.MIN_VALUE));
} else {
char c = (char)($lon & 0xFF);
${ev.value} = UTF8String.fromString(String.valueOf(c));
}
"""
})
val utils = classOf[ExpressionImplUtils].getName
nullSafeCodeGen(ctx, ev, lon => s"${ev.value} = $utils.chr($lon);")
}

override protected def withNewChildInternal(newChild: Expression): Chr = copy(child = newChild)
Expand Down