Skip to content

[fix](planner)support date parameter for date_add and date_sub function #24626

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

[fix](planner)support date parameter for date_add and date_sub function #24626

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
62bb251
[fix](planner)support date parameter for date_add and date_sub function
starocean999 Sep 19, 2023
3f102e1
add function signature for fold constant expr
starocean999 Sep 20, 2023
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
21 changes: 18 additions & 3 deletions fe/fe-core/src/main/java/org/apache/doris/rewrite/FEFunctions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,22 @@ public static IntLiteral dayOfWeek(LiteralExpr date) throws AnalysisException {
return new IntLiteral(t + 1);
}

@FEFunction(name = "date_add", argTypes = { "DATETIME", "INT" }, returnType = "DATETIME")
@FEFunctionList({
@FEFunction(name = "date_add", argTypes = { "DATETIME", "INT" }, returnType = "DATETIME"),
@FEFunction(name = "date_add", argTypes = { "DATE", "INT" }, returnType = "DATE"),
@FEFunction(name = "date_add", argTypes = { "DATETIMEV2", "INT" }, returnType = "DATETIMEV2"),
@FEFunction(name = "date_add", argTypes = { "DATEV2", "INT" }, returnType = "DATEV2")
})
public static DateLiteral dateAdd(LiteralExpr date, LiteralExpr day) throws AnalysisException {
return daysAdd(date, day);
}

@FEFunction(name = "adddate", argTypes = { "DATETIME", "INT" }, returnType = "DATETIME")
@FEFunctionList({
@FEFunction(name = "adddate", argTypes = { "DATETIME", "INT" }, returnType = "DATETIME"),
@FEFunction(name = "adddate", argTypes = { "DATE", "INT" }, returnType = "DATE"),
@FEFunction(name = "adddate", argTypes = { "DATETIMEV2", "INT" }, returnType = "DATETIMEV2"),
@FEFunction(name = "adddate", argTypes = { "DATEV2", "INT" }, returnType = "DATEV2")
})
public static DateLiteral addDate(LiteralExpr date, LiteralExpr day) throws AnalysisException {
return daysAdd(date, day);
}
Expand Down Expand Up @@ -245,7 +255,12 @@ public static DateLiteral makeDate(LiteralExpr date) throws AnalysisException {
return (DateLiteral) date;
}

@FEFunction(name = "date_sub", argTypes = { "DATETIME", "INT" }, returnType = "DATETIME")
@FEFunctionList({
@FEFunction(name = "date_sub", argTypes = { "DATETIME", "INT" }, returnType = "DATETIME"),
@FEFunction(name = "date_sub", argTypes = { "DATE", "INT" }, returnType = "DATE"),
@FEFunction(name = "date_sub", argTypes = { "DATETIMEV2", "INT" }, returnType = "DATETIMEV2"),
@FEFunction(name = "date_sub", argTypes = { "DATEV2", "INT" }, returnType = "DATEV2")
})
public static DateLiteral dateSub(LiteralExpr date, LiteralExpr day) throws AnalysisException {
return dateAdd(date, new IntLiteral(-(int) day.getLongValue()));
}
Expand Down
8 changes: 8 additions & 0 deletions gensrc/script/doris_builtins_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,6 +755,14 @@
'_ZN5doris18TimestampFunctions9weeks_subEPN9doris_udf'
'15FunctionContextERKNS1_11DateTimeValERKNS1_6IntValE',
'', '', 'vec', 'ALWAYS_NULLABLE'],
[['days_add', 'date_add', 'adddate'], 'DATE', ['DATE', 'INT'],
'_ZN5doris18TimestampFunctions8days_addEPN9doris_udf'
'15FunctionContextERKNS1_11DateTimeV2ValERKNS1_6IntValE',
'', '', 'vec', ''],
[['days_sub', 'date_sub', 'subdate'], 'DATE', ['DATE', 'INT'],
'_ZN5doris18TimestampFunctions8days_subEPN9doris_udf'
'15FunctionContextERKNS1_11DateTimeV2ValERKNS1_6IntValE',
'', '', 'vec', ''],
[['days_add', 'date_add', 'adddate'], 'DATETIME', ['DATETIME', 'INT'],
'_ZN5doris18TimestampFunctions8days_addEPN9doris_udf'
'15FunctionContextERKNS1_11DateTimeValERKNS1_6IntValE',
Expand Down