update

apache · Feb 11, 2025 · c1ad698 · c1ad698
1 parent 7335fc4
commit c1ad698
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/...ore/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateTimeLiteral.java b/...ore/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateTimeLiteral.java
@@ -117,13 +117,6 @@ public static int determineScale(String s) {
             }
             scale++;
         }
-        // trim the tailing zero
-        for (int i = 19 + scale; i >= 19; i--) {
-            if (s.charAt(i) != '0') {
-                break;
-            }
-            scale--;
-        }
         return scale;
     }
 

diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ComparisonPredicateTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ComparisonPredicateTest.java
@@ -159,14 +159,14 @@ public void testConvertToRangeForDateTimeV2() {
 
         Assert.assertEquals(dateTimeExpr, range1.upperEndpoint());
         Assert.assertEquals(dateTimeV2Expr1, range1.upperEndpoint());
-        Assert.assertEquals(dateTimeV2Expr2, range1.upperEndpoint());
+        Assert.assertNotEquals(dateTimeV2Expr2, range1.upperEndpoint());
         Assert.assertEquals(BoundType.CLOSED, range1.upperBoundType());
         Assert.assertFalse(range1.hasLowerBound());
 
         Assert.assertEquals(dateTimeExpr, range2.upperEndpoint());
         Assert.assertEquals(dateTimeV2Expr1, range2.upperEndpoint());
         Assert.assertEquals(BoundType.CLOSED, range2.upperBoundType());
         Assert.assertFalse(range2.hasLowerBound());
-        Assert.assertEquals(dateTimeV2Expr2, range2.upperEndpoint());
+        Assert.assertNotEquals(dateTimeV2Expr2, range2.upperEndpoint());
     }
 }
diff --git a/...src/test/java/org/apache/doris/nereids/trees/expressions/literal/DateTimeLiteralTest.java b/...src/test/java/org/apache/doris/nereids/trees/expressions/literal/DateTimeLiteralTest.java
@@ -93,21 +93,21 @@ void testWithoutZoneOrOffset() {
     @Test
     void testDetermineScale() {
         int scale = DateTimeLiteral.determineScale("2022-08-01T01:01:01.0");
-        Assertions.assertEquals(0, scale);
+        Assertions.assertEquals(1, scale);
         scale = DateTimeLiteral.determineScale("2022-08-01T01:01:01.00000");
-        Assertions.assertEquals(0, scale);
+        Assertions.assertEquals(5, scale);
         scale = DateTimeLiteral.determineScale("2022-08-01T01:01:01.000001");
         Assertions.assertEquals(6, scale);
         scale = DateTimeLiteral.determineScale("2022-08-01T01:01:01.123456");
         Assertions.assertEquals(6, scale);
         scale = DateTimeLiteral.determineScale("2022-08-01T01:01:01.0001");
         Assertions.assertEquals(4, scale);
         scale = DateTimeLiteral.determineScale("2022-08-01T01:01:01.00010");
-        Assertions.assertEquals(4, scale);
+        Assertions.assertEquals(5, scale);
         scale = DateTimeLiteral.determineScale("2022-08-01T01:01:01.12010");
-        Assertions.assertEquals(4, scale);
+        Assertions.assertEquals(5, scale);
         scale = DateTimeLiteral.determineScale("2022-08-01T01:01:01.02010");
-        Assertions.assertEquals(4, scale);
+        Assertions.assertEquals(5, scale);
     }
 
     @Test