g This is a combination of 2 commits.

fix comm

fix ci

Author: xxhZs

e2e_test/batch/types/timestamp_ns.slt.part

@@ -51,7 +51,7 @@ select v1, v2, coalesce(v2, '1900-01-01 00:00:00') as coalesce_v2 from t1;
 query T
 select count(v2) as total_rows from t1;
 ----
-4
+5
 
 query T rowsort
 select * from t1 order by v2;

src/expr/impl/src/scalar/extract.rs

@@ -42,18 +42,18 @@ fn extract_from_datelike(date: impl Datelike, unit: Unit) -> Decimal {
 
 /// Extract field from `Timelike`.
 fn extract_from_timelike(time: impl Timelike, unit: Unit) -> Decimal {
-    let usecs = || time.second() as u64 * 1_000_000_000 + time.nanosecond() as u64;
+    let nanos = || time.second() as u64 * 1_000_000_000 + time.nanosecond() as u64;
     match unit {
         Hour => time.hour().into(),
         Minute => time.minute().into(),
-        Second => Decimal::from_i128_with_scale(usecs() as i128, 9),
-        Millisecond => Decimal::from_i128_with_scale(usecs() as i128, 6),
-        Microsecond => Decimal::from_i128_with_scale(usecs() as i128, 3),
-        Nanosecond => usecs().into(),
+        Second => Decimal::from_i128_with_scale(nanos() as i128, 9),
+        Millisecond => Decimal::from_i128_with_scale(nanos() as i128, 6),
+        Microsecond => Decimal::from_i128_with_scale(nanos() as i128, 3),
+        Nanosecond => nanos().into(),
         Epoch => {
-            let usecs =
+            let nanos =
                 time.num_seconds_from_midnight() as u64 * 1_000_000_000 + time.nanosecond() as u64;
-            Decimal::from_i128_with_scale(usecs as i128, 9)
+            Decimal::from_i128_with_scale(nanos as i128, 9)
         }
         u => unreachable!("invalid unit {:?} for time", u),
     }