database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](datetime) fix hour 24 on be (#31304)

Browse Source
This commit is contained in:
zhiqiang
2024-02-26 09:42:25 +08:00
committed by yiguolei
parent e48f4f38d0
commit 3451cd6c23
7 changed files with 297 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/DateFunctionRewrite.java
View File

@ -58,8 +58,10 @@ public class DateFunctionRewrite extends AbstractExpressionRewriteRule {
// V2
if (equalTo.left().child(0).getDataType() instanceof DateTimeV2Type
&& equalTo.right() instanceof DateV2Literal) {
DateTimeV2Literal lowerBound = ((DateV2Literal) equalTo.right()).toBeginOfTheDay();
DateTimeV2Literal upperBound = ((DateV2Literal) equalTo.right()).toEndOfTheDay();
DateTimeV2Literal lowerBound = ((DateV2Literal) equalTo.right()).toBeginOfTheDay(
(DateTimeV2Type) equalTo.left().child(0).getDataType());
DateTimeV2Literal upperBound = ((DateV2Literal) equalTo.right()).toEndOfTheDay(
(DateTimeV2Type) equalTo.left().child(0).getDataType());
Expression newLeft = equalTo.left().child(0);
return new And(new GreaterThanEqual(newLeft, lowerBound),
new LessThanEqual(newLeft, upperBound));
@ -142,7 +144,8 @@ public class DateFunctionRewrite extends AbstractExpressionRewriteRule {
// V2
if (lessThanEqual.left().child(0).getDataType() instanceof DateTimeV2Type
&& lessThanEqual.right() instanceof DateV2Literal) {
DateTimeV2Literal newLiteral = ((DateV2Literal) lessThanEqual.right()).toEndOfTheDay();
DateTimeV2Literal newLiteral = ((DateV2Literal) lessThanEqual.right()).toEndOfTheDay(
(DateTimeV2Type) lessThanEqual.left().child(0).getDataType());
return new LessThanEqual(lessThanEqual.left().child(0), newLiteral);
}
}

31
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateV2Literal.java
View File

@ -22,6 +22,7 @@ import org.apache.doris.catalog.Type;
import org.apache.doris.nereids.exceptions.AnalysisException;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
import org.apache.doris.nereids.types.DateTimeV2Type;
import org.apache.doris.nereids.types.DateV2Type;
import org.apache.doris.nereids.util.DateUtils;
import org.apache.doris.nereids.util.StandardDateFormat;
@ -78,18 +79,42 @@ public class DateV2Literal extends DateLiteral {
/**
* 2020-01-01
* @return 2020-01-01 24:00:00
* @return 2020-01-01 00:00:00
*/
public DateTimeV2Literal toBeginOfTheDay() {
return new DateTimeV2Literal(year, month, day, 0, 0, 0);
return toBeginOfTheDay(DateTimeV2Type.SYSTEM_DEFAULT);
}
/**
* 2020-01-01
* @return 2020-01-01 00:00:00
*/
public DateTimeV2Literal toBeginOfTheDay(DateTimeV2Type dateType) {
return new DateTimeV2Literal(dateType, year, month, day, 0, 0, 0, 000000);
}
/**
* 2020-01-01
* @return 2020-01-01 23:59:59
*/
public DateTimeV2Literal toEndOfTheDay() {
return new DateTimeV2Literal(year, month, day, 24, 0, 0);
return toEndOfTheDay(DateTimeV2Type.SYSTEM_DEFAULT);
}
/**
* 2020-01-01
* @return 2020-01-01 23:59:59.9[scale]
*/
public DateTimeV2Literal toEndOfTheDay(DateTimeV2Type dateType) {
long microSecond = 0;
// eg. scale == 4 -> 999900
for (int i = 0; i < 6; ++i) {
microSecond *= 10;
if (i < dateType.getScale()) {
microSecond += 9;
}
}
return new DateTimeV2Literal(dateType, year, month, day, 23, 59, 59, microSecond);
}
/**