[SPARK-2209][SQL] Cast shouldn't do null check twice. #1143
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,72 +24,89 @@ import org.apache.spark.sql.catalyst.types._ | |
| /** Cast the child expression to the target data type. */ | ||
| case class Cast(child: Expression, dataType: DataType) extends UnaryExpression { | ||
| override def foldable = child.foldable | ||
|
|
||
| override def nullable = (child.dataType, dataType) match { | ||
| case (StringType, _: NumericType) => true | ||
| case (StringType, TimestampType) => true | ||
| case _ => child.nullable | ||
| } | ||
|
|
||
| override def toString = s"CAST($child, $dataType)" | ||
|
|
||
| type EvaluatedType = Any | ||
|
|
||
| // [[func]] assumes the input is no longer null because eval already does the null check. | ||
| @inline private[this] def buildCast[T](a: Any, func: T => Any): Any = func(a.asInstanceOf[T]) | ||
|
|
||
| // UDFToString | ||
| private[this] def castToString: Any => Any = child.dataType match { | ||
| case BinaryType => buildCast[Array[Byte]](_, new String(_, "UTF-8")) | ||
| case _ => buildCast[Any](_, _.toString) | ||
| } | ||
|
|
||
| // BinaryConverter | ||
| private[this] def castToBinary: Any => Any = child.dataType match { | ||
| case StringType => buildCast[String](_, _.getBytes("UTF-8")) | ||
| } | ||
|
|
||
| // UDFToBoolean | ||
| private[this] def castToBoolean: Any => Any = child.dataType match { | ||
| case StringType => | ||
| buildCast[String](_, _.length() != 0) | ||
| case TimestampType => | ||
| buildCast[Timestamp](_, b => b.getTime() != 0 || b.getNanos() != 0) | ||
| case LongType => | ||
| buildCast[Long](_, _ != 0) | ||
| case IntegerType => | ||
| buildCast[Int](_, _ != 0) | ||
| case ShortType => | ||
| buildCast[Short](_, _ != 0) | ||
| case ByteType => | ||
| buildCast[Byte](_, _ != 0) | ||
| case DecimalType => | ||
| buildCast[BigDecimal](_, _ != 0) | ||
| case DoubleType => | ||
| buildCast[Double](_, _ != 0) | ||
| case FloatType => | ||
| buildCast[Float](_, _ != 0) | ||
| } | ||
|
|
||
| // TimestampConverter | ||
| private[this] def castToTimestamp: Any => Any = child.dataType match { | ||
| case StringType => | ||
| buildCast[String](_, s => { | ||
| // Throw away extra if more than 9 decimal places | ||
| val periodIdx = s.indexOf(".") | ||
| var n = s | ||
| if (periodIdx != -1) { | ||
| if (n.length() - periodIdx > 9) { | ||
| n = n.substring(0, periodIdx + 10) | ||
| } | ||
| } | ||
| try Timestamp.valueOf(n) catch { case _: java.lang.IllegalArgumentException => null } | ||
| }) | ||
| case BooleanType => | ||
| buildCast[Boolean](_, b => new Timestamp((if(b) 1 else 0) * 1000)) | ||
|
|
||
| case LongType => | ||
| buildCast[Long](_, l => new Timestamp(l * 1000)) | ||
| case IntegerType => | ||
| buildCast[Int](_, i => new Timestamp(i * 1000)) | ||
| case ShortType => | ||
| buildCast[Short](_, s => new Timestamp(s * 1000)) | ||
| case ByteType => | ||
| buildCast[Byte](_, b => new Timestamp(b * 1000)) | ||
| // TimestampWritable.decimalToTimestamp | ||
| case DecimalType => | ||
| buildCast[BigDecimal](_, d => decimalToTimestamp(d)) | ||
| // TimestampWritable.doubleToTimestamp | ||
| case DoubleType => | ||
| buildCast[Double](_, d => decimalToTimestamp(d)) | ||
| // TimestampWritable.floatToTimestamp | ||
| case FloatType => | ||
| buildCast[Float](_, f => decimalToTimestamp(f)) | ||
| } | ||
|
|
||
| private[this] def decimalToTimestamp(d: BigDecimal) = { | ||
| val seconds = d.longValue() | ||
|
Contributor
There was a problem hiding this comment. According to the API documentation, scala> var d: BigDecimal = 1000000000
d: BigDecimal = 1000000000
scala> d = d * d * d * d
d: BigDecimal = 1.000000000000000000000000000000000E+36
scala> d.longValue
res0: Long = -5527149226598858752
Contributor
Author
There was a problem hiding this comment. Can you file a jira ticket? I'm tempted to not fix that in this PR. |
||
| val bd = (d - seconds) * 1000000000 | ||
| val nanos = bd.intValue() | ||
|
|
@@ -104,85 +121,118 @@ case class Cast(child: Expression, dataType: DataType) extends UnaryExpression { | |
| } | ||
|
|
||
| // Timestamp to long, converting milliseconds to seconds | ||
| private[this] def timestampToLong(ts: Timestamp) = ts.getTime / 1000 | ||
|
|
||
| private[this] def timestampToDouble(ts: Timestamp) = { | ||
| // First part is the seconds since the beginning of time, followed by nanosecs. | ||
| ts.getTime / 1000 + ts.getNanos.toDouble / 1000000000 | ||
| } | ||
|
|
||
| private[this] def castToLong: Any => Any = child.dataType match { | ||
| case StringType => | ||
| buildCast[String](_, s => try s.toLong catch { | ||
| case _: NumberFormatException => null | ||
| }) | ||
|
Contributor
There was a problem hiding this comment. Maybe we can simplify this to: Try(s.toLong).getOrElse(null)(
Contributor
Author
There was a problem hiding this comment. Try is really slow though. |
||
| case BooleanType => | ||
| buildCast[Boolean](_, b => if (b) 1L else 0L) | ||
| case TimestampType => | ||
| buildCast[Timestamp](_, t => timestampToLong(t)) | ||
| case DecimalType => | ||
| buildCast[BigDecimal](_, _.toLong) | ||
| case x: NumericType => | ||
| b => x.numeric.asInstanceOf[Numeric[Any]].toLong(b) | ||
| } | ||
|
|
||
| private[this] def castToInt: Any => Any = child.dataType match { | ||
| case StringType => | ||
| buildCast[String](_, s => try s.toInt catch { | ||
| case _: NumberFormatException => null | ||
| }) | ||
| case BooleanType => | ||
| buildCast[Boolean](_, b => if (b) 1 else 0) | ||
| case TimestampType => | ||
| buildCast[Timestamp](_, t => timestampToLong(t).toInt) | ||
| case DecimalType => | ||
| buildCast[BigDecimal](_, _.toInt) | ||
| case x: NumericType => | ||
| b => x.numeric.asInstanceOf[Numeric[Any]].toInt(b) | ||
| } | ||
|
|
||
| private[this] def castToShort: Any => Any = child.dataType match { | ||
| case StringType => | ||
| buildCast[String](_, s => try s.toShort catch { | ||
| case _: NumberFormatException => null | ||
| }) | ||
| case BooleanType => | ||
| buildCast[Boolean](_, b => if (b) 1.toShort else 0.toShort) | ||
| case TimestampType => | ||
| buildCast[Timestamp](_, t => timestampToLong(t).toShort) | ||
| case DecimalType => | ||
| buildCast[BigDecimal](_, _.toShort) | ||
| case x: NumericType => | ||
| b => x.numeric.asInstanceOf[Numeric[Any]].toInt(b).toShort | ||
| } | ||
|
|
||
| private[this] def castToByte: Any => Any = child.dataType match { | ||
| case StringType => | ||
| buildCast[String](_, s => try s.toByte catch { | ||
| case _: NumberFormatException => null | ||
| }) | ||
| case BooleanType => | ||
| buildCast[Boolean](_, b => if (b) 1.toByte else 0.toByte) | ||
| case TimestampType => | ||
| buildCast[Timestamp](_, t => timestampToLong(t).toByte) | ||
| case DecimalType => | ||
| buildCast[BigDecimal](_, _.toByte) | ||
| case x: NumericType => | ||
| b => x.numeric.asInstanceOf[Numeric[Any]].toInt(b).toByte | ||
| } | ||
|
|
||
| private[this] def castToDecimal: Any => Any = child.dataType match { | ||
| case StringType => | ||
| buildCast[String](_, s => try BigDecimal(s.toDouble) catch { | ||
| case _: NumberFormatException => null | ||
| }) | ||
| case BooleanType => | ||
| buildCast[Boolean](_, b => if (b) BigDecimal(1) else BigDecimal(0)) | ||
| case TimestampType => | ||
| // Note that we lose precision here. | ||
| buildCast[Timestamp](_, t => BigDecimal(timestampToDouble(t))) | ||
| case x: NumericType => | ||
| b => BigDecimal(x.numeric.asInstanceOf[Numeric[Any]].toDouble(b)) | ||
| } | ||
|
|
||
| private[this] def castToDouble: Any => Any = child.dataType match { | ||
| case StringType => | ||
| buildCast[String](_, s => try s.toDouble catch { | ||
| case _: NumberFormatException => null | ||
| }) | ||
| case BooleanType => | ||
| buildCast[Boolean](_, b => if (b) 1d else 0d) | ||
| case TimestampType => | ||
| buildCast[Timestamp](_, t => timestampToDouble(t)) | ||
| case DecimalType => | ||
| buildCast[BigDecimal](_, _.toDouble) | ||
| case x: NumericType => | ||
| b => x.numeric.asInstanceOf[Numeric[Any]].toDouble(b) | ||
| } | ||
|
|
||
| private[this] def castToFloat: Any => Any = child.dataType match { | ||
| case StringType => | ||
| buildCast[String](_, s => try s.toFloat catch { | ||
| case _: NumberFormatException => null | ||
| }) | ||
| case BooleanType => | ||
| buildCast[Boolean](_, b => if (b) 1f else 0f) | ||
| case TimestampType => | ||
| buildCast[Timestamp](_, t => timestampToDouble(t).toFloat) | ||
| case DecimalType => | ||
| buildCast[BigDecimal](_, _.toFloat) | ||
| case x: NumericType => | ||
| b => x.numeric.asInstanceOf[Numeric[Any]].toFloat(b) | ||
| } | ||
|
|
||
| private[this] lazy val cast: Any => Any = dataType match { | ||
| case StringType => castToString | ||
| case BinaryType => castToBinary | ||
| case DecimalType => castToDecimal | ||
|
|
@@ -198,10 +248,6 @@ case class Cast(child: Expression, dataType: DataType) extends UnaryExpression { | |
|
|
||
| override def eval(input: Row): Any = { | ||
| val evaluated = child.eval(input) | ||
| if (evaluated == null) null else cast(evaluated) | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How about merging these two
ifstatements into 1 with&&?