Skip to content

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

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
starocean999 merged 4 commits into from
Sep 25, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e291317
fix date type add hours minutes and seconds
LiBinfeng-01 Sep 19, 2024
620244e
add fe ut
LiBinfeng-01 Sep 19, 2024
7dd2bb1
add more fe ut about overflow and underflow
LiBinfeng-01 Sep 23, 2024
df66882
change compareto to assert equals
LiBinfeng-01 Sep 25, 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")
public static Expression hoursAdd(DateLiteral date, IntegerLiteral hour) {
return date.toBeginOfTheDay().plusHours(hour.getValue());
}

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

@ExecFunction(name = "hours_add")
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")
public static Expression minutesAdd(DateLiteral date, IntegerLiteral minute) {
return date.toBeginOfTheDay().plusMinutes(minute.getValue());
}

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

@ExecFunction(name = "minutes_add")
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")
public static Expression secondsAdd(DateLiteral date, IntegerLiteral second) {
return date.toBeginOfTheDay().plusSeconds(second.getValue());
}

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

@ExecFunction(name = "seconds_add")
public static Expression secondsAdd(DateTimeLiteral date, IntegerLiteral second) {
return date.plusSeconds(second.getValue());
Expand Down Expand Up @@ -404,4 +434,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")
public static Expression toDays(DateLiteral date) {
return new IntegerLiteral((int) date.getDay());
}

@ExecFunction(name = "to_days")
public static Expression toDays(DateV2Literal date) {
return new IntegerLiteral((int) date.getDay());
}
}
72 changes: 72 additions & 0 deletions fe/fe-core/src/test/java/org/apache/doris/nereids/rules/expression/FoldConstantTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,11 @@
import org.apache.doris.nereids.trees.expressions.functions.scalar.DateFormat;
import org.apache.doris.nereids.trees.expressions.functions.scalar.DateTrunc;
import org.apache.doris.nereids.trees.expressions.functions.scalar.FromUnixtime;
import org.apache.doris.nereids.trees.expressions.functions.scalar.HoursAdd;
import org.apache.doris.nereids.trees.expressions.functions.scalar.MinutesAdd;
import org.apache.doris.nereids.trees.expressions.functions.scalar.SecondsAdd;
import org.apache.doris.nereids.trees.expressions.functions.scalar.StrToDate;
import org.apache.doris.nereids.trees.expressions.functions.scalar.ToDays;
import org.apache.doris.nereids.trees.expressions.functions.scalar.UnixTimestamp;
import org.apache.doris.nereids.trees.expressions.literal.BigIntLiteral;
import org.apache.doris.nereids.trees.expressions.literal.DateLiteral;
Expand All @@ -49,6 +53,7 @@
import org.apache.doris.nereids.trees.expressions.literal.IntegerLiteral;
import org.apache.doris.nereids.trees.expressions.literal.Interval.TimeUnit;
import org.apache.doris.nereids.trees.expressions.literal.Literal;
import org.apache.doris.nereids.trees.expressions.literal.NullLiteral;
import org.apache.doris.nereids.trees.expressions.literal.StringLiteral;
import org.apache.doris.nereids.trees.expressions.literal.VarcharLiteral;
import org.apache.doris.nereids.trees.plans.RelationId;
Expand Down Expand Up @@ -179,6 +184,73 @@ void testCastFold() {
Assertions.assertEquals(rewritten, expected);
}

@Test
void testFoldDate() {
executor = new ExpressionRuleExecutor(ImmutableList.of(
bottomUp(FoldConstantRuleOnFE.VISITOR_INSTANCE)
));
HoursAdd hoursAdd = new HoursAdd(DateLiteral.fromJavaDateType(LocalDateTime.of(1, 1, 1, 1, 1, 1)),
new IntegerLiteral(1));
Expression rewritten = executor.rewrite(hoursAdd, context);
Assertions.assertEquals(new DateTimeLiteral("0001-01-01 01:00:00"), rewritten);
hoursAdd = new HoursAdd(DateV2Literal.fromJavaDateType(LocalDateTime.of(1, 1, 1, 1, 1, 1)),
new IntegerLiteral(1));
rewritten = executor.rewrite(hoursAdd, context);
Assertions.assertEquals(new DateTimeV2Literal("0001-01-01 01:00:00"), rewritten);
hoursAdd = new HoursAdd(DateV2Literal.fromJavaDateType(LocalDateTime.of(9999, 12, 31, 23, 1, 1)),
new IntegerLiteral(24));
rewritten = executor.rewrite(hoursAdd, context);
Assertions.assertEquals(new NullLiteral(hoursAdd.getDataType()), rewritten);
hoursAdd = new HoursAdd(DateV2Literal.fromJavaDateType(LocalDateTime.of(0, 1, 1, 1, 1, 1)),
new IntegerLiteral(-25));
rewritten = executor.rewrite(hoursAdd, context);
Assertions.assertEquals(new NullLiteral(hoursAdd.getDataType()), rewritten);

MinutesAdd minutesAdd = new MinutesAdd(DateLiteral.fromJavaDateType(LocalDateTime.of(1, 1, 1, 1, 1, 1)),
new IntegerLiteral(1));
rewritten = executor.rewrite(minutesAdd, context);
Assertions.assertEquals(new DateTimeLiteral("0001-01-01 00:01:00"), rewritten);
minutesAdd = new MinutesAdd(DateV2Literal.fromJavaDateType(LocalDateTime.of(1, 1, 1, 1, 1, 1)),
new IntegerLiteral(1));
rewritten = executor.rewrite(minutesAdd, context);
Assertions.assertEquals(new DateTimeV2Literal("0001-01-01 00:01:00"), rewritten);
minutesAdd = new MinutesAdd(DateV2Literal.fromJavaDateType(LocalDateTime.of(9999, 12, 31, 23, 59, 1)),
new IntegerLiteral(1440));
rewritten = executor.rewrite(minutesAdd, context);
Assertions.assertEquals(new NullLiteral(minutesAdd.getDataType()), rewritten);
minutesAdd = new MinutesAdd(DateV2Literal.fromJavaDateType(LocalDateTime.of(0, 1, 1, 0, 1, 1)),
new IntegerLiteral(-2));
rewritten = executor.rewrite(minutesAdd, context);
Copy link
Contributor

@morrySnow morrySnow Sep 24, 2024

Choose a reason for hiding this comment

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

test overflow

Copy link
Contributor Author

@LiBinfeng-01 LiBinfeng-01 Sep 25, 2024

Choose a reason for hiding this comment

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

done

Assertions.assertEquals(new NullLiteral(minutesAdd.getDataType()), rewritten);

SecondsAdd secondsAdd = new SecondsAdd(DateLiteral.fromJavaDateType(LocalDateTime.of(1, 1, 1, 1, 1, 1)),
new IntegerLiteral(1));
rewritten = executor.rewrite(secondsAdd, context);
Assertions.assertEquals(new DateTimeLiteral("0001-01-01 00:00:01"), rewritten);
secondsAdd = new SecondsAdd(DateV2Literal.fromJavaDateType(LocalDateTime.of(1, 1, 1, 1, 1, 1)),
new IntegerLiteral(1));
rewritten = executor.rewrite(secondsAdd, context);
Assertions.assertEquals(new DateTimeV2Literal("0001-01-01 00:00:01"), rewritten);
secondsAdd = new SecondsAdd(DateV2Literal.fromJavaDateType(LocalDateTime.of(9999, 12, 31, 23, 59, 59)),
new IntegerLiteral(86400));
rewritten = executor.rewrite(secondsAdd, context);
Assertions.assertEquals(new NullLiteral(secondsAdd.getDataType()), rewritten);
secondsAdd = new SecondsAdd(DateV2Literal.fromJavaDateType(LocalDateTime.of(0, 1, 1, 0, 1, 1)),
new IntegerLiteral(-61));
rewritten = executor.rewrite(secondsAdd, context);
Assertions.assertEquals(new NullLiteral(secondsAdd.getDataType()), rewritten);

ToDays toDays = new ToDays(DateLiteral.fromJavaDateType(LocalDateTime.of(1, 1, 1, 1, 1, 1)));
rewritten = executor.rewrite(toDays, context);
Assertions.assertEquals(new IntegerLiteral(366), rewritten);
toDays = new ToDays(DateV2Literal.fromJavaDateType(LocalDateTime.of(1, 1, 1, 1, 1, 1)));
rewritten = executor.rewrite(toDays, context);
Assertions.assertEquals(new IntegerLiteral(366), rewritten);
toDays = new ToDays(DateV2Literal.fromJavaDateType(LocalDateTime.of(9999, 12, 31, 1, 1, 1)));
rewritten = executor.rewrite(toDays, context);
Assertions.assertEquals(new IntegerLiteral(3652424), rewritten);
}

@Test
void testFoldString() {
executor = new ExpressionRuleExecutor(ImmutableList.of(
Expand Down
2 changes: 2 additions & 0 deletions regression-test/suites/nereids_p0/expression/fold_constant/fold_constant_by_fe.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,4 +163,6 @@ suite("test_fold_constant_by_fe") {
res = sql """explain select "12" like '%123%'"""
assertTrue(res.contains("like"))

testFoldConst("select DATE_SUB(CURRENT_DATE(), INTERVAL 1 DAY) + INTERVAL 3600 SECOND")

}