Skip to content

Fix millisecond timestamp handling #288

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

Merged
xiaoyongzhu merged 1 commit into from
May 20, 2022
Merged

Fix millisecond timestamp handling #288

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
12 changes: 8 additions & 4 deletions src/main/scala/com/linkedin/feathr/offline/swa/SlidingWindowFeatureUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ private[offline] object SlidingWindowFeatureUtils {
private val EPOCH_MILLIS = "epoch_millis"
private val MILLIS_IN_SECOND = 1000

val TIMESTAMP_WITH_TIMEZONE_FORMAT = "yyyy-MM-dd HH:mm:ssZ" // Z is timezone pattern letter
val TIMESTAMP_WITHOUT_TIMEZONE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS"
val TIMESTAMP_WITH_TIMEZONE_FORMAT = TIMESTAMP_WITHOUT_TIMEZONE_FORMAT + "Z" // Z is timezone pattern letter
val UTC_TIMEZONE_OFFSET = "-0000" // PDT/PST
val DEFAULT_TIME_DELAY = "Default-time-delay"
val TIMESTAMP_PARTITION_COLUMN = "__feathr_timestamp_column_from_partition"
Expand Down Expand Up @@ -218,9 +219,12 @@ private[offline] object SlidingWindowFeatureUtils {
// specified timezone to epoch
s"""to_unix_timestamp(
| concat(
| to_utc_timestamp(
| to_timestamp($timeStampCol, "$timeStampFormat"),
| "$parsedTimeZone"
| date_format(
| to_utc_timestamp(
| to_timestamp($timeStampCol, "$timeStampFormat"),
| "$parsedTimeZone"
| ),
| "$TIMESTAMP_WITHOUT_TIMEZONE_FORMAT"
| ),
| "$UTC_TIMEZONE_OFFSET"
| ),
Expand Down
11 changes: 11 additions & 0 deletions src/test/scala/com/linkedin/feathr/offline/swa/TestSlidingWindowFeatureUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,17 @@ class TestSlidingWindowFeatureUtils extends TestFeathr {
assertEquals(epoch.first().getLong(0), 1556866800)
}

@Test(enabled = true)
def testTimestampWithMilliSecondsTime(): Unit = {
val timeStampFormat = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"
val expr = SlidingWindowFeatureUtils.constructTimeStampExpr("\"2019-05-03T15:00:00.123Z\"", timeStampFormat, Some("America/Los_Angeles"))

val epoch = ss.sql(s"""select $expr
""".stripMargin)

assertEquals(epoch.first().getLong(0), 1556920800)
}

/**
* Test constructing timestamp with daylight saving at:
* Sunnyvale (USA - California) Friday, May 3, 2019 0:00:00 GMT-07:00 DST
Expand Down