Skip to content

[SPARK-37219][SQL][FOLLOWUP] Make AS OF syntax more flexible #34621

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

[SPARK-37219][SQL][FOLLOWUP] Make AS OF syntax more flexible #34621

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
397102b
[SPARK-37219][SQL] Make AS OF syntax more flexible
huaxingao Nov 16, 2021
93cafdd
add tests
huaxingao Nov 16, 2021
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/antlr4/org/apache/spark/sql/catalyst/parser/SqlBase.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,8 +600,8 @@ fromClause
;

temporalClause
: ((FOR SYSTEM_VERSION) | VERSION) AS OF version=(INTEGER_VALUE | STRING)
| ((FOR SYSTEM_TIME) | TIMESTAMP) AS OF timestamp=STRING
: FOR? (SYSTEM_VERSION | VERSION) AS OF version=(INTEGER_VALUE | STRING)
| FOR? (SYSTEM_TIME | TIMESTAMP) AS OF timestamp=STRING
;

aggregationClause
Expand Down
50 changes: 50 additions & 0 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/DDLParserSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2453,6 +2453,14 @@ class DDLParserSuite extends AnalysisTest {
new CaseInsensitiveStringMap(properties),
timeTravelSpec = timeTravel)))

comparePlans(
parsePlan("SELECT * FROM a.b.c FOR VERSION AS OF 'Snapshot123456789'"),
Project(Seq(UnresolvedStar(None)),
UnresolvedRelation(
Seq("a", "b", "c"),
new CaseInsensitiveStringMap(properties),
timeTravelSpec = timeTravel)))

timeTravel = TimeTravelSpec.create(None, Some("123456789"))
comparePlans(
parsePlan("SELECT * FROM a.b.c FOR SYSTEM_VERSION AS OF 123456789"),
Expand All @@ -2462,6 +2470,14 @@ class DDLParserSuite extends AnalysisTest {
new CaseInsensitiveStringMap(properties),
timeTravelSpec = timeTravel)))

comparePlans(
parsePlan("SELECT * FROM a.b.c SYSTEM_VERSION AS OF 123456789"),
Project(Seq(UnresolvedStar(None)),
UnresolvedRelation(
Seq("a", "b", "c"),
new CaseInsensitiveStringMap(properties),
timeTravelSpec = timeTravel)))

timeTravel = TimeTravelSpec.create(Some("2019-01-29 00:37:58"), None)
comparePlans(
parsePlan("SELECT * FROM a.b.c TIMESTAMP AS OF '2019-01-29 00:37:58'"),
Expand All @@ -2470,6 +2486,15 @@ class DDLParserSuite extends AnalysisTest {
Seq("a", "b", "c"),
new CaseInsensitiveStringMap(properties),
timeTravelSpec = timeTravel)))

comparePlans(
parsePlan("SELECT * FROM a.b.c FOR TIMESTAMP AS OF '2019-01-29 00:37:58'"),
Project(Seq(UnresolvedStar(None)),
UnresolvedRelation(
Seq("a", "b", "c"),
new CaseInsensitiveStringMap(properties),
timeTravelSpec = timeTravel)))

comparePlans(
parsePlan("SELECT * FROM a.b.c FOR SYSTEM_TIME AS OF '2019-01-29 00:37:58'"),
Project(Seq(UnresolvedStar(None)),
Expand All @@ -2478,6 +2503,14 @@ class DDLParserSuite extends AnalysisTest {
new CaseInsensitiveStringMap(properties),
timeTravelSpec = timeTravel)))

comparePlans(
parsePlan("SELECT * FROM a.b.c SYSTEM_TIME AS OF '2019-01-29 00:37:58'"),
Project(Seq(UnresolvedStar(None)),
UnresolvedRelation(
Seq("a", "b", "c"),
new CaseInsensitiveStringMap(properties),
timeTravelSpec = timeTravel)))

timeTravel = TimeTravelSpec.create(Some("2019-01-29"), None)
comparePlans(
parsePlan("SELECT * FROM a.b.c TIMESTAMP AS OF '2019-01-29'"),
Expand All @@ -2486,6 +2519,15 @@ class DDLParserSuite extends AnalysisTest {
Seq("a", "b", "c"),
new CaseInsensitiveStringMap(properties),
timeTravelSpec = timeTravel)))

comparePlans(
parsePlan("SELECT * FROM a.b.c FOR TIMESTAMP AS OF '2019-01-29'"),
Project(Seq(UnresolvedStar(None)),
UnresolvedRelation(
Seq("a", "b", "c"),
new CaseInsensitiveStringMap(properties),
timeTravelSpec = timeTravel)))

comparePlans(
parsePlan("SELECT * FROM a.b.c FOR SYSTEM_TIME AS OF '2019-01-29'"),
Project(Seq(UnresolvedStar(None)),
Expand All @@ -2494,6 +2536,14 @@ class DDLParserSuite extends AnalysisTest {
new CaseInsensitiveStringMap(properties),
timeTravelSpec = timeTravel)))

comparePlans(
parsePlan("SELECT * FROM a.b.c SYSTEM_TIME AS OF '2019-01-29'"),
Project(Seq(UnresolvedStar(None)),
UnresolvedRelation(
Seq("a", "b", "c"),
new CaseInsensitiveStringMap(properties),
timeTravelSpec = timeTravel)))

val e1 = intercept[DateTimeException] {
parsePlan("SELECT * FROM a.b.c TIMESTAMP AS OF '2019-01-11111'")
}.getMessage
Expand Down
18 changes: 18 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2SQLSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2966,10 +2966,19 @@ class DataSourceV2SQLSuite
=== Array(Row(1), Row(2)))
assert(sql("SELECT * FROM t VERSION AS OF 2345678910").collect
=== Array(Row(3), Row(4)))
assert(sql("SELECT * FROM t FOR VERSION AS OF 'Snapshot123456789'").collect
=== Array(Row(1), Row(2)))
assert(sql("SELECT * FROM t FOR VERSION AS OF 2345678910").collect
=== Array(Row(3), Row(4)))

assert(sql("SELECT * FROM t FOR SYSTEM_VERSION AS OF 'Snapshot123456789'").collect
=== Array(Row(1), Row(2)))
assert(sql("SELECT * FROM t FOR SYSTEM_VERSION AS OF 2345678910").collect
=== Array(Row(3), Row(4)))
assert(sql("SELECT * FROM t SYSTEM_VERSION AS OF 'Snapshot123456789'").collect
=== Array(Row(1), Row(2)))
assert(sql("SELECT * FROM t SYSTEM_VERSION AS OF 2345678910").collect
=== Array(Row(3), Row(4)))
}

val ts1 = DateTimeUtils.stringToTimestampAnsi(
Expand All @@ -2994,10 +3003,19 @@ class DataSourceV2SQLSuite
=== Array(Row(5), Row(6)))
assert(sql("SELECT * FROM t TIMESTAMP AS OF '2021-01-29 00:37:58'").collect
=== Array(Row(7), Row(8)))
assert(sql("SELECT * FROM t FOR TIMESTAMP AS OF '2019-01-29 00:37:58'").collect
=== Array(Row(5), Row(6)))
assert(sql("SELECT * FROM t FOR TIMESTAMP AS OF '2021-01-29 00:37:58'").collect
=== Array(Row(7), Row(8)))

assert(sql("SELECT * FROM t FOR SYSTEM_TIME AS OF '2019-01-29 00:37:58'").collect
=== Array(Row(5), Row(6)))
assert(sql("SELECT * FROM t FOR SYSTEM_TIME AS OF '2021-01-29 00:37:58'").collect
=== Array(Row(7), Row(8)))
assert(sql("SELECT * FROM t SYSTEM_TIME AS OF '2019-01-29 00:37:58'").collect
=== Array(Row(5), Row(6)))
assert(sql("SELECT * FROM t SYSTEM_TIME AS OF '2021-01-29 00:37:58'").collect
=== Array(Row(7), Row(8)))
}
}

Expand Down