You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by we...@apache.org on 2018/02/17 02:54:40 UTC
spark git commit: [SPARK-23447][SQL] Cleanup codegen template for
Literal
Repository: spark
Updated Branches:
refs/heads/master d5ed2108d -> 15ad4a7f1
[SPARK-23447][SQL] Cleanup codegen template for Literal
## What changes were proposed in this pull request?
Cleaned up the codegen templates for `Literal`s, to make sure that the `ExprCode` returned from `Literal.doGenCode()` has:
1. an empty `code` field;
2. an `isNull` field of either literal `true` or `false`;
3. a `value` field that is just a simple literal/constant.
Before this PR, there are a couple of paths that would return a non-trivial `code` and all of them are actually unnecessary. The `NaN` and `Infinity` constants for `double` and `float` can be accessed through constants directly available so there's no need to add a reference for them.
Also took the opportunity to add a new util method for ease of creating `ExprCode` for inline-able non-null values.
## How was this patch tested?
Existing tests.
Author: Kris Mok <kr...@databricks.com>
Closes #20626 from rednaxelafx/codegen-literal.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/15ad4a7f
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/15ad4a7f
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/15ad4a7f
Branch: refs/heads/master
Commit: 15ad4a7f1000c83cefbecd41e315c964caa3c39f
Parents: d5ed210
Author: Kris Mok <kr...@databricks.com>
Authored: Sat Feb 17 10:54:14 2018 +0800
Committer: Wenchen Fan <we...@databricks.com>
Committed: Sat Feb 17 10:54:14 2018 +0800
----------------------------------------------------------------------
.../expressions/codegen/CodeGenerator.scala | 6 +++
.../sql/catalyst/expressions/literals.scala | 51 +++++++++++---------
2 files changed, 34 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/15ad4a7f/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala
index 4dcbb70..31ba29a 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala
@@ -58,6 +58,12 @@ import org.apache.spark.util.{ParentClassLoader, Utils}
*/
case class ExprCode(var code: String, var isNull: String, var value: String)
+object ExprCode {
+ def forNonNullValue(value: String): ExprCode = {
+ ExprCode(code = "", isNull = "false", value = value)
+ }
+}
+
/**
* State used for subexpression elimination.
*
http://git-wip-us.apache.org/repos/asf/spark/blob/15ad4a7f/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/literals.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/literals.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/literals.scala
index cd176d9..c1e65e3 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/literals.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/literals.scala
@@ -278,40 +278,45 @@ case class Literal (value: Any, dataType: DataType) extends LeafExpression {
override def doGenCode(ctx: CodegenContext, ev: ExprCode): ExprCode = {
val javaType = ctx.javaType(dataType)
- // change the isNull and primitive to consts, to inline them
if (value == null) {
- ev.isNull = "true"
- ev.copy(s"final $javaType ${ev.value} = ${ctx.defaultValue(dataType)};")
+ val defaultValueLiteral = ctx.defaultValue(javaType) match {
+ case "null" => s"(($javaType)null)"
+ case lit => lit
+ }
+ ExprCode(code = "", isNull = "true", value = defaultValueLiteral)
} else {
- ev.isNull = "false"
dataType match {
case BooleanType | IntegerType | DateType =>
- ev.copy(code = "", value = value.toString)
+ ExprCode.forNonNullValue(value.toString)
case FloatType =>
- val v = value.asInstanceOf[Float]
- if (v.isNaN || v.isInfinite) {
- val boxedValue = ctx.addReferenceObj("boxedValue", v)
- val code = s"final $javaType ${ev.value} = ($javaType) $boxedValue;"
- ev.copy(code = code)
- } else {
- ev.copy(code = "", value = s"${value}f")
+ value.asInstanceOf[Float] match {
+ case v if v.isNaN =>
+ ExprCode.forNonNullValue("Float.NaN")
+ case Float.PositiveInfinity =>
+ ExprCode.forNonNullValue("Float.POSITIVE_INFINITY")
+ case Float.NegativeInfinity =>
+ ExprCode.forNonNullValue("Float.NEGATIVE_INFINITY")
+ case _ =>
+ ExprCode.forNonNullValue(s"${value}F")
}
case DoubleType =>
- val v = value.asInstanceOf[Double]
- if (v.isNaN || v.isInfinite) {
- val boxedValue = ctx.addReferenceObj("boxedValue", v)
- val code = s"final $javaType ${ev.value} = ($javaType) $boxedValue;"
- ev.copy(code = code)
- } else {
- ev.copy(code = "", value = s"${value}D")
+ value.asInstanceOf[Double] match {
+ case v if v.isNaN =>
+ ExprCode.forNonNullValue("Double.NaN")
+ case Double.PositiveInfinity =>
+ ExprCode.forNonNullValue("Double.POSITIVE_INFINITY")
+ case Double.NegativeInfinity =>
+ ExprCode.forNonNullValue("Double.NEGATIVE_INFINITY")
+ case _ =>
+ ExprCode.forNonNullValue(s"${value}D")
}
case ByteType | ShortType =>
- ev.copy(code = "", value = s"($javaType)$value")
+ ExprCode.forNonNullValue(s"($javaType)$value")
case TimestampType | LongType =>
- ev.copy(code = "", value = s"${value}L")
+ ExprCode.forNonNullValue(s"${value}L")
case _ =>
- ev.copy(code = "", value = ctx.addReferenceObj("literal", value,
- ctx.javaType(dataType)))
+ val constRef = ctx.addReferenceObj("literal", value, javaType)
+ ExprCode.forNonNullValue(constRef)
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org