Skip to content

[SPARK-29364][SQL] Return an interval from date subtract according to SQL standard #26112

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

[SPARK-29364][SQL] Return an interval from date subtract according to SQL standard #26112

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
18bc09b
Add SubtractDates
MaxGekk Oct 14, 2019
141d3da
Add tests for SubtractDates
MaxGekk Oct 14, 2019
dc37bc7
Use SubtractDates for dates subtract
MaxGekk Oct 14, 2019
e82f027
Update the SQL migration guide
MaxGekk Oct 14, 2019
e74f81b
Regen date.sql.out
MaxGekk Oct 14, 2019
4a8173b
Regen datetime.sql.out
MaxGekk Oct 14, 2019
27de6b8
Add config spark.sql.legacy.datesSubtraction.enabled
MaxGekk Oct 14, 2019
fbd2723
TimestampDiff -> SubtractTimestamps
MaxGekk Oct 14, 2019
199adff
Update config description regarding datediff
MaxGekk Oct 14, 2019
8b49c9b
Regen datetime.sql.out
MaxGekk Oct 15, 2019
85f17f7
Revert "Update config description regarding datediff"
MaxGekk Oct 15, 2019
228673d
Revert "Add config spark.sql.legacy.datesSubtraction.enabled"
MaxGekk Oct 15, 2019
f232b64
Revert "Update the SQL migration guide"
MaxGekk Oct 15, 2019
c6ec211
Use DateDiff in the PostgreSQL dialect
MaxGekk Oct 16, 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
Prev Previous commit
Next Next commit
Add tests for SubtractDates
  • Loading branch information
@MaxGekk
MaxGekk committed Oct 14, 2019
commit 141d3dad11e2573f77939b236424e365717fc554
22 changes: 21 additions & 1 deletion ...alyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/DateExpressionsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package org.apache.spark.sql.catalyst.expressions

import java.sql.{Date, Timestamp}
import java.text.SimpleDateFormat
import java.time.{Instant, LocalDateTime, ZoneId, ZoneOffset}
import java.time.{Instant, LocalDate, LocalDateTime, ZoneId, ZoneOffset}
import java.util.{Calendar, Locale, TimeZone}
import java.util.concurrent.TimeUnit
import java.util.concurrent.TimeUnit._
Expand Down Expand Up @@ -1087,4 +1087,24 @@ class DateExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
CalendarInterval.fromString("interval 521722 weeks 4 days " +
"23 hours 59 minutes 59 seconds 999 milliseconds 999 microseconds"))
}

test("subtract dates") {
val end = LocalDate.of(2019, 10, 5)
checkEvaluation(SubtractDates(Literal(end), Literal(end)),
new CalendarInterval(0, 0))
checkEvaluation(SubtractDates(Literal(end.plusDays(1)), Literal(end)),
CalendarInterval.fromString("interval 1 days"))
checkEvaluation(SubtractDates(Literal(end.minusDays(1)), Literal(end)),
CalendarInterval.fromString("interval -1 days"))
val epochDate = Literal(LocalDate.ofEpochDay(0))
checkEvaluation(SubtractDates(Literal(end), epochDate),
CalendarInterval.fromString("interval 49 years 9 months 4 days"))
checkEvaluation(SubtractDates(epochDate, Literal(end)),
CalendarInterval.fromString("interval -49 years -9 months -4 days"))
checkEvaluation(
SubtractDates(
Literal(LocalDate.of(10000, 1, 1)),
Literal(LocalDate.of(1, 1, 1))),
CalendarInterval.fromString("interval 9999 years"))
}
}