Skip to content

[Fix](Nereids) fix date and date time arithmatic (#40745) #41533

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

Merged
morrySnow merged 2 commits into from
Oct 21, 2024
Merged

[Fix](Nereids) fix date and date time arithmatic (#40745) #41533

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b41a134
[Fix](Nereids) fix date and date time arithmatic
LiBinfeng-01 Oct 17, 2024
9f70d0d
fix p0
LiBinfeng-01 Oct 21, 2024
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
40 changes: 40 additions & 0 deletions ...a/org/apache/doris/nereids/trees/expressions/functions/executable/DateTimeArithmetic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,16 @@ public static Expression daysAdd(DateTimeV2Literal date, IntegerLiteral day) {
/**
* datetime arithmetic function hours-add.
*/
@ExecFunction(name = "hours_add", argTypes = {"DATE", "INT"}, returnType = "DATE")
public static Expression hoursAdd(DateLiteral date, IntegerLiteral hour) {
return date.toBeginOfTheDay().plusHours(hour.getValue());
}

@ExecFunction(name = "hours_add", argTypes = {"DATEV2", "INT"}, returnType = "DATEV2")
public static Expression hoursAdd(DateV2Literal date, IntegerLiteral hour) {
return date.toBeginOfTheDay().plusHours(hour.getValue());
}

@ExecFunction(name = "hours_add", argTypes = {"DATETIME", "INT"}, returnType = "DATETIME")
public static Expression hoursAdd(DateTimeLiteral date, IntegerLiteral hour) {
return date.plusHours(hour.getValue());
Expand All @@ -187,6 +197,16 @@ public static Expression hoursAdd(DateTimeV2Literal date, IntegerLiteral hour) {
/**
* datetime arithmetic function minutes-add.
*/
@ExecFunction(name = "minutes_add", argTypes = {"DATE", "INT"}, returnType = "DATE")
public static Expression minutesAdd(DateLiteral date, IntegerLiteral minute) {
return date.toBeginOfTheDay().plusMinutes(minute.getValue());
}

@ExecFunction(name = "minutes_add", argTypes = {"DATEV2", "INT"}, returnType = "DATEV2")
public static Expression minutesAdd(DateV2Literal date, IntegerLiteral minute) {
return date.toBeginOfTheDay().plusMinutes(minute.getValue());
}

@ExecFunction(name = "minutes_add", argTypes = {"DATETIME", "INT"}, returnType = "DATETIME")
public static Expression minutesAdd(DateTimeLiteral date, IntegerLiteral minute) {
return date.plusMinutes(minute.getValue());
Expand All @@ -200,6 +220,16 @@ public static Expression minutesAdd(DateTimeV2Literal date, IntegerLiteral minut
/**
* datetime arithmetic function seconds-add.
*/
@ExecFunction(name = "seconds_add", argTypes = {"DATE", "INT"}, returnType = "DATE")
public static Expression secondsAdd(DateLiteral date, IntegerLiteral second) {
return date.toBeginOfTheDay().plusSeconds(second.getValue());
}

@ExecFunction(name = "seconds_add", argTypes = {"DATEV2", "INT"}, returnType = "DATEV2")
public static Expression secondsAdd(DateV2Literal date, IntegerLiteral second) {
return date.toBeginOfTheDay().plusSeconds(second.getValue());
}

@ExecFunction(name = "seconds_add", argTypes = {"DATETIME", "INT"}, returnType = "DATETIME")
public static Expression secondsAdd(DateTimeLiteral date, IntegerLiteral second) {
return date.plusSeconds(second.getValue());
Expand Down Expand Up @@ -380,4 +410,14 @@ public static Expression dateDiff(DateTimeV2Literal date1, DateTimeV2Literal dat
private static int dateDiff(LocalDateTime date1, LocalDateTime date2) {
return ((int) ChronoUnit.DAYS.between(date2.toLocalDate(), date1.toLocalDate()));
}

@ExecFunction(name = "to_days", argTypes = {"DATE"}, returnType = "INT")
public static Expression toDays(DateLiteral date) {
return new IntegerLiteral((int) date.getDay());
}

@ExecFunction(name = "to_days", argTypes = {"DATEV2"}, returnType = "INT")
public static Expression toDays(DateV2Literal date) {
return new IntegerLiteral((int) date.getDay());
}
}