Skip to content
Merged
Changes from all commits
Commits
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
116 changes: 115 additions & 1 deletion crates/iceberg/src/arrow/value.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use arrow_array::{
Time64MicrosecondArray, TimestampMicrosecondArray, TimestampNanosecondArray,
};
use arrow_buffer::NullBuffer;
use arrow_schema::{DataType, FieldRef};
use arrow_schema::{DataType, FieldRef, TimeUnit};
use uuid::Uuid;

use super::get_field_id_from_metadata;
Expand Down Expand Up @@ -645,6 +645,38 @@ pub(crate) fn create_primitive_array_single_element(
Ok(Arc::new(Int64Array::from(vec![*v])))
}
(DataType::Int64, None) => Ok(Arc::new(Int64Array::from(vec![Option::<i64>::None]))),
(DataType::Timestamp(TimeUnit::Microsecond, timezone), Some(PrimitiveLiteral::Long(v))) => {
let array = TimestampMicrosecondArray::from(vec![*v]);
if let Some(timezone) = timezone {
Ok(Arc::new(array.with_timezone(timezone.clone())))
} else {
Ok(Arc::new(array))
}
}
(DataType::Timestamp(TimeUnit::Microsecond, timezone), None) => {
let array = TimestampMicrosecondArray::from(vec![Option::<i64>::None]);
if let Some(timezone) = timezone {
Ok(Arc::new(array.with_timezone(timezone.clone())))
} else {
Ok(Arc::new(array))
}
}
(DataType::Timestamp(TimeUnit::Nanosecond, timezone), Some(PrimitiveLiteral::Long(v))) => {
let array = TimestampNanosecondArray::from(vec![*v]);
if let Some(timezone) = timezone {
Ok(Arc::new(array.with_timezone(timezone.clone())))
} else {
Ok(Arc::new(array))
}
}
(DataType::Timestamp(TimeUnit::Nanosecond, timezone), None) => {
let array = TimestampNanosecondArray::from(vec![Option::<i64>::None]);
if let Some(timezone) = timezone {
Ok(Arc::new(array.with_timezone(timezone.clone())))
} else {
Ok(Arc::new(array))
}
}
(DataType::Float32, Some(PrimitiveLiteral::Float(v))) => {
Ok(Arc::new(Float32Array::from(vec![v.0])))
}
Expand Down Expand Up @@ -720,6 +752,22 @@ pub(crate) fn create_primitive_array_single_element(
DataType::Int64 => {
Ok(Arc::new(Int64Array::from(vec![Option::<i64>::None])) as ArrayRef)
}
DataType::Timestamp(TimeUnit::Microsecond, timezone) => {
let array = TimestampMicrosecondArray::from(vec![Option::<i64>::None]);
if let Some(timezone) = timezone {
Ok(Arc::new(array.with_timezone(timezone.clone())) as ArrayRef)
} else {
Ok(Arc::new(array) as ArrayRef)
}
}
DataType::Timestamp(TimeUnit::Nanosecond, timezone) => {
let array = TimestampNanosecondArray::from(vec![Option::<i64>::None]);
if let Some(timezone) = timezone {
Ok(Arc::new(array.with_timezone(timezone.clone())) as ArrayRef)
} else {
Ok(Arc::new(array) as ArrayRef)
}
}
DataType::Float32 => {
Ok(Arc::new(Float32Array::from(vec![Option::<f32>::None])) as ArrayRef)
}
Expand Down Expand Up @@ -793,6 +841,46 @@ pub(crate) fn create_primitive_array_repeated(
let vals: Vec<Option<i64>> = vec![None; num_rows];
Arc::new(Int64Array::from(vals))
}
(
DataType::Timestamp(TimeUnit::Microsecond, timezone),
Some(PrimitiveLiteral::Long(value)),
) => {
let array = TimestampMicrosecondArray::from(vec![*value; num_rows]);
if let Some(timezone) = timezone {
Arc::new(array.with_timezone(timezone.clone()))
} else {
Arc::new(array)
}
}
(DataType::Timestamp(TimeUnit::Microsecond, timezone), None) => {
let vals: Vec<Option<i64>> = vec![None; num_rows];
let array = TimestampMicrosecondArray::from(vals);
if let Some(timezone) = timezone {
Arc::new(array.with_timezone(timezone.clone()))
} else {
Arc::new(array)
}
}
(
DataType::Timestamp(TimeUnit::Nanosecond, timezone),
Some(PrimitiveLiteral::Long(value)),
) => {
let array = TimestampNanosecondArray::from(vec![*value; num_rows]);
if let Some(timezone) = timezone {
Arc::new(array.with_timezone(timezone.clone()))
} else {
Arc::new(array)
}
}
(DataType::Timestamp(TimeUnit::Nanosecond, timezone), None) => {
let vals: Vec<Option<i64>> = vec![None; num_rows];
let array = TimestampNanosecondArray::from(vals);
if let Some(timezone) = timezone {
Arc::new(array.with_timezone(timezone.clone()))
} else {
Arc::new(array)
}
}
(DataType::Float32, Some(PrimitiveLiteral::Float(value))) => {
Arc::new(Float32Array::from(vec![value.0; num_rows]))
}
Expand Down Expand Up @@ -1781,4 +1869,30 @@ mod test {

assert_eq!(array.len(), num_rows);
}

#[test]
fn test_create_timestamp_microsecond_array_repeated() {
let target_type = DataType::Timestamp(TimeUnit::Microsecond, None);
let value = PrimitiveLiteral::Long(1_740_600_000_000_000);
let num_rows = 3;

let array = create_primitive_array_repeated(&target_type, &Some(value), num_rows)
.expect("Failed to create repeated timestamp microsecond array");

assert_eq!(array.data_type(), &target_type);
assert_eq!(array.len(), num_rows);
}

#[test]
fn test_create_timestamp_microsecond_with_timezone_array_repeated() {
let target_type = DataType::Timestamp(TimeUnit::Microsecond, Some("UTC".into()));
let value = PrimitiveLiteral::Long(1_740_600_000_000_000);
let num_rows = 2;

let array = create_primitive_array_repeated(&target_type, &Some(value), num_rows)
.expect("Failed to create repeated timestamp microsecond array with timezone");

assert_eq!(array.data_type(), &target_type);
assert_eq!(array.len(), num_rows);
}
}
Loading