Skip to content

[SPARK-8186][SPARK-8187][SPARK-8194][SPARK-8198][SPARK-9133] [SPARK-9290] [SQL] functions: date_add, date_sub, add_months, months_between, time-interval calculation #7754

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

[SPARK-8186][SPARK-8187][SPARK-8194][SPARK-8198][SPARK-9133] [SPARK-9290] [SQL] functions: date_add, date_sub, add_months, months_between, time-interval calculation #7754

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c506661
function date_add , date_sub
adrian-wang Jul 22, 2015
1a68e03
poc of time interval calculation
adrian-wang Jul 22, 2015
87c4b77
function add_months, months_between and some fixes
adrian-wang Jul 24, 2015
42df486
fix style
adrian-wang Jul 24, 2015
e8a639a
fix
adrian-wang Jul 24, 2015
522e91a
fix
adrian-wang Jul 27, 2015
01943d0
Merge branch 'master' into date_add
Jul 29, 2015
e47ff2c
add python api, fix date functions
Jul 29, 2015
bd18cd4
Merge branch 'master' of github.com:apache/spark into date_add
Jul 29, 2015
6224ce4
fix conclict
Jul 29, 2015
9e8e085
Merge branch 'master' of github.com:apache/spark into date_add
Jul 30, 2015
e8c633a
Merge branch 'master' of github.com:apache/spark into date_add
Jul 30, 2015
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
fix style
  • Loading branch information
@adrian-wang
adrian-wang committed Jul 24, 2015
commit 42df486c0b155ac2ec5dce8bfb45a841f3eef778
1 change: 0 additions & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/DateTimeUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,6 @@ object DateTimeUtils {
(months1 - months2).toDouble
} else {
val timesBetween = (timeInDay1 - timeInDay2).toDouble / (MILLIS_PER_DAY * 1000)
println(timesBetween, dayInMonth1, dayInMonth2)
(microOffset1 - microOffset2) / (31 * MILLIS_PER_DAY * 1000L).toDouble + (
months1 - months2).toDouble + (dayInMonth1 - dayInMonth2 + timesBetween) / 31.0
}
Expand Down
12 changes: 8 additions & 4 deletions sql/core/src/test/scala/org/apache/spark/sql/DateFunctionsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,10 +258,12 @@ class DateFunctionsSuite extends QueryTest {
val df = Seq((1, t1, d1), (3, t2, d2)).toDF("n", "t", "d")
checkAnswer(
df.select(time_add(col("d"), lit(i))),
Seq(Row(Timestamp.valueOf("2015-09-30 00:00:02")), Row(Timestamp.valueOf("2016-02-29 00:00:02"))))
Seq(Row(Timestamp.valueOf("2015-09-30 00:00:02")),
Row(Timestamp.valueOf("2016-02-29 00:00:02"))))
checkAnswer(
df.select(time_add(col("t"), lit(i))),
Seq(Row(Timestamp.valueOf("2015-10-01 00:00:01")), Row(Timestamp.valueOf("2016-02-29 00:00:02"))))
Seq(Row(Timestamp.valueOf("2015-10-01 00:00:01")),
Row(Timestamp.valueOf("2016-02-29 00:00:02"))))
checkAnswer(
df.select(time_add(col("d"), lit(null))).limit(1), Row(null))
checkAnswer(
Expand All @@ -277,10 +279,12 @@ class DateFunctionsSuite extends QueryTest {
val df = Seq((1, t1, d1), (3, t2, d2)).toDF("n", "t", "d")
checkAnswer(
df.select(time_sub(col("d"), lit(i))),
Seq(Row(Timestamp.valueOf("2015-07-29 23:59:58")), Row(Timestamp.valueOf("2015-12-28 23:59:58"))))
Seq(Row(Timestamp.valueOf("2015-07-29 23:59:58")),
Row(Timestamp.valueOf("2015-12-28 23:59:58"))))
checkAnswer(
df.select(time_sub(col("t"), lit(i))),
Seq(Row(Timestamp.valueOf("2015-07-31 23:59:59")), Row(Timestamp.valueOf("2015-12-29 00:00:00"))))
Seq(Row(Timestamp.valueOf("2015-07-31 23:59:59")),
Row(Timestamp.valueOf("2015-12-29 00:00:00"))))
checkAnswer(
df.select(time_sub(col("d"), lit(null))).limit(1), Row(null))
checkAnswer(
Expand Down