fixup! store segment timestamp in SegmentKey

Author: MarinPostma

libsql-server/src/wal_toolkit.rs

@@ -3,6 +3,7 @@ use std::path::{Path, PathBuf};
 use anyhow::Context as _;
 use aws_config::{retry::RetryConfig, BehaviorVersion, Region};
 use aws_sdk_s3::config::{Credentials, SharedCredentialsProvider};
+use chrono::DateTime;
 use libsql_wal::io::StdIO;
 use libsql_wal::storage::backend::s3::S3Backend;
 use libsql_wal::storage::compaction::strategy::identity::IdentityStrategy;
@@ -80,11 +81,11 @@ impl WalToolkit {
                 if let Some((first, last)) = compactor.get_segment_range(&namespace)? {
                     println!(
                         "- oldest segment: {}-{} ({})",
-                        first.key.start_frame_no, first.key.end_frame_no, first.created_at
+                        first.key.start_frame_no, first.key.end_frame_no, DateTime::from_timestamp_millis(first.key.timestamp as _).unwrap()
                     );
                     println!(
                         "- most recent segment: {}-{} ({})",
-                        last.key.start_frame_no, last.key.end_frame_no, last.created_at
+                        last.key.start_frame_no, last.key.end_frame_no, DateTime::from_timestamp_millis(last.key.timestamp as _).unwrap()
                     );
                 }
 
@@ -93,7 +94,7 @@ impl WalToolkit {
                     compactor.list_all(&namespace, |info| {
                         println!(
                             "- {}-{} ({})",
-                            info.key.start_frame_no, info.key.end_frame_no, info.created_at
+                            info.key.start_frame_no, info.key.end_frame_no, DateTime::from_timestamp_millis(info.key.timestamp as _).unwrap()
                         );
                     })?;
                 }

libsql-wal/src/storage/mod.rs

@@ -1,4 +1,5 @@
 use std::collections::BTreeMap;
+use std::fmt::Debug;
 use std::path::{Path, PathBuf};
 use std::pin::Pin;
 use std::str::FromStr;
@@ -60,13 +61,23 @@ pub enum RestoreOptions {
 /// map.range(format!("{:020}", u64::MAX - 101)..).next();
 /// map.range(format!("{:020}", u64::MAX - 5000)..).next();
 /// ```
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Clone, Copy, PartialEq, Eq)]
 pub struct SegmentKey {
     pub start_frame_no: u64,
     pub end_frame_no: u64,
     pub timestamp: u64,
 }
 
+impl Debug for SegmentKey {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("SegmentKey")
+            .field("start_frame_no", &self.start_frame_no)
+            .field("end_frame_no", &self.end_frame_no)
+            .field("timestamp", &self.timestamp())
+            .finish()
+    }
+}
+
 impl PartialOrd for SegmentKey {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
         match self.start_frame_no.partial_cmp(&other.start_frame_no) {
@@ -109,6 +120,12 @@ impl SegmentKey {
 
         Some(key)
     }
+
+    fn timestamp(&self) -> DateTime<Utc> {
+        DateTime::from_timestamp_millis(self.timestamp as _)
+            .unwrap()
+            .to_utc()
+    }
 }
 
 impl From<&SegmentMeta> for SegmentKey {
@@ -629,9 +646,9 @@ pub struct StoreSegmentRequest<S, C> {
     on_store_callback: OnStoreCallback,
 }
 
-impl<S, C> fmt::Debug for StoreSegmentRequest<S, C>
+impl<S, C> Debug for StoreSegmentRequest<S, C>
 where
-    S: fmt::Debug,
+    S: Debug,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("StoreSegmentRequest")