fix overflow

databendlabs · Jul 22, 2024 · 71b16bf · 71b16bf
1 parent 2854424
commit 71b16bf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/query/storages/common/table_meta/src/meta/utils.rs b/src/query/storages/common/table_meta/src/meta/utils.rs
@@ -53,6 +53,12 @@ pub fn monotonically_increased_timestamp(
 pub fn uuid_from_date_time(ts: DateTime<Utc>) -> Uuid {
     let seconds = ts.timestamp();
     let nanos = ts.timestamp_subsec_nanos();
+    // avoid overflow silently in release mode
+    let _ = seconds
+        .checked_mul(1000)
+        .unwrap()
+        .checked_add(nanos as i64 / 1_000)
+        .unwrap();
     let uuid_ts = uuid::Timestamp::from_unix(NoContext, seconds as u64, nanos);
     Uuid::new_v7(uuid_ts)
 }
diff --git a/src/query/storages/fuse/src/io/locations.rs b/src/query/storages/fuse/src/io/locations.rs
@@ -80,8 +80,7 @@ impl TableMetaLocationGenerator {
         &self,
         base_snapshot_timestamp: Option<DateTime<Utc>>,
     ) -> (Location, Uuid) {
-        let part_uuid =
-            uuid_from_date_time(base_snapshot_timestamp.unwrap_or(DateTime::<Utc>::MIN_UTC));
+        let part_uuid = uuid_from_date_time(base_snapshot_timestamp.unwrap_or_default());
         let location_path = format!(
             "{}/{}/g{}{}_v{}.parquet",
             &self.prefix,
@@ -111,8 +110,7 @@ impl TableMetaLocationGenerator {
         &self,
         base_snapshot_timestamp: Option<DateTime<Utc>>,
     ) -> String {
-        let segment_uuid =
-            uuid_from_date_time(base_snapshot_timestamp.unwrap_or(DateTime::<Utc>::MIN_UTC));
+        let segment_uuid = uuid_from_date_time(base_snapshot_timestamp.unwrap_or_default());
         format!(
             "{}/{}/g{}_v{}.mpk",
             &self.prefix,