Skip to content

[SPARK-4425][SQL] Handle NaN or Infinity cast to Timestamp correctly. #3283

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

Closed
ueshin wants to merge 1 commit into from
Closed

[SPARK-4425][SQL] Handle NaN or Infinity cast to Timestamp correctly. #3283

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
14 changes: 12 additions & 2 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Cast.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ case class Cast(child: Expression, dataType: DataType) extends UnaryExpression w
override def nullable = (child.dataType, dataType) match {
case (StringType, _: NumericType) => true
case (StringType, TimestampType) => true
case (DoubleType, TimestampType) => true
case (FloatType, TimestampType) => true
case (StringType, DateType) => true
case (_: NumericType, DateType) => true
case (BooleanType, DateType) => true
Expand Down Expand Up @@ -115,10 +117,18 @@ case class Cast(child: Expression, dataType: DataType) extends UnaryExpression w
buildCast[Decimal](_, d => decimalToTimestamp(d))
// TimestampWritable.doubleToTimestamp
case DoubleType =>
buildCast[Double](_, d => decimalToTimestamp(Decimal(d)))
buildCast[Double](_, d => try {
decimalToTimestamp(Decimal(d))
} catch {
case _: NumberFormatException => null
})
// TimestampWritable.floatToTimestamp
case FloatType =>
buildCast[Float](_, f => decimalToTimestamp(Decimal(f)))
buildCast[Float](_, f => try {
decimalToTimestamp(Decimal(f))
} catch {
case _: NumberFormatException => null
})
}

private[this] def decimalToTimestamp(d: Decimal) = {
Expand Down
5 changes: 5 additions & 0 deletions .../src/test/scala/org/apache/spark/sql/catalyst/expressions/ExpressionEvaluationSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,11 @@ class ExpressionEvaluationSuite extends FunSuite {

// A test for higher precision than millis
checkEvaluation(Cast(Cast(0.00000001, TimestampType), DoubleType), 0.00000001)

checkEvaluation(Cast(Literal(Double.NaN), TimestampType), null)
checkEvaluation(Cast(Literal(1.0 / 0.0), TimestampType), null)
checkEvaluation(Cast(Literal(Float.NaN), TimestampType), null)
checkEvaluation(Cast(Literal(1.0f / 0.0f), TimestampType), null)
}

test("null checking") {
Expand Down