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 1 commit
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
4 changes: 2 additions & 2 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 @@ -123,8 +123,8 @@ object TypeCoercion {
// 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

@HyukjinKwon HyukjinKwon May 9, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks we should update this comments too.

@pengbo pengbo May 10, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Done. Thanks for pointing it out

case (StringType, DateType) => Some(StringType)
case (DateType, StringType) => Some(StringType)
case (StringType, DateType) => Some(DateType)
case (DateType, StringType) => Some(DateType)

@HyukjinKwon HyukjinKwon May 9, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Doesn't this mean we always find the common type as date when any arbitrary strings are compared to any dates?

@pengbo pengbo May 10, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes, it there any issue in your opinion?

case (StringType, TimestampType) => Some(StringType)
case (TimestampType, StringType) => Some(StringType)
case (StringType, NullType) => Some(StringType)
Expand Down
14 changes: 14 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3024,6 +3024,20 @@ class SQLQuerySuite extends QueryTest with SharedSQLContext {
sql("reset")
}
}

test("string date comparison") {

@MaxGekk MaxGekk May 12, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Please, add test cases for <=>, =

@pengbo pengbo May 12, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Done

spark.range(1).selectExpr("date '2000-01-01' as d").createOrReplaceTempView("t1")
val result = Date.valueOf("2000-01-01")
checkAnswer(sql("select * from t1 where d >= '2000'"), Row(result))
checkAnswer(sql("select * from t1 where d >= '2000-1'"), Row(result))
checkAnswer(sql("select * from t1 where d >= '2000-1-1'"), Row(result))
checkAnswer(sql("select * from t1 where d >= '2000-1-01'"), Row(result))
checkAnswer(sql("select * from t1 where d >= '2000-01-1'"), Row(result))
checkAnswer(sql("select * from t1 where d >= '2000-01-01'"), Row(result))
checkAnswer(sql("select * from t1 where d > '2000-01-01'"), Nil)
checkAnswer(sql("select * from t1 where '2000' >= d"), Row(result))
checkAnswer(sql("select * from t1 where d > '2000-13'"), Nil)
}
}

case class Foo(bar: Option[String])