From e495dd3bc185eed712fdb047236fc93a41cb4754 Mon Sep 17 00:00:00 2001 From: morrySnow <101034200+morrySnow@users.noreply.github.com> Date: Wed, 22 May 2024 16:22:49 +0800 Subject: [PATCH] [fix](Nereids) DatetimeV2 round floor and round ceiling is wrong (#35153) (#35154) pick from master #35153 1. round floor was incorrectly implemented as round 2. round ceiling not really round because use double type when divide --- .../literal/DateTimeV2Literal.java | 6 ++-- .../SimplifyComparisonPredicateSqlTest.java | 4 +-- .../SimplifyComparisonPredicateTest.java | 2 +- .../literal/DateTimeLiteralTest.java | 33 ++++++++++++++++++- 4 files changed, 38 insertions(+), 7 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateTimeV2Literal.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateTimeV2Literal.java index a9447affdddb15..ed6126fb78122d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateTimeV2Literal.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateTimeV2Literal.java @@ -180,7 +180,7 @@ public DateTimeV2Literal roundCeiling(int newScale) { long newYear = year; if (remain != 0) { newMicroSecond = Double - .valueOf((microSecond + (Math.pow(10, 6 - newScale))) + .valueOf((microSecond + (int) (Math.pow(10, 6 - newScale))) / (int) (Math.pow(10, 6 - newScale)) * (Math.pow(10, 6 - newScale))) .longValue(); } @@ -199,8 +199,8 @@ public DateTimeV2Literal roundCeiling(int newScale) { } public DateTimeV2Literal roundFloor(int newScale) { - // use roundMicroSecond in constructor - return new DateTimeV2Literal(DateTimeV2Type.of(newScale), year, month, day, hour, minute, second, microSecond); + return new DateTimeV2Literal(DateTimeV2Type.of(newScale), year, month, day, hour, minute, second, + microSecond / (int) Math.pow(10, 6 - newScale) * (int) Math.pow(10, 6 - newScale)); } public static Expression fromJavaDateType(LocalDateTime dateTime) { diff --git a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/expression/rules/SimplifyComparisonPredicateSqlTest.java b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/expression/rules/SimplifyComparisonPredicateSqlTest.java index 76666a7d32f7be..f71d934894e601 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/expression/rules/SimplifyComparisonPredicateSqlTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/expression/rules/SimplifyComparisonPredicateSqlTest.java @@ -66,7 +66,7 @@ void testSql() { .rewrite() .matches( logicalFilter() - .when(f -> f.getConjuncts().stream().anyMatch(e -> e.toSql().equals("(a <= '2023-06-16 00:00:00')"))) + .when(f -> f.getConjuncts().stream().anyMatch(e -> e.toSql().equals("(a <= '2023-06-15 23:59:59')"))) .when(f -> f.getConjuncts().stream().anyMatch(e -> e.toSql().equals("(b <= 111.11)"))) ); @@ -82,7 +82,7 @@ void testSql() { .rewrite() .matches( logicalFilter() - .when(f -> f.getConjuncts().stream().anyMatch(e -> e.toSql().equals("(a > '2023-06-16 00:00:00')"))) + .when(f -> f.getConjuncts().stream().anyMatch(e -> e.toSql().equals("(a > '2023-06-15 23:59:59')"))) .when(f -> f.getConjuncts().stream().anyMatch(e -> e.toSql().equals("(b > 111.11)"))) ); diff --git a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/expression/rules/SimplifyComparisonPredicateTest.java b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/expression/rules/SimplifyComparisonPredicateTest.java index 770f6622008551..224fa652386469 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/expression/rules/SimplifyComparisonPredicateTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/expression/rules/SimplifyComparisonPredicateTest.java @@ -120,7 +120,7 @@ void testRound() { Expression rewrittenExpression = executor.rewrite(typeCoercion(expression), context); // right should round to be 2021-01-02 00:00:00.00 - Assertions.assertEquals(new DateTimeV2Literal("2021-01-02 00:00:00"), rewrittenExpression.child(1)); + Assertions.assertEquals(new DateTimeV2Literal("2021-01-01 23:59:59.9"), rewrittenExpression.child(1)); } @Test diff --git a/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/expressions/literal/DateTimeLiteralTest.java b/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/expressions/literal/DateTimeLiteralTest.java index 93039c4ad7fdca..3ff030400e72f7 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/expressions/literal/DateTimeLiteralTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/expressions/literal/DateTimeLiteralTest.java @@ -453,5 +453,36 @@ void testDateTimeV2Scale() { new DateTimeV2Literal(DateTimeV2Type.of(5), "2016-12-31 23:59:59.999999"), new DateTimeV2Literal("2017-01-01 00:00:00.0")); } -} + @Test + void testRoundFloor() { + DateTimeV2Literal literal; + literal = new DateTimeV2Literal(DateTimeV2Type.of(6), 2000, 2, 2, 2, 2, 2, 222222); + Assertions.assertEquals(222222, literal.roundFloor(6).microSecond); + Assertions.assertEquals(222220, literal.roundFloor(5).microSecond); + Assertions.assertEquals(222200, literal.roundFloor(4).microSecond); + Assertions.assertEquals(222000, literal.roundFloor(3).microSecond); + Assertions.assertEquals(220000, literal.roundFloor(2).microSecond); + Assertions.assertEquals(200000, literal.roundFloor(1).microSecond); + Assertions.assertEquals(0, literal.roundFloor(0).microSecond); + } + + @Test + void testRoundCeiling() { + DateTimeV2Literal literal; + literal = new DateTimeV2Literal(DateTimeV2Type.of(6), 2000, 12, 31, 23, 59, 59, 888888); + Assertions.assertEquals(888888, literal.roundCeiling(6).microSecond); + Assertions.assertEquals(888890, literal.roundCeiling(5).microSecond); + Assertions.assertEquals(888900, literal.roundCeiling(4).microSecond); + Assertions.assertEquals(889000, literal.roundCeiling(3).microSecond); + Assertions.assertEquals(890000, literal.roundCeiling(2).microSecond); + Assertions.assertEquals(900000, literal.roundCeiling(1).microSecond); + Assertions.assertEquals(0, literal.roundCeiling(0).microSecond); + Assertions.assertEquals(0, literal.roundCeiling(0).second); + Assertions.assertEquals(0, literal.roundCeiling(0).minute); + Assertions.assertEquals(0, literal.roundCeiling(0).hour); + Assertions.assertEquals(1, literal.roundCeiling(0).day); + Assertions.assertEquals(1, literal.roundCeiling(0).month); + Assertions.assertEquals(2001, literal.roundCeiling(0).year); + } +}