dongjoon-hyun commented on a change in pull request #25331: [SPARK-27768][SQL]
Support Infinity/NaN-related float/double literals case-insensitively
URL: https://github.com/apache/spark/pull/25331#discussion_r313193302
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Cast.scala
##########
@@ -1259,48 +1284,66 @@ case class Cast(child: Expression, dataType: DataType,
timeZoneId: Option[String
(c, evPrim, evNull) => code"$evPrim = (long) $c;"
}
- private[this] def castToFloatCode(from: DataType): CastFunction = from match
{
- case StringType =>
- (c, evPrim, evNull) =>
- code"""
+ private[this] def castToFloatCode(from: DataType, ctx: CodegenContext):
CastFunction = {
+ from match {
+ case StringType =>
+ val floatStr = ctx.freshVariable("floatStr", StringType)
+ (c, evPrim, evNull) =>
+ code"""
+ final String $floatStr = $c.toString();
try {
- $evPrim = Float.valueOf($c.toString());
+ $evPrim = Float.valueOf($floatStr);
} catch (java.lang.NumberFormatException e) {
- $evNull = true;
+ Float f = (Float)
Cast.processFloatingPointSpecialLiterals($floatStr, true);
+ if (f == null) {
+ $evNull = true;
+ } else {
+ $evPrim = f.floatValue();
+ }
}
"""
- case BooleanType =>
- (c, evPrim, evNull) => code"$evPrim = $c ? 1.0f : 0.0f;"
- case DateType =>
- (c, evPrim, evNull) => code"$evNull = true;"
- case TimestampType =>
- (c, evPrim, evNull) => code"$evPrim = (float)
(${timestampToDoubleCode(c)});"
- case DecimalType() =>
- (c, evPrim, evNull) => code"$evPrim = $c.toFloat();"
- case x: NumericType =>
- (c, evPrim, evNull) => code"$evPrim = (float) $c;"
+ case BooleanType =>
+ (c, evPrim, evNull) => code"$evPrim = $c ? 1.0f : 0.0f;"
+ case DateType =>
+ (c, evPrim, evNull) => code"$evNull = true;"
+ case TimestampType =>
+ (c, evPrim, evNull) => code"$evPrim = (float)
(${timestampToDoubleCode(c)});"
+ case DecimalType() =>
+ (c, evPrim, evNull) => code"$evPrim = $c.toFloat();"
+ case x: NumericType =>
+ (c, evPrim, evNull) => code"$evPrim = (float) $c;"
+ }
}
- private[this] def castToDoubleCode(from: DataType): CastFunction = from
match {
- case StringType =>
- (c, evPrim, evNull) =>
- code"""
+ private[this] def castToDoubleCode(from: DataType, ctx: CodegenContext):
CastFunction = {
+ from match {
+ case StringType =>
+ val doubleStr = ctx.freshVariable("doubleStr", StringType)
+ (c, evPrim, evNull) =>
+ code"""
+ final String $doubleStr = $c.toString();
try {
- $evPrim = Double.valueOf($c.toString());
+ $evPrim = Double.valueOf($doubleStr);
} catch (java.lang.NumberFormatException e) {
- $evNull = true;
+ Double d = (Double)
Cast.processFloatingPointSpecialLiterals($doubleStr, false);
Review comment:
`Double` -> `final Double`?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
