This is an automated email from the ASF dual-hosted git repository.
xuanwo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg-rust.git
The following commit(s) were added to refs/heads/main by this push:
new ede47205 fix: Less Panics for Snapshot timestamps (#614)
ede47205 is described below
commit ede472051aa67cd3f7d8712a5c8291dca1a91fae
Author: Christian <[email protected]>
AuthorDate: Sun Sep 8 16:49:39 2024 +0200
fix: Less Panics for Snapshot timestamps (#614)
---
crates/iceberg/src/spec/snapshot.rs | 20 +++++++++++++++-----
crates/iceberg/src/spec/table_metadata.rs | 2 +-
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/crates/iceberg/src/spec/snapshot.rs
b/crates/iceberg/src/spec/snapshot.rs
index 704a43b5..f42e736e 100644
--- a/crates/iceberg/src/spec/snapshot.rs
+++ b/crates/iceberg/src/spec/snapshot.rs
@@ -22,16 +22,19 @@ use std::collections::HashMap;
use std::sync::Arc;
use _serde::SnapshotV2;
-use chrono::{DateTime, TimeZone, Utc};
+use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize};
use typed_builder::TypedBuilder;
use super::table_metadata::SnapshotLog;
-use crate::error::Result;
+use crate::error::{timestamp_ms_to_utc, Result};
use crate::io::FileIO;
use crate::spec::{ManifestList, SchemaId, SchemaRef, StructType,
TableMetadata};
use crate::{Error, ErrorKind};
+/// The ref name of the main branch of the table.
+pub const MAIN_BRANCH: &str = "main";
+
/// Reference to [`Snapshot`].
pub type SnapshotRef = Arc<Snapshot>;
#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
@@ -125,8 +128,14 @@ impl Snapshot {
}
/// Get the timestamp of when the snapshot was created
#[inline]
- pub fn timestamp(&self) -> DateTime<Utc> {
- Utc.timestamp_millis_opt(self.timestamp_ms).unwrap()
+ pub fn timestamp(&self) -> Result<DateTime<Utc>> {
+ timestamp_ms_to_utc(self.timestamp_ms)
+ }
+
+ /// Get the timestamp of when the snapshot was created in milliseconds
+ #[inline]
+ pub fn timestamp_ms(&self) -> i64 {
+ self.timestamp_ms
}
/// Get the schema id of this snapshot.
@@ -386,8 +395,9 @@ mod tests {
assert_eq!(3051729675574597004, result.snapshot_id());
assert_eq!(
Utc.timestamp_millis_opt(1515100955770).unwrap(),
- result.timestamp()
+ result.timestamp().unwrap()
);
+ assert_eq!(1515100955770, result.timestamp_ms());
assert_eq!(
Summary {
operation: Operation::Append,
diff --git a/crates/iceberg/src/spec/table_metadata.rs
b/crates/iceberg/src/spec/table_metadata.rs
index dacd5bcd..16deaac2 100644
--- a/crates/iceberg/src/spec/table_metadata.rs
+++ b/crates/iceberg/src/spec/table_metadata.rs
@@ -258,7 +258,7 @@ impl TableMetadata {
/// Append snapshot to table
pub fn append_snapshot(&mut self, snapshot: Snapshot) {
- self.last_updated_ms = snapshot.timestamp().timestamp_millis();
+ self.last_updated_ms = snapshot.timestamp_ms();
self.last_sequence_number = snapshot.sequence_number();
self.refs
