This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new f1f2c2c1c42 [fix](Nereids) time extract function constant folding core
(#26292) (#26699)
f1f2c2c1c42 is described below
commit f1f2c2c1c4293d402c83277d5fe29141d52b38d2
Author: morrySnow <[email protected]>
AuthorDate: Thu Nov 9 23:39:09 2023 +0800
[fix](Nereids) time extract function constant folding core (#26292) (#26699)
pick from master
PR: #26292
commit id: 74fd5da42084322226e62363bb645eb40dcb4c2b
some time extract function changed return type in the previous PR #18369
but it is not change FE constant folding function signature.
This is let them have same signature to avoid BE core.
---
.../executable/DateTimeExtractAndTransform.java | 138 +++++++++++----------
1 file changed, 70 insertions(+), 68 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/executable/DateTimeExtractAndTransform.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/executable/DateTimeExtractAndTransform.java
index 4c7f80ab6c9..9b66b967ef8 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/executable/DateTimeExtractAndTransform.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/executable/DateTimeExtractAndTransform.java
@@ -25,6 +25,8 @@ import
org.apache.doris.nereids.trees.expressions.literal.DateTimeLiteral;
import org.apache.doris.nereids.trees.expressions.literal.DateTimeV2Literal;
import org.apache.doris.nereids.trees.expressions.literal.DateV2Literal;
import org.apache.doris.nereids.trees.expressions.literal.IntegerLiteral;
+import org.apache.doris.nereids.trees.expressions.literal.SmallIntLiteral;
+import org.apache.doris.nereids.trees.expressions.literal.TinyIntLiteral;
import org.apache.doris.nereids.trees.expressions.literal.VarcharLiteral;
import org.apache.doris.nereids.util.DateUtils;
@@ -52,132 +54,132 @@ public class DateTimeExtractAndTransform {
/**
* Executable datetime extract year
*/
- @ExecFunction(name = "year", argTypes = {"DATE"}, returnType = "INT")
+ @ExecFunction(name = "year", argTypes = {"DATE"}, returnType = "SMALLINT")
public static Expression year(DateLiteral date) {
- return new IntegerLiteral(((int) date.getYear()));
+ return new SmallIntLiteral(((short) date.getYear()));
}
- @ExecFunction(name = "year", argTypes = {"DATETIME"}, returnType = "INT")
+ @ExecFunction(name = "year", argTypes = {"DATETIME"}, returnType =
"SMALLINT")
public static Expression year(DateTimeLiteral date) {
- return new IntegerLiteral(((int) date.getYear()));
+ return new SmallIntLiteral(((short) date.getYear()));
}
- @ExecFunction(name = "year", argTypes = {"DATEV2"}, returnType = "INT")
+ @ExecFunction(name = "year", argTypes = {"DATEV2"}, returnType =
"SMALLINT")
public static Expression year(DateV2Literal date) {
- return new IntegerLiteral(((int) date.getYear()));
+ return new SmallIntLiteral(((short) date.getYear()));
}
- @ExecFunction(name = "year", argTypes = {"DATETIMEV2"}, returnType = "INT")
+ @ExecFunction(name = "year", argTypes = {"DATETIMEV2"}, returnType =
"SMALLINT")
public static Expression year(DateTimeV2Literal date) {
- return new IntegerLiteral(((int) date.getYear()));
+ return new SmallIntLiteral(((short) date.getYear()));
}
/**
* Executable datetime extract quarter
*/
- @ExecFunction(name = "quarter", argTypes = {"DATE"}, returnType = "INT")
+ @ExecFunction(name = "quarter", argTypes = {"DATE"}, returnType =
"TINYINT")
public static Expression quarter(DateLiteral date) {
- return new IntegerLiteral(((int) date.getMonth() - 1) / 3 + 1);
+ return new TinyIntLiteral((byte) (((byte) date.getMonth() - 1) / 3 +
1));
}
- @ExecFunction(name = "quarter", argTypes = {"DATETIME"}, returnType =
"INT")
+ @ExecFunction(name = "quarter", argTypes = {"DATETIME"}, returnType =
"TINYINT")
public static Expression quarter(DateTimeLiteral date) {
- return new IntegerLiteral(((int) date.getMonth() - 1) / 3 + 1);
+ return new TinyIntLiteral((byte) ((date.getMonth() - 1) / 3 + 1));
}
- @ExecFunction(name = "quarter", argTypes = {"DATEV2"}, returnType = "INT")
+ @ExecFunction(name = "quarter", argTypes = {"DATEV2"}, returnType =
"TINYINT")
public static Expression quarter(DateV2Literal date) {
- return new IntegerLiteral(((int) date.getMonth() - 1) / 3 + 1);
+ return new TinyIntLiteral((byte) ((date.getMonth() - 1) / 3 + 1));
}
- @ExecFunction(name = "quarter", argTypes = {"DATETIMEV2"}, returnType =
"INT")
+ @ExecFunction(name = "quarter", argTypes = {"DATETIMEV2"}, returnType =
"TINYINT")
public static Expression quarter(DateTimeV2Literal date) {
- return new IntegerLiteral(((int) date.getMonth() - 1) / 3 + 1);
+ return new TinyIntLiteral((byte) ((date.getMonth() - 1) / 3 + 1));
}
/**
* Executable datetime extract month
*/
- @ExecFunction(name = "month", argTypes = {"DATE"}, returnType = "INT")
+ @ExecFunction(name = "month", argTypes = {"DATE"}, returnType = "TINYINT")
public static Expression month(DateLiteral date) {
- return new IntegerLiteral(((int) date.getMonth()));
+ return new TinyIntLiteral((byte) date.getMonth());
}
- @ExecFunction(name = "month", argTypes = {"DATETIME"}, returnType = "INT")
+ @ExecFunction(name = "month", argTypes = {"DATETIME"}, returnType =
"TINYINT")
public static Expression month(DateTimeLiteral date) {
- return new IntegerLiteral(((int) date.getMonth()));
+ return new TinyIntLiteral((byte) date.getMonth());
}
- @ExecFunction(name = "month", argTypes = {"DATEV2"}, returnType = "INT")
+ @ExecFunction(name = "month", argTypes = {"DATEV2"}, returnType =
"TINYINT")
public static Expression month(DateV2Literal date) {
- return new IntegerLiteral(((int) date.getMonth()));
+ return new TinyIntLiteral((byte) date.getMonth());
}
- @ExecFunction(name = "month", argTypes = {"DATETIMEV2"}, returnType =
"INT")
+ @ExecFunction(name = "month", argTypes = {"DATETIMEV2"}, returnType =
"TINYINT")
public static Expression month(DateTimeV2Literal date) {
- return new IntegerLiteral(((int) date.getMonth()));
+ return new TinyIntLiteral((byte) date.getMonth());
}
/**
* Executable datetime extract day
*/
- @ExecFunction(name = "day", argTypes = {"DATE"}, returnType = "INT")
+ @ExecFunction(name = "day", argTypes = {"DATE"}, returnType = "TINYINT")
public static Expression day(DateLiteral date) {
- return new IntegerLiteral(((int) date.getDay()));
+ return new TinyIntLiteral((byte) date.getDay());
}
- @ExecFunction(name = "day", argTypes = {"DATETIME"}, returnType = "INT")
+ @ExecFunction(name = "day", argTypes = {"DATETIME"}, returnType =
"TINYINT")
public static Expression day(DateTimeLiteral date) {
- return new IntegerLiteral(((int) date.getDay()));
+ return new TinyIntLiteral((byte) date.getDay());
}
- @ExecFunction(name = "day", argTypes = {"DATEV2"}, returnType = "INT")
+ @ExecFunction(name = "day", argTypes = {"DATEV2"}, returnType = "TINYINT")
public static Expression day(DateV2Literal date) {
- return new IntegerLiteral(((int) date.getDay()));
+ return new TinyIntLiteral((byte) date.getDay());
}
- @ExecFunction(name = "day", argTypes = {"DATETIMEV2"}, returnType = "INT")
+ @ExecFunction(name = "day", argTypes = {"DATETIMEV2"}, returnType =
"TINYINT")
public static Expression day(DateTimeV2Literal date) {
- return new IntegerLiteral(((int) date.getDay()));
+ return new TinyIntLiteral((byte) date.getDay());
}
/**
* Executable datetime extract hour
*/
- @ExecFunction(name = "hour", argTypes = {"DATETIME"}, returnType = "INT")
+ @ExecFunction(name = "hour", argTypes = {"DATETIME"}, returnType =
"TINYINT")
public static Expression hour(DateTimeLiteral date) {
- return new IntegerLiteral(((int) date.getHour()));
+ return new TinyIntLiteral(((byte) date.getHour()));
}
- @ExecFunction(name = "hour", argTypes = {"DATETIMEV2"}, returnType = "INT")
+ @ExecFunction(name = "hour", argTypes = {"DATETIMEV2"}, returnType =
"TINYINT")
public static Expression hour(DateTimeV2Literal date) {
- return new IntegerLiteral(((int) date.getHour()));
+ return new TinyIntLiteral(((byte) date.getHour()));
}
/**
* Executable datetime extract hour
*/
- @ExecFunction(name = "minute", argTypes = {"DATETIME"}, returnType = "INT")
+ @ExecFunction(name = "minute", argTypes = {"DATETIME"}, returnType =
"TINYINT")
public static Expression minute(DateTimeLiteral date) {
- return new IntegerLiteral(((int) date.getMinute()));
+ return new TinyIntLiteral(((byte) date.getMinute()));
}
- @ExecFunction(name = "minute", argTypes = {"DATETIMEV2"}, returnType =
"INT")
+ @ExecFunction(name = "minute", argTypes = {"DATETIMEV2"}, returnType =
"TINYINT")
public static Expression minute(DateTimeV2Literal date) {
- return new IntegerLiteral(((int) date.getMinute()));
+ return new TinyIntLiteral(((byte) date.getMinute()));
}
/**
* Executable datetime extract second
*/
- @ExecFunction(name = "second", argTypes = {"DATETIME"}, returnType = "INT")
+ @ExecFunction(name = "second", argTypes = {"DATETIME"}, returnType =
"TINYINT")
public static Expression second(DateTimeLiteral date) {
- return new IntegerLiteral(((int) date.getSecond()));
+ return new TinyIntLiteral(((byte) date.getSecond()));
}
- @ExecFunction(name = "second", argTypes = {"DATETIMEV2"}, returnType =
"INT")
+ @ExecFunction(name = "second", argTypes = {"DATETIMEV2"}, returnType =
"TINYINT")
public static Expression second(DateTimeV2Literal date) {
- return new IntegerLiteral(((int) date.getSecond()));
+ return new TinyIntLiteral(((byte) date.getSecond()));
}
/**
@@ -191,70 +193,70 @@ public class DateTimeExtractAndTransform {
/**
* Executable datetime extract dayofyear
*/
- @ExecFunction(name = "dayofyear", argTypes = {"DATE"}, returnType = "INT")
+ @ExecFunction(name = "dayofyear", argTypes = {"DATE"}, returnType =
"SMALLINT")
public static Expression dayOfYear(DateLiteral date) {
- return new IntegerLiteral(date.toJavaDateType().getDayOfYear());
+ return new SmallIntLiteral((short)
date.toJavaDateType().getDayOfYear());
}
- @ExecFunction(name = "dayofyear", argTypes = {"DATETIME"}, returnType =
"INT")
+ @ExecFunction(name = "dayofyear", argTypes = {"DATETIME"}, returnType =
"SMALLINT")
public static Expression dayOfYear(DateTimeLiteral date) {
- return new IntegerLiteral(date.toJavaDateType().getDayOfYear());
+ return new SmallIntLiteral((short)
date.toJavaDateType().getDayOfYear());
}
- @ExecFunction(name = "dayofyear", argTypes = {"DATEV2"}, returnType =
"INT")
+ @ExecFunction(name = "dayofyear", argTypes = {"DATEV2"}, returnType =
"SMALLINT")
public static Expression dayOfYear(DateV2Literal date) {
- return new IntegerLiteral(date.toJavaDateType().getDayOfYear());
+ return new SmallIntLiteral((short)
date.toJavaDateType().getDayOfYear());
}
- @ExecFunction(name = "dayofyear", argTypes = {"DATETIMEV2"}, returnType =
"INT")
+ @ExecFunction(name = "dayofyear", argTypes = {"DATETIMEV2"}, returnType =
"SMALLINT")
public static Expression dayOfYear(DateTimeV2Literal date) {
- return new IntegerLiteral(date.toJavaDateType().getDayOfYear());
+ return new SmallIntLiteral((short)
date.toJavaDateType().getDayOfYear());
}
/**
* Executable datetime extract dayofmonth
*/
- @ExecFunction(name = "dayofmonth", argTypes = {"DATE"}, returnType = "INT")
+ @ExecFunction(name = "dayofmonth", argTypes = {"DATE"}, returnType =
"TINYINT")
public static Expression dayOfMonth(DateLiteral date) {
- return new IntegerLiteral(date.toJavaDateType().getDayOfMonth());
+ return new TinyIntLiteral((byte)
date.toJavaDateType().getDayOfMonth());
}
- @ExecFunction(name = "dayofmonth", argTypes = {"DATETIME"}, returnType =
"INT")
+ @ExecFunction(name = "dayofmonth", argTypes = {"DATETIME"}, returnType =
"TINYINT")
public static Expression dayOfMonth(DateTimeLiteral date) {
- return new IntegerLiteral(date.toJavaDateType().getDayOfMonth());
+ return new TinyIntLiteral((byte)
date.toJavaDateType().getDayOfMonth());
}
- @ExecFunction(name = "dayofmonth", argTypes = {"DATEV2"}, returnType =
"INT")
+ @ExecFunction(name = "dayofmonth", argTypes = {"DATEV2"}, returnType =
"TINYINT")
public static Expression dayOfMonth(DateV2Literal date) {
- return new IntegerLiteral(date.toJavaDateType().getDayOfMonth());
+ return new TinyIntLiteral((byte)
date.toJavaDateType().getDayOfMonth());
}
- @ExecFunction(name = "dayofmonth", argTypes = {"DATETIMEV2"}, returnType =
"INT")
+ @ExecFunction(name = "dayofmonth", argTypes = {"DATETIMEV2"}, returnType =
"TINYINT")
public static Expression dayOfMonth(DateTimeV2Literal date) {
- return new IntegerLiteral(date.toJavaDateType().getDayOfMonth());
+ return new TinyIntLiteral((byte)
date.toJavaDateType().getDayOfMonth());
}
/**
* Executable datetime extract dayofweek
*/
- @ExecFunction(name = "dayofweek", argTypes = {"DATE"}, returnType = "INT")
+ @ExecFunction(name = "dayofweek", argTypes = {"DATE"}, returnType =
"TINYINT")
public static Expression dayOfWeek(DateLiteral date) {
- return new
IntegerLiteral(date.toJavaDateType().getDayOfWeek().getValue() % 7 + 1);
+ return new TinyIntLiteral((byte)
(date.toJavaDateType().getDayOfWeek().getValue() % 7 + 1));
}
- @ExecFunction(name = "dayofweek", argTypes = {"DATETIME"}, returnType =
"INT")
+ @ExecFunction(name = "dayofweek", argTypes = {"DATETIME"}, returnType =
"TINYINT")
public static Expression dayOfWeek(DateTimeLiteral date) {
- return new
IntegerLiteral(date.toJavaDateType().getDayOfWeek().getValue() % 7 + 1);
+ return new TinyIntLiteral((byte)
(date.toJavaDateType().getDayOfWeek().getValue() % 7 + 1));
}
- @ExecFunction(name = "dayofweek", argTypes = {"DATEV2"}, returnType =
"INT")
+ @ExecFunction(name = "dayofweek", argTypes = {"DATEV2"}, returnType =
"TINYINT")
public static Expression dayOfWeek(DateV2Literal date) {
- return new
IntegerLiteral(date.toJavaDateType().getDayOfWeek().getValue() % 7 + 1);
+ return new TinyIntLiteral((byte)
(date.toJavaDateType().getDayOfWeek().getValue() % 7 + 1));
}
- @ExecFunction(name = "dayofweek", argTypes = {"DATETIMEV2"}, returnType =
"INT")
+ @ExecFunction(name = "dayofweek", argTypes = {"DATETIMEV2"}, returnType =
"TINYINT")
public static Expression dayOfWeek(DateTimeV2Literal date) {
- return new
IntegerLiteral(date.toJavaDateType().getDayOfWeek().getValue() % 7 + 1);
+ return new TinyIntLiteral((byte)
(date.toJavaDateType().getDayOfWeek().getValue() % 7 + 1));
}
private static int distanceToFirstDayOfWeek(LocalDateTime dateTime) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
