Skip to content

fix: handle more types of timestamp conversion #3574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
colinmarc wants to merge 1 commit into
base: main
Choose a base branch
from
+269 −218
Open

fix: handle more types of timestamp conversion #3574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 81 additions & 13 deletions crates/iceberg/src/spec/values/datum.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,25 +1132,19 @@ impl Datum {
match target_type {
Type::Primitive(target_primitive_type) => {
match (&self.literal, &self.r#type, target_primitive_type) {
(PrimitiveLiteral::Int(val), _, PrimitiveType::Int) => Ok(Datum::int(*val)),
(PrimitiveLiteral::Int(val), _, PrimitiveType::Date) => Ok(Datum::date(*val)),
(PrimitiveLiteral::Int(val), _, PrimitiveType::Long) => Ok(Datum::long(*val)),
(PrimitiveLiteral::Long(val), _, PrimitiveType::Int) => {
Ok(Datum::i64_to_i32(*val))
(_, self_type, target_type) if self_type == target_type => Ok(self),
(PrimitiveLiteral::Int(val), source_type, target_type) => {
convert_int(*val, source_type, target_type)
}
(PrimitiveLiteral::Long(val), source_type, target_type) => {
convert_long(*val, source_type, target_type)
}
(PrimitiveLiteral::Double(val), _, PrimitiveType::Float) => {
Ok(Datum::f64_to_f32(val.0))
}
(PrimitiveLiteral::Float(val), _, PrimitiveType::Double) => {
Ok(Datum::double(val.0 as f64))
}
(PrimitiveLiteral::Long(val), _, PrimitiveType::Timestamp) => {
Ok(Datum::timestamp_micros(*val))
}
(PrimitiveLiteral::Long(val), _, PrimitiveType::Timestamptz) => {
Ok(Datum::timestamptz_micros(*val))
}
Comment on lines -1147 to -1152

@mbutrovich mbutrovich Oct 30, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could the PR description mention this removal? Datum::long(12345).to(&Primitive(PrimitiveType::Timestamp)) returns timestamp_micros(12345) on main, and test_datum_long_convert_to_timestamp checked that. On the head commit it returns "Can't convert datum from long type to timestamp type." The same applies to timestamptz. That matches my reading of the spec, but a caller binding a long literal to a timestamp column now gets an error, and the description only mentions what the PR adds.

@colinmarc colinmarc Nov 2, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated.

// Let's wait with nano's until this clears up: https://github.com/apache/iceberg/pull/11775
(PrimitiveLiteral::Int128(val), _, PrimitiveType::Long) => {
Ok(Datum::i128_to_i64(*val))
}
Expand Down Expand Up @@ -1199,7 +1193,6 @@ impl Datum {
}

// TODO: implement more type conversions
(_, self_type, target_type) if self_type == target_type => Ok(self),
_ => Err(invalid_data!(
"Can't convert datum from {} type to {} type.",
self.r#type,
Expand Down Expand Up @@ -1312,3 +1305,78 @@ fn human_float<T: Float + LowerExp + FromStr>(value: T) -> String {
format!("{sign}{}.{fraction}E{exponent}", &digits[..1])
}
}

const MICROS_PER_DAY: i64 = 24 * 60 * 60 * 1_000_000;
const NANOS_PER_MICRO: i64 = 1000;
const NANOS_PER_DAY: i64 = NANOS_PER_MICRO * MICROS_PER_DAY;

/// Converts an int literal between two [PrimitiveType]s.
fn convert_int(
val: i32,
source_type: &PrimitiveType,
target_type: &PrimitiveType,
) -> Result<Datum> {
let datum = match (source_type, target_type) {
(_, PrimitiveType::Int) => Datum::int(val),
(_, PrimitiveType::Date) => Datum::date(val),
(_, PrimitiveType::Long) => Datum::long(val),
(PrimitiveType::Date, PrimitiveType::Timestamp) => Datum::timestamp_micros(
(val as i64)
.checked_mul(MICROS_PER_DAY)
.ok_or_else(overflow)?,
),
(PrimitiveType::Date, PrimitiveType::TimestampNs) => Datum::timestamp_nanos(
(val as i64)
.checked_mul(NANOS_PER_DAY)
.ok_or_else(overflow)?,
),
_ => {
return Err(invalid_data!(
"Can't convert datum from {source_type} type to {target_type} type."
));
}
};

Ok(datum)
}

/// Converts a long literal between two [PrimitiveType]s.
fn convert_long(
val: i64,
source_type: &PrimitiveType,
target_type: &PrimitiveType,
) -> Result<Datum> {
let datum = match (source_type, target_type) {
(_, PrimitiveType::Int) => Datum::i64_to_i32(val),
(PrimitiveType::Timestamp | PrimitiveType::Timestamptz, PrimitiveType::Timestamp) => {
Datum::timestamp_micros(val)
}
(PrimitiveType::Timestamp | PrimitiveType::Timestamptz, PrimitiveType::Timestamptz) => {
Datum::timestamptz_micros(val)
}
(PrimitiveType::TimestampNs | PrimitiveType::TimestamptzNs, PrimitiveType::TimestampNs) => {
Datum::timestamp_nanos(val)
}
(
PrimitiveType::TimestampNs | PrimitiveType::TimestamptzNs,
PrimitiveType::TimestamptzNs,
) => Datum::timestamptz_nanos(val),
(PrimitiveType::Timestamp | PrimitiveType::Timestamptz, PrimitiveType::TimestampNs) => {
Datum::timestamp_nanos(val.checked_mul(NANOS_PER_MICRO).ok_or_else(overflow)?)
}
(PrimitiveType::Timestamp | PrimitiveType::Timestamptz, PrimitiveType::TimestamptzNs) => {
Datum::timestamptz_nanos(val.checked_mul(NANOS_PER_MICRO).ok_or_else(overflow)?)
}
_ => {
return Err(invalid_data!(
"Can't convert datum from {source_type} type to {target_type} type."
));
}
};

Ok(datum)
}

fn overflow() -> Error {
invalid_data!("integer overflow")
}
Loading
Loading