[Enhancement]Enhance datetime format (backport #39986) (#40505)

Signed-off-by: leoyy0316 <[email protected]>

Author: leoyy0316

fe/fe-core/src/main/java/com/starrocks/common/util/DateUtils.java

@@ -50,19 +50,23 @@ public class DateUtils {
     private static final DateTimeFormatter STRICT_DATE_NO_SPLIT_FORMATTER =
             unixDatetimeStrictFormatter("%Y%m%e", true);
 
-    // isTwoDigit, withMs, withSplitT -> formatter
-    private static final DateTimeFormatter[][][] DATETIME_FORMATTERS = new DateTimeFormatter[2][2][2];
+    // isTwoDigit, withMs, withSplitT, withSec -> formatter
+    private static final DateTimeFormatter[][][][] DATETIME_FORMATTERS = new DateTimeFormatter[2][2][2][2];
 
     static {
-        // isTwoDigit, withMs, withSplitT -> formatter
-        DATETIME_FORMATTERS[0][0][0] = unixDatetimeStrictFormatter("%Y-%m-%e %H:%i:%s", false);
-        DATETIME_FORMATTERS[0][0][1] = unixDatetimeStrictFormatter("%Y-%m-%eT%H:%i:%s", false);
-        DATETIME_FORMATTERS[0][1][0] = unixDatetimeStrictFormatter("%Y-%m-%e %H:%i:%s.%f", false);
-        DATETIME_FORMATTERS[0][1][1] = unixDatetimeStrictFormatter("%Y-%m-%eT%H:%i:%s.%f", false);
-        DATETIME_FORMATTERS[1][0][0] = unixDatetimeStrictFormatter("%y-%m-%e %H:%i:%s", false);
-        DATETIME_FORMATTERS[1][0][1] = unixDatetimeStrictFormatter("%y-%m-%eT%H:%i:%s", false);
-        DATETIME_FORMATTERS[1][1][0] = unixDatetimeStrictFormatter("%y-%m-%e %H:%i:%s.%f", false);
-        DATETIME_FORMATTERS[1][1][1] = unixDatetimeStrictFormatter("%y-%m-%eT%H:%i:%s.%f", false);
+        // isTwoDigit, withMs, withSplitT, withSec -> formatter
+        DATETIME_FORMATTERS[0][0][0][0] = unixDatetimeStrictFormatter("%Y-%m-%e %H:%i", false);
+        DATETIME_FORMATTERS[0][0][0][1] = unixDatetimeStrictFormatter("%Y-%m-%e %H:%i:%s", false);
+        DATETIME_FORMATTERS[0][0][1][0] = unixDatetimeStrictFormatter("%Y-%m-%eT%H:%i", false);
+        DATETIME_FORMATTERS[0][0][1][1] = unixDatetimeStrictFormatter("%Y-%m-%eT%H:%i:%s", false);
+        DATETIME_FORMATTERS[0][1][0][1] = unixDatetimeStrictFormatter("%Y-%m-%e %H:%i:%s.%f", false);
+        DATETIME_FORMATTERS[0][1][1][1] = unixDatetimeStrictFormatter("%Y-%m-%eT%H:%i:%s.%f", false);
+        DATETIME_FORMATTERS[1][0][0][0] = unixDatetimeStrictFormatter("%y-%m-%e %H:%i", false);
+        DATETIME_FORMATTERS[1][0][0][1] = unixDatetimeStrictFormatter("%y-%m-%e %H:%i:%s", false);
+        DATETIME_FORMATTERS[1][0][1][0] = unixDatetimeStrictFormatter("%y-%m-%eT%H:%i", false);
+        DATETIME_FORMATTERS[1][0][1][1] = unixDatetimeStrictFormatter("%y-%m-%eT%H:%i:%s", false);
+        DATETIME_FORMATTERS[1][1][0][1] = unixDatetimeStrictFormatter("%y-%m-%e %H:%i:%s.%f", false);
+        DATETIME_FORMATTERS[1][1][1][1] = unixDatetimeStrictFormatter("%y-%m-%eT%H:%i:%s.%f", false);
     }
 
     public static LocalDateTime parseStrictDateTime(String str) {
@@ -72,9 +76,10 @@ public static LocalDateTime parseStrictDateTime(String str) {
         if (str.contains(":")) {
             // datetime
             int isTwoDigit = str.split("-")[0].length() == 2 ? 1 : 0;
+            int withSec = str.split(":").length > 2 ? 1 : 0;
             int withMs = str.contains(".") ? 1 : 0;
             int withSplitT = str.contains("T") ? 1 : 0;
-            DateTimeFormatter formatter = DATETIME_FORMATTERS[isTwoDigit][withMs][withSplitT];
+            DateTimeFormatter formatter = DATETIME_FORMATTERS[isTwoDigit][withMs][withSplitT][withSec];
             return parseStringWithDefaultHSM(str, formatter);
         } else {
             // date

fe/fe-core/src/test/java/com/starrocks/common/util/DateUtilsTest.java

@@ -67,6 +67,19 @@ public void testParseDatTimeString() {
                 long ts = Utils.getLongFromDateTime(lt2);
                 Assert.assertEquals(ts, 1682600771);
             }
+
+            {
+                String datetime1 = "2024-01-27T21:06";
+                LocalDateTime lt1 = DateUtils.parseStrictDateTime(datetime1);
+                Assert.assertEquals(lt1.toString(), "2024-01-27T21:06");
+                String datetime2 = "2024-01-27T21:06:00";
+                LocalDateTime lt2 = DateUtils.parseStrictDateTime(datetime2);
+                Assert.assertEquals(lt2.toString(), "2024-01-27T21:06");
+                Assert.assertEquals(Utils.getLongFromDateTime(lt1), Utils.getLongFromDateTime(lt2));
+                String datetime3 = "2024-01-27 21:06:01";
+                LocalDateTime lt3 = DateUtils.parseStrictDateTime(datetime3);
+                Assert.assertEquals(lt3.toString(), "2024-01-27T21:06:01");
+            }
         } catch (Exception e) {
             Assert.fail();
         }