parquet 0.0.2 → 0.0.3

data/ext/parquet/src/types.rs

@@ -1,27 +1,116 @@
-use std::{borrow::Cow, collections::HashMap, hash::BuildHasher};
+use std::{borrow::Cow, collections::HashMap, hash::BuildHasher, sync::Arc};
 
+use arrow_array::cast::downcast_array;
+use arrow_array::{
+    Array, BinaryArray, BooleanArray, Date32Array, Date64Array, Float16Array, Float32Array,
+    Float64Array, Int16Array, Int32Array, Int64Array, Int8Array, ListArray, NullArray, StringArray,
+    StructArray, TimestampMicrosecondArray, TimestampMillisecondArray, TimestampNanosecondArray,
+    TimestampSecondArray, UInt16Array, UInt32Array, UInt64Array, UInt8Array,
+};
+use arrow_schema::{DataType, TimeUnit};
+use itertools::Itertools;
 use magnus::{value::ReprValue, IntoValue, Ruby, Value};
+use parquet::data_type::Decimal;
 use parquet::record::Field;
 
+use crate::header_cache::StringCacheKey;
+
 #[derive(Debug)]
-pub enum Record<S: BuildHasher + Default> {
+pub enum RowRecord<S: BuildHasher + Default> {
     Vec(Vec<ParquetField>),
-    Map(HashMap<&'static str, ParquetField, S>),
+    Map(HashMap<StringCacheKey, ParquetField, S>),
 }
 
-impl<S: BuildHasher + Default> IntoValue for Record<S> {
+#[derive(Debug)]
+pub enum ColumnRecord<S: BuildHasher + Default> {
+    Vec(Vec<Vec<ParquetValue>>),
+    Map(HashMap<StringCacheKey, Vec<ParquetValue>, S>),
+}
+
+impl<S: BuildHasher + Default> IntoValue for RowRecord<S> {
     fn into_value_with(self, handle: &Ruby) -> Value {
         match self {
-            Record::Vec(vec) => {
+            RowRecord::Vec(vec) => {
                 let ary = handle.ary_new_capa(vec.len());
                 vec.into_iter().try_for_each(|v| ary.push(v)).unwrap();
-                ary.into_value_with(handle)
+                handle.into_value(ary)
             }
-            Record::Map(map) => {
+            RowRecord::Map(map) => {
                 let hash = handle.hash_new_capa(map.len());
-                map.into_iter()
-                    .try_for_each(|(k, v)| hash.aset(k, v))
+
+                let mut values: [Value; 128] = [handle.qnil().as_value(); 128];
+                let mut i = 0;
+
+                for chunk in &map.into_iter().chunks(64) {
+                    // Reduced to 64 to ensure space for pairs
+                    for (k, v) in chunk {
+                        if i + 1 >= values.len() {
+                            // Bulk insert current batch if array is full
+                            hash.bulk_insert(&values[..i]).unwrap();
+                            values[..i].fill(handle.qnil().as_value());
+                            i = 0;
+                        }
+                        values[i] = handle.into_value(k);
+                        values[i + 1] = handle.into_value(v);
+                        i += 2;
+                    }
+                    // Insert any remaining pairs
+                    if i > 0 {
+                        hash.bulk_insert(&values[..i]).unwrap();
+                        values[..i].fill(handle.qnil().as_value());
+                        i = 0;
+                    }
+                }
+
+                hash.into_value_with(handle)
+            }
+        }
+    }
+}
+
+impl<S: BuildHasher + Default> IntoValue for ColumnRecord<S> {
+    fn into_value_with(self, handle: &Ruby) -> Value {
+        match self {
+            ColumnRecord::Vec(vec) => {
+                let ary = handle.ary_new_capa(vec.len());
+                vec.into_iter()
+                    .try_for_each(|v| {
+                        let nested_ary = handle.ary_new_capa(v.len());
+                        v.into_iter().try_for_each(|v| nested_ary.push(v)).unwrap();
+                        ary.push(nested_ary.into_value_with(handle))
+                    })
                     .unwrap();
+                ary.into_value_with(handle)
+            }
+            ColumnRecord::Map(map) => {
+                let hash = handle.hash_new_capa(map.len());
+
+                let mut values: [Value; 128] = [handle.qnil().as_value(); 128];
+                let mut i = 0;
+
+                for chunk in &map.into_iter().chunks(64) {
+                    // Reduced to 64 to ensure space for pairs
+                    for (k, v) in chunk {
+                        if i + 1 >= values.len() {
+                            // Bulk insert current batch if array is full
+                            hash.bulk_insert(&values[..i]).unwrap();
+                            values[..i].fill(handle.qnil().as_value());
+                            i = 0;
+                        }
+                        values[i] = handle.into_value(k);
+                        let ary = handle.ary_new_capa(v.len());
+                        v.into_iter().try_for_each(|v| ary.push(v)).unwrap();
+                        values[i + 1] = handle.into_value(ary);
+                        i += 2;
+                    }
+                    // Insert any remaining pairs
+                    if i > 0 {
+                        hash.bulk_insert(&values[..i]).unwrap();
+                        values[..i].fill(handle.qnil().as_value());
+                        i = 0;
+                    }
+                }
+
                 hash.into_value_with(handle)
             }
         }
@@ -43,7 +132,7 @@ pub struct ParquetField(pub Field);
 impl IntoValue for ParquetField {
     fn into_value_with(self, handle: &Ruby) -> Value {
         match self.0 {
-            Field::Byte(b) => b.into_value_with(handle),
+            Field::Null => handle.qnil().as_value(),
             Field::Bool(b) => b.into_value_with(handle),
             Field::Short(s) => s.into_value_with(handle),
             Field::Int(i) => i.into_value_with(handle),
@@ -56,10 +145,29 @@ impl IntoValue for ParquetField {
             Field::Float(f) => f.into_value_with(handle),
             Field::Double(d) => d.into_value_with(handle),
             Field::Str(s) => s.into_value_with(handle),
+            Field::Byte(b) => b.into_value_with(handle),
             Field::Bytes(b) => handle.str_from_slice(b.data()).as_value(),
-            Field::Date(d) => d.into_value_with(handle),
-            Field::TimestampMillis(ts) => ts.into_value_with(handle),
-            Field::TimestampMicros(ts) => ts.into_value_with(handle),
+            Field::Date(d) => {
+                let ts = jiff::Timestamp::from_second((d as i64) * 86400).unwrap();
+                let formatted = ts.strftime("%Y-%m-%d").to_string();
+                formatted.into_value_with(handle)
+            }
+            Field::TimestampMillis(ts) => {
+                let ts = jiff::Timestamp::from_millisecond(ts).unwrap();
+                let time_class = handle.class_time();
+                time_class
+                    .funcall::<_, _, Value>("parse", (ts.to_string(),))
+                    .unwrap()
+                    .into_value_with(handle)
+            }
+            Field::TimestampMicros(ts) => {
+                let ts = jiff::Timestamp::from_microsecond(ts).unwrap();
+                let time_class = handle.class_time();
+                time_class
+                    .funcall::<_, _, Value>("parse", (ts.to_string(),))
+                    .unwrap()
+                    .into_value_with(handle)
+            }
             Field::ListInternal(list) => {
                 let elements = list.elements();
                 let ary = handle.ary_new_capa(elements.len());
@@ -83,8 +191,532 @@ impl IntoValue for ParquetField {
                     .unwrap();
                 hash.into_value_with(handle)
             }
-            Field::Null => handle.qnil().as_value(),
-            _ => panic!("Unsupported field type"),
+            Field::Decimal(d) => {
+                let value = match d {
+                    Decimal::Int32 { value, scale, .. } => {
+                        let unscaled = i32::from_be_bytes(value);
+                        format!("{}e-{}", unscaled, scale)
+                    }
+                    Decimal::Int64 { value, scale, .. } => {
+                        let unscaled = i64::from_be_bytes(value);
+                        format!("{}e-{}", unscaled, scale)
+                    }
+                    Decimal::Bytes { value, scale, .. } => {
+                        // Convert bytes to string representation of unscaled value
+                        let unscaled = String::from_utf8_lossy(value.data());
+                        format!("{}e-{}", unscaled, scale)
+                    }
+                };
+                handle.eval(&format!("BigDecimal(\"{value}\")")).unwrap()
+            }
+            Field::Group(row) => {
+                let hash = handle.hash_new();
+                row.get_column_iter()
+                    .try_for_each(|(k, v)| {
+                        hash.aset(
+                            k.clone().into_value_with(handle),
+                            ParquetField(v.clone()).into_value_with(handle),
+                        )
+                    })
+                    .unwrap();
+                hash.into_value_with(handle)
+            }
+        }
+    }
+}
+
+#[allow(dead_code)]
+#[derive(Clone, Debug)]
+pub enum ParquetValue {
+    Int8(i8),
+    Int16(i16),
+    Int32(i32),
+    Int64(i64),
+    UInt8(u8),
+    UInt16(u16),
+    UInt32(u32),
+    UInt64(u64),
+    Float16(f32), // f16 converted to f32
+    Float32(f32),
+    Float64(f64),
+    Boolean(bool),
+    String(String),
+    Bytes(Vec<u8>),
+    Date32(i32),
+    Date64(i64),
+    TimestampSecond(i64, Option<Arc<str>>),
+    TimestampMillis(i64, Option<Arc<str>>),
+    TimestampMicros(i64, Option<Arc<str>>),
+    TimestampNanos(i64, Option<Arc<str>>),
+    List(Vec<ParquetValue>),
+    Map(HashMap<ParquetValue, ParquetValue>),
+    Null,
+}
+
+impl PartialEq for ParquetValue {
+    fn eq(&self, other: &Self) -> bool {
+        match (self, other) {
+            (ParquetValue::Int8(a), ParquetValue::Int8(b)) => a == b,
+            (ParquetValue::Int16(a), ParquetValue::Int16(b)) => a == b,
+            (ParquetValue::Int32(a), ParquetValue::Int32(b)) => a == b,
+            (ParquetValue::Int64(a), ParquetValue::Int64(b)) => a == b,
+            (ParquetValue::UInt8(a), ParquetValue::UInt8(b)) => a == b,
+            (ParquetValue::UInt16(a), ParquetValue::UInt16(b)) => a == b,
+            (ParquetValue::UInt32(a), ParquetValue::UInt32(b)) => a == b,
+            (ParquetValue::UInt64(a), ParquetValue::UInt64(b)) => a == b,
+            (ParquetValue::Float16(a), ParquetValue::Float16(b)) => a == b,
+            (ParquetValue::Float32(a), ParquetValue::Float32(b)) => a == b,
+            (ParquetValue::Float64(a), ParquetValue::Float64(b)) => a == b,
+            (ParquetValue::Boolean(a), ParquetValue::Boolean(b)) => a == b,
+            (ParquetValue::String(a), ParquetValue::String(b)) => a == b,
+            (ParquetValue::Bytes(a), ParquetValue::Bytes(b)) => a == b,
+            (ParquetValue::Date32(a), ParquetValue::Date32(b)) => a == b,
+            (ParquetValue::Date64(a), ParquetValue::Date64(b)) => a == b,
+            (ParquetValue::TimestampSecond(a, _), ParquetValue::TimestampSecond(b, _)) => a == b,
+            (ParquetValue::TimestampMillis(a, _), ParquetValue::TimestampMillis(b, _)) => a == b,
+            (ParquetValue::TimestampMicros(a, _), ParquetValue::TimestampMicros(b, _)) => a == b,
+            (ParquetValue::TimestampNanos(a, _), ParquetValue::TimestampNanos(b, _)) => a == b,
+            (ParquetValue::List(a), ParquetValue::List(b)) => a == b,
+            (ParquetValue::Null, ParquetValue::Null) => true,
+            _ => false,
+        }
+    }
+}
+
+impl Eq for ParquetValue {}
+
+#[derive(Debug)]
+pub struct ParquetValueVec(Vec<ParquetValue>);
+
+impl ParquetValueVec {
+    pub fn into_inner(self) -> Vec<ParquetValue> {
+        self.0
+    }
+}
+
+impl IntoIterator for ParquetValueVec {
+    type Item = ParquetValue;
+    type IntoIter = std::vec::IntoIter<ParquetValue>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.0.into_iter()
+    }
+}
+
+impl std::cmp::PartialEq for ParquetValueVec {
+    fn eq(&self, other: &Self) -> bool {
+        self.0 == other.0
+    }
+}
+
+impl std::cmp::Eq for ParquetValueVec {}
+
+impl TryFrom<Arc<dyn Array>> for ParquetValueVec {
+    type Error = String;
+
+    fn try_from(column: Arc<dyn Array>) -> Result<Self, Self::Error> {
+        ParquetValueVec::try_from(&*column)
+    }
+}
+
+// Add macro for handling numeric array conversions
+macro_rules! impl_numeric_array_conversion {
+    ($column:expr, $array_type:ty, $variant:ident) => {{
+        let array = downcast_array::<$array_type>($column);
+        if array.is_nullable() {
+            array
+                .values()
+                .iter()
+                .enumerate()
+                .map(|(i, x)| {
+                    if array.is_null(i) {
+                        ParquetValue::Null
+                    } else {
+                        ParquetValue::$variant(*x)
+                    }
+                })
+                .collect()
+        } else {
+            array
+                .values()
+                .iter()
+                .map(|x| ParquetValue::$variant(*x))
+                .collect()
+        }
+    }};
+}
+
+// Add macro for handling boolean array conversions
+macro_rules! impl_boolean_array_conversion {
+    ($column:expr, $array_type:ty, $variant:ident) => {{
+        let array = downcast_array::<$array_type>($column);
+        if array.is_nullable() {
+            array
+                .values()
+                .iter()
+                .enumerate()
+                .map(|(i, x)| {
+                    if array.is_null(i) {
+                        ParquetValue::Null
+                    } else {
+                        ParquetValue::$variant(x)
+                    }
+                })
+                .collect()
+        } else {
+            array
+                .values()
+                .iter()
+                .map(|x| ParquetValue::$variant(x))
+                .collect()
+        }
+    }};
+}
+
+// Add macro for handling timestamp array conversions
+macro_rules! impl_timestamp_array_conversion {
+    ($column:expr, $array_type:ty, $variant:ident, $tz:expr) => {{
+        let array = downcast_array::<$array_type>($column);
+        if array.is_nullable() {
+            array
+                .values()
+                .iter()
+                .enumerate()
+                .map(|(i, x)| {
+                    if array.is_null(i) {
+                        ParquetValue::Null
+                    } else {
+                        ParquetValue::$variant(*x, $tz.clone())
+                    }
+                })
+                .collect()
+        } else {
+            array
+                .values()
+                .iter()
+                .map(|x| ParquetValue::$variant(*x, $tz.clone()))
+                .collect()
+        }
+    }};
+}
+
+impl TryFrom<&dyn Array> for ParquetValueVec {
+    type Error = String;
+
+    fn try_from(column: &dyn Array) -> Result<Self, Self::Error> {
+        let tmp_vec = match column.data_type() {
+            DataType::Boolean => impl_boolean_array_conversion!(column, BooleanArray, Boolean),
+            DataType::Int8 => impl_numeric_array_conversion!(column, Int8Array, Int8),
+            DataType::Int16 => impl_numeric_array_conversion!(column, Int16Array, Int16),
+            DataType::Int32 => impl_numeric_array_conversion!(column, Int32Array, Int32),
+            DataType::Int64 => impl_numeric_array_conversion!(column, Int64Array, Int64),
+            DataType::UInt8 => impl_numeric_array_conversion!(column, UInt8Array, UInt8),
+            DataType::UInt16 => impl_numeric_array_conversion!(column, UInt16Array, UInt16),
+            DataType::UInt32 => impl_numeric_array_conversion!(column, UInt32Array, UInt32),
+            DataType::UInt64 => impl_numeric_array_conversion!(column, UInt64Array, UInt64),
+            DataType::Float32 => impl_numeric_array_conversion!(column, Float32Array, Float32),
+            DataType::Float64 => impl_numeric_array_conversion!(column, Float64Array, Float64),
+            DataType::Date32 => impl_numeric_array_conversion!(column, Date32Array, Date32),
+            DataType::Date64 => impl_numeric_array_conversion!(column, Date64Array, Date64),
+            DataType::Timestamp(TimeUnit::Second, tz) => {
+                impl_timestamp_array_conversion!(column, TimestampSecondArray, TimestampSecond, tz)
+            }
+            DataType::Timestamp(TimeUnit::Millisecond, tz) => {
+                impl_timestamp_array_conversion!(
+                    column,
+                    TimestampMillisecondArray,
+                    TimestampMillis,
+                    tz
+                )
+            }
+            DataType::Timestamp(TimeUnit::Microsecond, tz) => {
+                impl_timestamp_array_conversion!(
+                    column,
+                    TimestampMicrosecondArray,
+                    TimestampMicros,
+                    tz
+                )
+            }
+            DataType::Timestamp(TimeUnit::Nanosecond, tz) => {
+                impl_timestamp_array_conversion!(
+                    column,
+                    TimestampNanosecondArray,
+                    TimestampNanos,
+                    tz
+                )
+            }
+            // Because f16 is unstable in Rust, we convert it to f32
+            DataType::Float16 => {
+                let array = downcast_array::<Float16Array>(column);
+                if array.is_nullable() {
+                    array
+                        .values()
+                        .iter()
+                        .enumerate()
+                        .map(|(i, x)| {
+                            if array.is_null(i) {
+                                ParquetValue::Null
+                            } else {
+                                ParquetValue::Float16(f32::from(*x))
+                            }
+                        })
+                        .collect()
+                } else {
+                    array
+                        .values()
+                        .iter()
+                        .map(|x| ParquetValue::Float16(f32::from(*x)))
+                        .collect()
+                }
+            }
+            DataType::Utf8 => {
+                let array = downcast_array::<StringArray>(column);
+                array
+                    .iter()
+                    .map(|opt_x| match opt_x {
+                        Some(x) => ParquetValue::String(x.to_string()),
+                        None => ParquetValue::Null,
+                    })
+                    .collect()
+            }
+            DataType::Binary => {
+                let array = downcast_array::<BinaryArray>(column);
+                array
+                    .iter()
+                    .map(|opt_x| match opt_x {
+                        Some(x) => ParquetValue::Bytes(x.to_vec()),
+                        None => ParquetValue::Null,
+                    })
+                    .collect()
+            }
+            DataType::List(_field) => {
+                let list_array = downcast_array::<ListArray>(column);
+                list_array
+                    .iter()
+                    .map(|x| match x {
+                        Some(values) => match ParquetValueVec::try_from(values) {
+                            Ok(vec) => ParquetValue::List(vec.into_inner()),
+                            Err(e) => {
+                                panic!("Error converting list array to ParquetValueVec: {}", e)
+                            }
+                        },
+                        None => ParquetValue::Null,
+                    })
+                    .collect()
+            }
+            DataType::Struct(_) => {
+                let struct_array = downcast_array::<StructArray>(column);
+                let mut values = Vec::with_capacity(struct_array.len());
+                for i in 0..struct_array.len() {
+                    if struct_array.is_null(i) {
+                        values.push(ParquetValue::Null);
+                        continue;
+                    }
+
+                    let mut map = std::collections::HashMap::new();
+                    for (field_idx, field) in struct_array.fields().iter().enumerate() {
+                        let column = struct_array.column(field_idx);
+                        let field_values = match ParquetValueVec::try_from(column.slice(i, 1)) {
+                            Ok(vec) => vec.into_inner(),
+                            Err(e) => {
+                                panic!("Error converting struct field to ParquetValueVec: {}", e)
+                            }
+                        };
+                        map.insert(
+                            ParquetValue::String(field.name().to_string()),
+                            field_values.into_iter().next().unwrap(),
+                        );
+                    }
+                    values.push(ParquetValue::Map(map));
+                }
+                values
+            }
+            DataType::Null => {
+                let x = downcast_array::<NullArray>(column);
+                vec![ParquetValue::Null; x.len()]
+            }
+            _ => {
+                return Err(format!("Unsupported data type: {:?}", column.data_type()));
+            }
+        };
+        Ok(ParquetValueVec(tmp_vec))
+    }
+}
+
+impl std::hash::Hash for ParquetValue {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        match self {
+            ParquetValue::Int8(i) => i.hash(state),
+            ParquetValue::Int16(i) => i.hash(state),
+            ParquetValue::Int32(i) => i.hash(state),
+            ParquetValue::Int64(i) => i.hash(state),
+            ParquetValue::UInt8(i) => i.hash(state),
+            ParquetValue::UInt16(i) => i.hash(state),
+            ParquetValue::UInt32(i) => i.hash(state),
+            ParquetValue::UInt64(i) => i.hash(state),
+            ParquetValue::Float16(f) => f.to_bits().hash(state),
+            ParquetValue::Float32(f) => f.to_bits().hash(state),
+            ParquetValue::Float64(f) => f.to_bits().hash(state),
+            ParquetValue::Boolean(b) => b.hash(state),
+            ParquetValue::String(s) => s.hash(state),
+            ParquetValue::Bytes(b) => b.hash(state),
+            ParquetValue::Date32(d) => d.hash(state),
+            ParquetValue::Date64(d) => d.hash(state),
+            ParquetValue::TimestampSecond(ts, tz) => {
+                ts.hash(state);
+                tz.hash(state);
+            }
+            ParquetValue::TimestampMillis(ts, tz) => {
+                ts.hash(state);
+                tz.hash(state);
+            }
+            ParquetValue::TimestampMicros(ts, tz) => {
+                ts.hash(state);
+                tz.hash(state);
+            }
+            ParquetValue::TimestampNanos(ts, tz) => {
+                ts.hash(state);
+                tz.hash(state);
+            }
+            ParquetValue::List(l) => l.hash(state),
+            ParquetValue::Map(_m) => panic!("Map is not hashable"),
+            ParquetValue::Null => 0_i32.hash(state),
+        }
+    }
+}
+
+impl IntoValue for ParquetValue {
+    fn into_value_with(self, handle: &Ruby) -> Value {
+        match self {
+            ParquetValue::Int8(i) => i.into_value_with(handle),
+            ParquetValue::Int16(i) => i.into_value_with(handle),
+            ParquetValue::Int32(i) => i.into_value_with(handle),
+            ParquetValue::Int64(i) => i.into_value_with(handle),
+            ParquetValue::UInt8(i) => i.into_value_with(handle),
+            ParquetValue::UInt16(i) => i.into_value_with(handle),
+            ParquetValue::UInt32(i) => i.into_value_with(handle),
+            ParquetValue::UInt64(i) => i.into_value_with(handle),
+            ParquetValue::Float16(f) => f.into_value_with(handle),
+            ParquetValue::Float32(f) => f.into_value_with(handle),
+            ParquetValue::Float64(f) => f.into_value_with(handle),
+            ParquetValue::Boolean(b) => b.into_value_with(handle),
+            ParquetValue::String(s) => s.into_value_with(handle),
+            ParquetValue::Bytes(b) => b.into_value_with(handle),
+            ParquetValue::Date32(d) => {
+                let ts = jiff::Timestamp::from_second((d as i64) * 86400).unwrap();
+                let formatted = ts.strftime("%Y-%m-%d").to_string();
+                formatted.into_value_with(handle)
+            }
+            ParquetValue::Date64(d) => {
+                let ts = jiff::Timestamp::from_second((d as i64) * 86400).unwrap();
+                let formatted = ts.strftime("%Y-%m-%d").to_string();
+                formatted.into_value_with(handle)
+            }
+            ParquetValue::TimestampSecond(ts, tz) => {
+                let ts = parse_zoned_timestamp(&ParquetValue::TimestampSecond(ts, tz));
+                let time_class = handle.class_time();
+                time_class
+                    .funcall::<_, _, Value>("parse", (ts.to_string(),))
+                    .unwrap()
+                    .into_value_with(handle)
+            }
+            ParquetValue::TimestampMillis(ts, tz) => {
+                let ts = parse_zoned_timestamp(&ParquetValue::TimestampMillis(ts, tz));
+                let time_class = handle.class_time();
+                time_class
+                    .funcall::<_, _, Value>("parse", (ts.to_string(),))
+                    .unwrap()
+                    .into_value_with(handle)
+            }
+            ParquetValue::TimestampMicros(ts, tz) => {
+                let ts = parse_zoned_timestamp(&ParquetValue::TimestampMicros(ts, tz));
+                let time_class = handle.class_time();
+                time_class
+                    .funcall::<_, _, Value>("parse", (ts.to_string(),))
+                    .unwrap()
+                    .into_value_with(handle)
+            }
+            ParquetValue::TimestampNanos(ts, tz) => {
+                let ts = parse_zoned_timestamp(&ParquetValue::TimestampNanos(ts, tz));
+                let time_class = handle.class_time();
+                time_class
+                    .funcall::<_, _, Value>("parse", (ts.to_string(),))
+                    .unwrap()
+                    .into_value_with(handle)
+            }
+            ParquetValue::List(l) => {
+                let ary = handle.ary_new_capa(l.len());
+                l.into_iter()
+                    .try_for_each(|v| ary.push(v.into_value_with(handle)))
+                    .unwrap();
+                ary.into_value_with(handle)
+            }
+            ParquetValue::Map(m) => {
+                let hash = handle.hash_new_capa(m.len());
+                m.into_iter()
+                    .try_for_each(|(k, v)| {
+                        hash.aset(k.into_value_with(handle), v.into_value_with(handle))
+                    })
+                    .unwrap();
+                hash.into_value_with(handle)
+            }
+            ParquetValue::Null => handle.qnil().as_value(),
+        }
+    }
+}
+
+fn parse_zoned_timestamp(value: &ParquetValue) -> jiff::Timestamp {
+    let (ts, tz) = match value {
+        ParquetValue::TimestampSecond(ts, tz) => (jiff::Timestamp::from_second(*ts).unwrap(), tz),
+        ParquetValue::TimestampMillis(ts, tz) => {
+            (jiff::Timestamp::from_millisecond(*ts).unwrap(), tz)
+        }
+        ParquetValue::TimestampMicros(ts, tz) => {
+            (jiff::Timestamp::from_microsecond(*ts).unwrap(), tz)
+        }
+        ParquetValue::TimestampNanos(ts, tz) => {
+            (jiff::Timestamp::from_nanosecond(*ts as i128).unwrap(), tz)
+        }
+        _ => panic!("Invalid timestamp value"),
+    };
+
+    // If timezone is provided, convert to zoned timestamp
+    if let Some(tz) = tz {
+        // Handle fixed offset timezones like "+09:00" first
+        if tz.starts_with('+') || tz.starts_with('-') {
+            // Parse the offset string into hours and minutes
+            let (hours, minutes) = if tz.len() >= 5 && tz.contains(':') {
+                // Format: "+09:00" or "-09:00"
+                let h = tz[1..3].parse::<i32>().unwrap_or(0);
+                let m = tz[4..6].parse::<i32>().unwrap_or(0);
+                (h, m)
+            } else if tz.len() >= 3 {
+                // Format: "+09" or "-09"
+                let h = tz[1..3].parse::<i32>().unwrap_or(0);
+                (h, 0)
+            } else {
+                (0, 0)
+            };
+
+            // Apply sign
+            let total_minutes = if tz.starts_with('-') {
+                -(hours * 60 + minutes)
+            } else {
+                hours * 60 + minutes
+            };
+
+            // Create fixed timezone
+            let tz = jiff::tz::TimeZone::fixed(jiff::tz::offset((total_minutes / 60) as i8));
+            ts.to_zoned(tz).timestamp()
+        } else {
+            // Try IANA timezone
+            match ts.intz(&tz) {
+                Ok(zoned) => zoned.timestamp(),
+                Err(_) => ts, // Fall back to UTC if timezone is invalid
+            }
         }
+    } else {
+        // No timezone provided - treat as UTC
+        ts
     }
 }