Skip to content
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

Jump to bottom

Support MMyyyy date/timestamp format #5768

Merged
merged 2 commits into from
Jun 8, 2022
Merged

Support MMyyyy date/timestamp format #5768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
453d51d
Support MMyyyy date/timestamp format
Jun 7, 2022
de11a6e
Add a test case
Jun 7, 2022
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
11 changes: 8 additions & 3 deletions docs/compatibility.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,16 +701,21 @@ The formats which are supported on GPU vary depending on the setting for `timePa
With timeParserPolicy set to `CORRECTED` or `EXCEPTION` (the default), the following formats are supported
on the GPU without requiring any additional settings.

- `dd/MM/yyyy`
- `yyyy/MM`
- `yyyy-MM-dd`
- `yyyy/MM/dd`
- `yyyy-MM`
- `yyyy-MM-dd`
- `yyyy/MM`
- `dd/MM/yyyy`
- `yyyy-MM-dd HH:mm:ss`
- `MM-dd`
- `MM/dd`
- `dd-MM`
- `dd/MM`
- `MM/yyyy`
- `MM-yyyy`
- `MM/dd/yyyy`
- `MM-dd-yyyy`
- `MMyyyy`

Valid Spark date/time formats that do not appear in the list above may also be supported but have not been
extensively tested and may produce different results compared to the CPU. Known issues include:
Expand Down
6 changes: 6 additions & 0 deletions integration_tests/src/main/python/date_time_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,12 @@ def test_gettimestamp(data_gen, ansi_enabled):
lambda spark : unary_op_df(spark, data_gen).select(f.to_date(f.col("a"), "yyyy-MM-dd")),
{'spark.sql.ansi.enabled': ansi_enabled})


@pytest.mark.parametrize('data_gen', [StringGen('0[1-9]200[0-9]')], ids=idfn)
def test_gettimestamp_format_MMyyyy(data_gen):
assert_gpu_and_cpu_are_equal_collect(
lambda spark: unary_op_df(spark, data_gen).select(f.to_date(f.col("a"), "MMyyyy")))

def test_gettimestamp_ansi_exception():
assert_gpu_and_cpu_error(
lambda spark : invalid_date_string_df(spark).select(f.to_date(f.col("a"), "yyyy-MM-dd")).collect(),
Expand Down
50 changes: 26 additions & 24 deletions sql-plugin/src/main/scala/org/apache/spark/sql/rapids/datetimeExpressions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,51 +403,53 @@ object GpuToTimestamp extends Arm {
// or EXCEPTION. It is possible that other formats may be supported but these are the only
// ones that we have tests for.
val CORRECTED_COMPATIBLE_FORMATS = Map(
"yyyy-MM-dd" -> ParseFormatMeta('-', isTimestamp = false,
"yyyy-MM-dd" -> ParseFormatMeta(Option('-'), isTimestamp = false,
raw"\A\d{4}-\d{2}-\d{2}\Z"),
"yyyy/MM/dd" -> ParseFormatMeta('/', isTimestamp = false,
"yyyy/MM/dd" -> ParseFormatMeta(Option('/'), isTimestamp = false,
raw"\A\d{4}/\d{1,2}/\d{1,2}\Z"),
"yyyy-MM" -> ParseFormatMeta('-', isTimestamp = false,
"yyyy-MM" -> ParseFormatMeta(Option('-'), isTimestamp = false,
raw"\A\d{4}-\d{2}\Z"),
"yyyy/MM" -> ParseFormatMeta('/', isTimestamp = false,
"yyyy/MM" -> ParseFormatMeta(Option('/'), isTimestamp = false,
raw"\A\d{4}/\d{2}\Z"),
"dd/MM/yyyy" -> ParseFormatMeta('/', isTimestamp = false,
"dd/MM/yyyy" -> ParseFormatMeta(Option('/'), isTimestamp = false,
raw"\A\d{2}/\d{2}/\d{4}\Z"),
"yyyy-MM-dd HH:mm:ss" -> ParseFormatMeta('-', isTimestamp = true,
"yyyy-MM-dd HH:mm:ss" -> ParseFormatMeta(Option('-'), isTimestamp = true,
raw"\A\d{4}-\d{2}-\d{2}[ T]\d{2}:\d{2}:\d{2}\Z"),
"MM-dd" -> ParseFormatMeta('-', isTimestamp = false,
"MM-dd" -> ParseFormatMeta(Option('-'), isTimestamp = false,
raw"\A\d{2}-\d{2}\Z"),
"MM/dd" -> ParseFormatMeta('/', isTimestamp = false,
"MM/dd" -> ParseFormatMeta(Option('/'), isTimestamp = false,
raw"\A\d{2}/\d{2}\Z"),
"dd-MM" -> ParseFormatMeta('-', isTimestamp = false,
"dd-MM" -> ParseFormatMeta(Option('-'), isTimestamp = false,
raw"\A\d{2}-\d{2}\Z"),
"dd/MM" -> ParseFormatMeta('/', isTimestamp = false,
"dd/MM" -> ParseFormatMeta(Option('/'), isTimestamp = false,
raw"\A\d{2}/\d{2}\Z"),
"MM/yyyy" -> ParseFormatMeta('/', isTimestamp = false,
"MM/yyyy" -> ParseFormatMeta(Option('/'), isTimestamp = false,
raw"\A\d{2}/\d{4}\Z"),
"MM-yyyy" -> ParseFormatMeta('-', isTimestamp = false,
"MM-yyyy" -> ParseFormatMeta(Option('-'), isTimestamp = false,
raw"\A\d{2}-\d{4}\Z"),
"MM/dd/yyyy" -> ParseFormatMeta('/', isTimestamp = false,
"MM/dd/yyyy" -> ParseFormatMeta(Option('/'), isTimestamp = false,
raw"\A\d{2}/\d{2}/\d{4}\Z"),
"MM-dd-yyyy" -> ParseFormatMeta('-', isTimestamp = false,
raw"\A\d{2}-\d{2}-\d{4}\Z")
"MM-dd-yyyy" -> ParseFormatMeta(Option('-'), isTimestamp = false,
raw"\A\d{2}-\d{2}-\d{4}\Z"),
"MMyyyy" -> ParseFormatMeta(Option.empty, isTimestamp = false,
raw"\A\d{6}\Z")
)

// We are compatible with Spark for these formats when the timeParserPolicy is LEGACY. It
// is possible that other formats may be supported but these are the only ones that we have
// tests for.
val LEGACY_COMPATIBLE_FORMATS = Map(
"yyyy-MM-dd" -> ParseFormatMeta('-', isTimestamp = false,
"yyyy-MM-dd" -> ParseFormatMeta(Option('-'), isTimestamp = false,
raw"\A\d{4}-\d{1,2}-\d{1,2}(\D|\s|\Z)"),
"yyyy/MM/dd" -> ParseFormatMeta('/', isTimestamp = false,
"yyyy/MM/dd" -> ParseFormatMeta(Option('/'), isTimestamp = false,
raw"\A\d{4}/\d{1,2}/\d{1,2}(\D|\s|\Z)"),
"dd-MM-yyyy" -> ParseFormatMeta('-', isTimestamp = false,
"dd-MM-yyyy" -> ParseFormatMeta(Option('-'), isTimestamp = false,
raw"\A\d{1,2}-\d{1,2}-\d{4}(\D|\s|\Z)"),
"dd/MM/yyyy" -> ParseFormatMeta('/', isTimestamp = false,
"dd/MM/yyyy" -> ParseFormatMeta(Option('/'), isTimestamp = false,
raw"\A\d{1,2}/\d{1,2}/\d{4}(\D|\s|\Z)"),
"yyyy-MM-dd HH:mm:ss" -> ParseFormatMeta('-', isTimestamp = true,
"yyyy-MM-dd HH:mm:ss" -> ParseFormatMeta(Option('-'), isTimestamp = true,
raw"\A\d{4}-\d{1,2}-\d{1,2}[ T]\d{1,2}:\d{1,2}:\d{1,2}(\D|\s|\Z)"),
"yyyy/MM/dd HH:mm:ss" -> ParseFormatMeta('/', isTimestamp = true,
"yyyy/MM/dd HH:mm:ss" -> ParseFormatMeta(Option('/'), isTimestamp = true,
raw"\A\d{4}/\d{1,2}/\d{1,2}[ T]\d{1,2}:\d{1,2}:\d{1,2}(\D|\s|\Z)")
)

Expand Down Expand Up @@ -555,12 +557,12 @@ object GpuToTimestamp extends Arm {
// we support date formats using either `-` or `/` to separate year, month, and day and the
// regex rules are written with '-' so we need to replace '-' with '/' here as necessary
val rulesWithSeparator = format.separator match {
case '/' =>
case Some('/') =>
regexReplaceRules.map {
case RegexReplace(pattern, backref) =>
RegexReplace(pattern.replace('-', '/'), backref.replace('-', '/'))
}
case '-' =>
case Some('-') | Some(_) | None =>
Copy link
Contributor

Choose a reason for hiding this comment

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

It looks like this is an exhaustive check for all other cases so could be simplified:

Suggested change
case Some('-') | Some(_) | None =>
case _ =>

regexReplaceRules
}

Expand Down Expand Up @@ -618,7 +620,7 @@ object GpuToTimestamp extends Arm {

}

case class ParseFormatMeta(separator: Char, isTimestamp: Boolean, validRegex: String)
case class ParseFormatMeta(separator: Option[Char], isTimestamp: Boolean, validRegex: String)

case class RegexReplace(search: String, replace: String)

Expand Down