add some check

Author: TCeason

src/query/functions/src/scalars/datetime.rs

@@ -111,7 +111,7 @@ pub fn register(registry: &mut FunctionRegistry) {
     // [date | timestamp] +/- number
     register_timestamp_add_sub(registry);
 
-    // convert_timezone( target_timezone, date, src_timezone)
+    // convert_timezone( target_timezone, 'timestamp')
     register_convert_timezone(registry);
 }
 
@@ -144,6 +144,12 @@ fn register_convert_timezone(registry: &mut FunctionRegistry) {
         |_, _, _| FunctionDomain::MayThrow,
         vectorize_with_builder_2_arg::<StringType, TimestampType, TimestampType>(
             |target_tz, src_timestamp, output, ctx| {
+                if let Some(validity) = &ctx.validity {
+                    if !validity.get_bit(output.len()) {
+                        output.push(0);
+                        return;
+                    }
+                }
                 // Convert source timestamp from source timezone to target timezone
                 let p_src_timestamp = src_timestamp.to_timestamp(ctx.func_ctx.tz.tz);
                 let src_dst_from_utc = p_src_timestamp.offset().fix().local_minus_utc();
@@ -163,10 +169,14 @@ fn register_convert_timezone(registry: &mut FunctionRegistry) {
                     .offset()
                     .fix()
                     .local_minus_utc();
-                let offset_as_micros_sec =
-                    (target_dst_from_utc - src_dst_from_utc) as i64 * MICROS_PER_SEC;
-                let res = result_timestamp.checked_add(offset_as_micros_sec).unwrap();
-                output.push(res)
+                let offset_as_micros_sec = (target_dst_from_utc - src_dst_from_utc) as i64;
+                match offset_as_micros_sec.checked_mul(MICROS_PER_SEC) {
+                    Some(offset) => match result_timestamp.checked_add(offset) {
+                        Some(res) => output.push(res),
+                        None => ctx.set_error(output.len(), "calc final time error".to_string()),
+                    },
+                    None => ctx.set_error(output.len(), "calc time offset error".to_string()),
+                }
             },
         ),
     );

tests/sqllogictests/suites/query/functions/02_0012_function_datetimes_tz.test

@@ -782,18 +782,22 @@ statement ok
 set timezone='UTC';
 
 statement ok
-create or replace table t(c timestamp);
+create or replace table t(a string null, c timestamp null);
 
 statement ok
-insert into t values('1970-01-01 00:00:00'), ('2024-10-31 22:21:15');
+insert into t values('America/Los_Angeles','1970-01-01 00:00:00'), ('America/Los_Angeles','2024-10-31 22:21:15'), (null, '1970-01-01 00:00:00'), ('Asia/Shanghai', '1970-01-01 00:00:00'), ('Asia/Shanghai', '2024-10-31 22:21:15'),('Asia/Shanghai', null), (null, null);
 
 # UTC to America/Los_Angeles,  20240-03-10 ~ 2024-11-03 is UTC-7(dst), other is UTC-8
 query T
-select c, CONVERT_TIMEZONE('America/Los_Angeles', c) from t;
+select a, c, CONVERT_TIMEZONE(a, c) from t order by a,c;
 ----
-1970-01-01 00:00:00.000000 1969-12-31 16:00:00.000000
-2024-10-31 22:21:15.000000 2024-10-31 15:21:15.000000
-
+America/Los_Angeles 1970-01-01 00:00:00.000000 1969-12-31 16:00:00.000000
+America/Los_Angeles 2024-10-31 22:21:15.000000 2024-10-31 15:21:15.000000
+Asia/Shanghai 1970-01-01 00:00:00.000000 1970-01-01 08:00:00.000000
+Asia/Shanghai 2024-10-31 22:21:15.000000 2024-11-01 06:21:15.000000
+Asia/Shanghai NULL NULL
+NULL 1970-01-01 00:00:00.000000 NULL
+NULL NULL NULL
 
 statement ok
 set timezone='Asia/Shanghai';