Skip to content

[SPARK-27638][SQL]: Cast string to date/timestamp in binary comparisons with dates/timestamps #24567

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
pengbo wants to merge 7 commits into from
Closed

[SPARK-27638][SQL]: Cast string to date/timestamp in binary comparisons with dates/timestamps #24567

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e24514e
SPARK-27638: date format yyyy-M-dd string comparison not handled prop…
May 9, 2019
41a03dd
change relative comments
May 10, 2019
19ec071
Merge branch 'master' of https://github.com/apache/spark into SPARK-2…
May 10, 2019
ac82eb2
cast to timestamp when comparting string and timestamp & enrich test…
May 12, 2019
34b00e9
add SQLConf legacy option to fallback to the old string vs date/times…
May 13, 2019
e63367c
Merge branch 'master' of https://github.com/apache/spark into SPARK-2…
May 13, 2019
c3e80f7
Modify migration guide & rename SQLConf option
May 13, 2019
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
15 changes: 8 additions & 7 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/TypeCoercion.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,14 @@ object TypeCoercion {
*/
private def findCommonTypeForBinaryComparison(
dt1: DataType, dt2: DataType, conf: SQLConf): Option[DataType] = (dt1, dt2) match {
// We should cast all relative timestamp/date/string comparison into string comparisons
// This behaves as a user would expect because timestamp strings sort lexicographically.
// i.e. TimeStamp(2013-01-01 00:00 ...) < "2014" = true
case (StringType, DateType) => Some(StringType)
case (DateType, StringType) => Some(StringType)
case (StringType, TimestampType) => Some(StringType)
case (TimestampType, StringType) => Some(StringType)
case (StringType, DateType)
=> if (conf.castDateTimestampToString) Some(StringType) else Some(DateType)
case (DateType, StringType)
=> if (conf.castDateTimestampToString) Some(StringType) else Some(DateType)
case (StringType, TimestampType)
=> if (conf.castDateTimestampToString) Some(StringType) else Some(TimestampType)
case (TimestampType, StringType)
=> if (conf.castDateTimestampToString) Some(StringType) else Some(TimestampType)
case (StringType, NullType) => Some(StringType)
case (NullType, StringType) => Some(StringType)

Expand Down
9 changes: 9 additions & 0 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1760,6 +1760,13 @@ object SQLConf {
.internal()
.intConf
.createWithDefault(Int.MaxValue)

val LEGACY_CAST_DATE_TIMESTAMP_TO_STRING =
buildConf("spark.sql.legacy.binaryComparison.castDateTimestampToString")

@cloud-fan cloud-fan May 13, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

spark.sql.legacy.typeCoercion.datetimeToString

.doc("If it is set to true, date/timestamp will cast to string in binary comparisons " +

@cloud-fan cloud-fan May 13, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

can we also add a migration guide for this behavior change and mention this config?

"with String")
.booleanConf
.createWithDefault(false)
}

/**
Expand Down Expand Up @@ -2211,6 +2218,8 @@ class SQLConf extends Serializable with Logging {
def setCommandRejectsSparkCoreConfs: Boolean =
getConf(SQLConf.SET_COMMAND_REJECTS_SPARK_CORE_CONFS)

def castDateTimestampToString: Boolean = getConf(SQLConf.LEGACY_CAST_DATE_TIMESTAMP_TO_STRING)

/** ********************** SQLConf functionality methods ************ */

/** Set Spark SQL configuration properties. */
Expand Down
12 changes: 6 additions & 6 deletions sql/core/src/test/resources/sql-tests/results/predicate-functions.sql.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ false
-- !query 10
select to_date('2009-07-30 04:17:52') > '2009-07-30 04:17:52'
-- !query 10 schema
struct<(CAST(to_date('2009-07-30 04:17:52') AS STRING) > 2009-07-30 04:17:52):boolean>
struct<(to_date('2009-07-30 04:17:52') > CAST(2009-07-30 04:17:52 AS DATE)):boolean>
-- !query 10 output
false

Expand Down Expand Up @@ -141,9 +141,9 @@ true
-- !query 17
select to_date('2009-07-30 04:17:52') >= '2009-07-30 04:17:52'
-- !query 17 schema
struct<(CAST(to_date('2009-07-30 04:17:52') AS STRING) >= 2009-07-30 04:17:52):boolean>
struct<(to_date('2009-07-30 04:17:52') >= CAST(2009-07-30 04:17:52 AS DATE)):boolean>
-- !query 17 output
false
true


-- !query 18
Expand Down Expand Up @@ -197,9 +197,9 @@ false
-- !query 24
select to_date('2009-07-30 04:17:52') < '2009-07-30 04:17:52'
-- !query 24 schema
struct<(CAST(to_date('2009-07-30 04:17:52') AS STRING) < 2009-07-30 04:17:52):boolean>
struct<(to_date('2009-07-30 04:17:52') < CAST(2009-07-30 04:17:52 AS DATE)):boolean>
-- !query 24 output
true
false


-- !query 25
Expand Down Expand Up @@ -253,7 +253,7 @@ true
-- !query 31
select to_date('2009-07-30 04:17:52') <= '2009-07-30 04:17:52'
-- !query 31 schema
struct<(CAST(to_date('2009-07-30 04:17:52') AS STRING) <= 2009-07-30 04:17:52):boolean>
struct<(to_date('2009-07-30 04:17:52') <= CAST(2009-07-30 04:17:52 AS DATE)):boolean>
-- !query 31 output
true

Expand Down
Loading