Skip to content

[SPARK-22157] [SQL] The uniux_timestamp method handles the time field that is lost in mill #19380

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
wants to merge 1 commit into from
Closed

[SPARK-22157] [SQL] The uniux_timestamp method handles the time field that is lost in mill #19380

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
35 changes: 23 additions & 12 deletions ...talyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.spark.sql.catalyst.expressions

import java.text.{NumberFormat, SimpleDateFormat}
import java.sql.Timestamp
import java.text.DateFormat
import java.util.{Calendar, TimeZone}
Expand Down Expand Up @@ -620,7 +621,7 @@ abstract class UnixTime
override def inputTypes: Seq[AbstractDataType] =
Seq(TypeCollection(StringType, DateType, TimestampType), StringType)

override def dataType: DataType = LongType
override def dataType: DataType = DoubleType
Copy link
Member

@HyukjinKwon HyukjinKwon Sep 29, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW, I think we can't just change this datatype directly. This could break backward compatibility.

override def nullable: Boolean = true

private lazy val constFormat: UTF8String = right.eval().asInstanceOf[UTF8String]
Expand All @@ -630,6 +631,8 @@ abstract class UnixTime
} catch {
case NonFatal(_) => null
}
private lazy val nf: NumberFormat = NumberFormat.getNumberInstance
nf.setMaximumFractionDigits(3)

override def eval(input: InternalRow): Any = {
val t = left.eval(input)
Expand All @@ -638,16 +641,17 @@ abstract class UnixTime
} else {
left.dataType match {
case DateType =>
DateTimeUtils.daysToMillis(t.asInstanceOf[Int], timeZone) / 1000L
nf.format(DateTimeUtils.daysToMillis(t.asInstanceOf[Int], timeZone) / 1000d)
.replace(",", "").toDouble
case TimestampType =>
t.asInstanceOf[Long] / 1000000L
nf.format(t.asInstanceOf[Long] / 1000000d).replace(",", "").toDouble
case StringType if right.foldable =>
if (constFormat == null || formatter == null) {
null
} else {
try {
formatter.parse(
t.asInstanceOf[UTF8String].toString).getTime / 1000L
nf.format(formatter.parse(t.asInstanceOf[UTF8String].toString).getTime / 1000d)
.replace(",", "").toDouble
} catch {
case NonFatal(_) => null
}
Expand All @@ -659,8 +663,9 @@ abstract class UnixTime
} else {
val formatString = f.asInstanceOf[UTF8String].toString
try {
DateTimeUtils.newDateFormat(formatString, timeZone).parse(
t.asInstanceOf[UTF8String].toString).getTime / 1000L
nf.format(DateTimeUtils.newDateFormat(formatString, timeZone).parse(
t.asInstanceOf[UTF8String].toString).getTime / 1000d)
.replace(",", "").toDouble
} catch {
case NonFatal(_) => null
}
Expand All @@ -670,6 +675,8 @@ abstract class UnixTime
}

override def doGenCode(ctx: CodegenContext, ev: ExprCode): ExprCode = {
val sdf1 = classOf[NumberFormat].getName
val nfName = ctx.addReferenceObj("nf", nf, sdf1)
left.dataType match {
case StringType if right.foldable =>
val df = classOf[DateFormat].getName
Expand All @@ -684,7 +691,8 @@ abstract class UnixTime
${ctx.javaType(dataType)} ${ev.value} = ${ctx.defaultValue(dataType)};
if (!${ev.isNull}) {
try {
${ev.value} = $formatterName.parse(${eval1.value}.toString()).getTime() / 1000L;
${ev.value} = Double.parseDouble($nfName.format($formatterName.parse(
${eval1.value}.toString()).getTime() / 1000d).replace(",",""));
} catch (java.text.ParseException e) {
${ev.isNull} = true;
}
Expand All @@ -696,8 +704,9 @@ abstract class UnixTime
nullSafeCodeGen(ctx, ev, (string, format) => {
s"""
try {
${ev.value} = $dtu.newDateFormat($format.toString(), $tz)
.parse($string.toString()).getTime() / 1000L;
${ev.value} = Double.parseDouble($nfName.format(
$dtu.newDateFormat($format.toString(), $tz).parse($string.toString())
.getTime() / 1000d).replace(",",""));
} catch (java.lang.IllegalArgumentException e) {
${ev.isNull} = true;
} catch (java.text.ParseException e) {
Expand All @@ -712,7 +721,8 @@ abstract class UnixTime
boolean ${ev.isNull} = ${eval1.isNull};
${ctx.javaType(dataType)} ${ev.value} = ${ctx.defaultValue(dataType)};
if (!${ev.isNull}) {
${ev.value} = ${eval1.value} / 1000000L;
${ev.value} = Double.parseDouble(
$nfName.format(${eval1.value} / 1000000d).replace(",",""));
}""")
case DateType =>
val tz = ctx.addReferenceMinorObj(timeZone)
Expand All @@ -723,7 +733,8 @@ abstract class UnixTime
boolean ${ev.isNull} = ${eval1.isNull};
${ctx.javaType(dataType)} ${ev.value} = ${ctx.defaultValue(dataType)};
if (!${ev.isNull}) {
${ev.value} = $dtu.daysToMillis(${eval1.value}, $tz) / 1000L;
${ev.value} = Double.parseDouble(
$nfName.format($dtu.daysToMillis(${eval1.value}, $tz) / 1000d).replace(",",""));
}""")
}
}
Expand Down
45 changes: 27 additions & 18 deletions ...alyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/DateExpressionsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,28 +596,34 @@ class DateExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {

val date1 = Date.valueOf("2015-07-24")
checkEvaluation(UnixTimestamp(
Literal(sdf1.format(new Timestamp(0))), Literal("yyyy-MM-dd HH:mm:ss"), timeZoneId), 0L)
Literal(sdf1.format(new Timestamp(0))), Literal("yyyy-MM-dd HH:mm:ss"), timeZoneId), 0d)
checkEvaluation(UnixTimestamp(
Literal(sdf1.format(new Timestamp(1000000))), Literal("yyyy-MM-dd HH:mm:ss"), timeZoneId),
1000L)
1000d)
checkEvaluation(
UnixTimestamp(
Literal(new Timestamp(1000000)), Literal("yyyy-MM-dd HH:mm:ss"), timeZoneId),
1000L)
1000d)
checkEvaluation(
UnixTimestamp(Literal(date1), Literal("yyyy-MM-dd HH:mm:ss"), timeZoneId),
DateTimeUtils.daysToMillis(DateTimeUtils.fromJavaDate(date1), tz) / 1000L)
DateTimeUtils.daysToMillis(DateTimeUtils.fromJavaDate(date1), tz) / 1000d)
checkEvaluation(
UnixTimestamp(Literal(sdf2.format(new Timestamp(-1000000))), Literal(fmt2), timeZoneId),
-1000L)
-1000d)
checkEvaluation(
UnixTimestamp(Literal(sdf2.format(new Timestamp(-1000123))), Literal(fmt2), timeZoneId),
-1000.123d)
checkEvaluation(
UnixTimestamp(Literal(new Timestamp(1000123)), Literal(fmt2), timeZoneId),
1000.123d)
checkEvaluation(UnixTimestamp(
Literal(sdf3.format(Date.valueOf("2015-07-24"))), Literal(fmt3), timeZoneId),
DateTimeUtils.daysToMillis(
DateTimeUtils.fromJavaDate(Date.valueOf("2015-07-24")), tz) / 1000L)
DateTimeUtils.fromJavaDate(Date.valueOf("2015-07-24")), tz) / 1000d)
val t1 = UnixTimestamp(
CurrentTimestamp(), Literal("yyyy-MM-dd HH:mm:ss")).eval().asInstanceOf[Long]
CurrentTimestamp(), Literal("yyyy-MM-dd HH:mm:ss")).eval().asInstanceOf[Double]
val t2 = UnixTimestamp(
CurrentTimestamp(), Literal("yyyy-MM-dd HH:mm:ss")).eval().asInstanceOf[Long]
CurrentTimestamp(), Literal("yyyy-MM-dd HH:mm:ss")).eval().asInstanceOf[Double]
assert(t2 - t1 <= 1)
checkEvaluation(
UnixTimestamp(
Expand All @@ -628,7 +634,7 @@ class DateExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
null)
checkEvaluation(
UnixTimestamp(Literal(date1), Literal.create(null, StringType), timeZoneId),
DateTimeUtils.daysToMillis(DateTimeUtils.fromJavaDate(date1), tz) / 1000L)
DateTimeUtils.daysToMillis(DateTimeUtils.fromJavaDate(date1), tz) / 1000d)
checkEvaluation(
UnixTimestamp(Literal("2015-07-24"), Literal("not a valid format"), timeZoneId), null)
}
Expand All @@ -651,27 +657,30 @@ class DateExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {

val date1 = Date.valueOf("2015-07-24")
checkEvaluation(ToUnixTimestamp(
Literal(sdf1.format(new Timestamp(0))), Literal("yyyy-MM-dd HH:mm:ss"), timeZoneId), 0L)
Literal(sdf1.format(new Timestamp(0))), Literal("yyyy-MM-dd HH:mm:ss"), timeZoneId), 0d)
checkEvaluation(ToUnixTimestamp(
Literal(sdf1.format(new Timestamp(1000000))), Literal("yyyy-MM-dd HH:mm:ss"), timeZoneId),
1000L)
1000d)
checkEvaluation(ToUnixTimestamp(
Literal(new Timestamp(1000000)), Literal("yyyy-MM-dd HH:mm:ss")),
1000L)
1000d)
checkEvaluation(
ToUnixTimestamp(Literal(date1), Literal("yyyy-MM-dd HH:mm:ss"), timeZoneId),
DateTimeUtils.daysToMillis(DateTimeUtils.fromJavaDate(date1), tz) / 1000L)
DateTimeUtils.daysToMillis(DateTimeUtils.fromJavaDate(date1), tz) / 1000d)
checkEvaluation(
ToUnixTimestamp(Literal(sdf2.format(new Timestamp(-1000000))), Literal(fmt2), timeZoneId),
-1000L)
-1000d)
checkEvaluation(
ToUnixTimestamp(Literal(sdf2.format(new Timestamp(1000123))), Literal(fmt2), timeZoneId),
1000.123d)
checkEvaluation(ToUnixTimestamp(
Literal(sdf3.format(Date.valueOf("2015-07-24"))), Literal(fmt3), timeZoneId),
DateTimeUtils.daysToMillis(
DateTimeUtils.fromJavaDate(Date.valueOf("2015-07-24")), tz) / 1000L)
DateTimeUtils.fromJavaDate(Date.valueOf("2015-07-24")), tz) / 1000d)
val t1 = ToUnixTimestamp(
CurrentTimestamp(), Literal("yyyy-MM-dd HH:mm:ss")).eval().asInstanceOf[Long]
CurrentTimestamp(), Literal("yyyy-MM-dd HH:mm:ss")).eval().asInstanceOf[Double]
val t2 = ToUnixTimestamp(
CurrentTimestamp(), Literal("yyyy-MM-dd HH:mm:ss")).eval().asInstanceOf[Long]
CurrentTimestamp(), Literal("yyyy-MM-dd HH:mm:ss")).eval().asInstanceOf[Double]
assert(t2 - t1 <= 1)
checkEvaluation(ToUnixTimestamp(
Literal.create(null, DateType), Literal.create(null, StringType), timeZoneId), null)
Expand All @@ -681,7 +690,7 @@ class DateExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
null)
checkEvaluation(ToUnixTimestamp(
Literal(date1), Literal.create(null, StringType), timeZoneId),
DateTimeUtils.daysToMillis(DateTimeUtils.fromJavaDate(date1), tz) / 1000L)
DateTimeUtils.daysToMillis(DateTimeUtils.fromJavaDate(date1), tz) / 1000d)
checkEvaluation(
ToUnixTimestamp(Literal("2015-07-24"), Literal("not a valid format"), timeZoneId), null)
}
Expand Down