fix

apache · Oct 16, 2023 · ec430d7 · ec430d7
1 parent 549e5ee
commit ec430d7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/be/src/vec/runtime/vdatetime_value.cpp b/be/src/vec/runtime/vdatetime_value.cpp
@@ -2306,13 +2306,22 @@ bool DateV2Value<T>::from_date_format_str(const char* format, int format_len, co
                     tmp++;
                 }
 
-                if (!str_to_int64(val, &tmp, &int_value)) {
-                    return false;
+                if (tmp - val > 6) {
+                    const char* tmp2 = val + 6;
+                    if (!str_to_int64(val, &tmp2, &int_value)) {
+                        return false;
+                    }
+                } else {
+                    if (!str_to_int64(val, &tmp, &int_value)) {
+                        return false;
+                    }
+                }
+                if constexpr (is_datetime) {
+                    microsecond = int_value * int_exp10(6 - min(6, tmp - val));
+                    frac_part_used = true;
                 }
-                microsecond = int_value * int_exp10(6 - min(6, val_end - val));
                 val = tmp;
                 time_part_used = true;
-                frac_part_used = true;
                 break;
                 // AM/PM
             case 'p':

diff --git a/gensrc/script/doris_builtins_functions.py b/gensrc/script/doris_builtins_functions.py
@@ -1104,8 +1104,6 @@
 
         [['str_to_date'], 'DATETIMEV2', ['VARCHAR', 'VARCHAR'], 'ALWAYS_NULLABLE'],
         [['str_to_date'], 'DATETIMEV2', ['STRING', 'STRING'], 'ALWAYS_NULLABLE'],
-        [['str_to_date'], 'DATEV2', ['VARCHAR', 'VARCHAR'], 'ALWAYS_NULLABLE'],
-        [['str_to_date'], 'DATEV2', ['STRING', 'STRING'], 'ALWAYS_NULLABLE'],
         [['date_format'], 'VARCHAR', ['DATETIMEV2', 'VARCHAR'], 'ALWAYS_NULLABLE'],
         [['date_format'], 'VARCHAR', ['DATEV2', 'VARCHAR'], 'ALWAYS_NULLABLE'],
         [['date', 'to_date', 'datev2', 'to_datev2'], 'DATEV2', ['DATETIMEV2'], 'ALWAYS_NULLABLE'],

diff --git a/regression-test/data/nereids_p0/sql_functions/datetime_functions/test_date_function.out b/regression-test/data/nereids_p0/sql_functions/datetime_functions/test_date_function.out
@@ -235,10 +235,10 @@ February
 2014-12-21T12:34:56
 
 -- !sql --
-2014-12-21T12:34:56.000789
+2014-12-21T12:34:56.789
 
 -- !sql --
-2023-07-05T02:09:55.088
+2023-07-05T02:09:55.880
 
 -- !sql --
 2004-10-18