Skip to content
This repository has been archived by the owner on Feb 18, 2024. It is now read-only.

Added support for timestamps with tz and interval to io::print::write #287

Merged
merged 2 commits into from
Aug 14, 2021
Merged

Added support for timestamps with tz and interval to io::print::write #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3fea5b
Added display of tz and interval.
jorgecarleitao Aug 14, 2021
94d01c2
Simplified code.
jorgecarleitao Aug 14, 2021
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
2 changes: 1 addition & 1 deletion examples/ipc_file_read.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ fn main() -> Result<()> {
let file_path = &args[1];

let batches = read_batches(file_path)?;
print::print(&batches)?;
print::print(&batches);
Ok(())
}
107 changes: 74 additions & 33 deletions src/array/display.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use crate::{
array::*,
datatypes::{DataType, IntervalUnit, TimeUnit},
error::{ArrowError, Result},
temporal_conversions,
};

Expand All @@ -25,18 +24,16 @@ macro_rules! dyn_dict {
.downcast_ref::<DictionaryArray<$ty>>()
.unwrap();
let keys = a.keys();
let display = get_value_display(a.values().as_ref())?;
let display = get_value_display(a.values().as_ref());
Box::new(move |row: usize| display(keys.value(row) as usize))
}};
}

/// Returns a function of index returning the string representation of the _value_ of `array`.
/// This does not take nulls into account.
/// # Errors
/// This function errors iff the datatype is not yet supported for printing.
pub fn get_value_display<'a>(array: &'a dyn Array) -> Result<Box<dyn Fn(usize) -> String + 'a>> {
pub fn get_value_display<'a>(array: &'a dyn Array) -> Box<dyn Fn(usize) -> String + 'a> {
use DataType::*;
Ok(match array.data_type() {
match array.data_type() {
Null => Box::new(|_: usize| "".to_string()),
Boolean => {
let a = array.as_any().downcast_ref::<BooleanArray>().unwrap();
Expand All @@ -61,32 +58,76 @@ pub fn get_value_display<'a>(array: &'a dyn Array) -> Result<Box<dyn Fn(usize) -
Time32(TimeUnit::Millisecond) => {
dyn_primitive!(array, i32, temporal_conversions::time32ms_to_time)
}
Time32(_) => unreachable!(), // remaining are not valid
Time64(TimeUnit::Microsecond) => {
dyn_primitive!(array, i64, temporal_conversions::time64us_to_time)
}
Time64(TimeUnit::Nanosecond) => {
dyn_primitive!(array, i64, temporal_conversions::time64ns_to_time)
}
Timestamp(TimeUnit::Second, None) => {
dyn_primitive!(array, i64, temporal_conversions::timestamp_s_to_datetime)
}
Timestamp(TimeUnit::Millisecond, None) => {
dyn_primitive!(array, i64, temporal_conversions::timestamp_ms_to_datetime)
}
Timestamp(TimeUnit::Microsecond, None) => {
dyn_primitive!(array, i64, temporal_conversions::timestamp_us_to_datetime)
}
Timestamp(TimeUnit::Nanosecond, None) => {
dyn_primitive!(array, i64, temporal_conversions::timestamp_ns_to_datetime)
}
Timestamp(_, _) => {
return Err(ArrowError::NotYetImplemented(
"Priting of timestamps with timezones is not yet implemented.".to_string(),
))
Time64(_) => unreachable!(), // remaining are not valid
Timestamp(TimeUnit::Second, tz) => {
if let Some(tz) = tz {
dyn_primitive!(array, i64, |x| {
format!(
"{} {}",
temporal_conversions::timestamp_s_to_datetime(x),
tz
)
})
} else {
dyn_primitive!(array, i64, temporal_conversions::timestamp_s_to_datetime)
}
}
Timestamp(TimeUnit::Millisecond, tz) => {
if let Some(tz) = tz {
dyn_primitive!(array, i64, |x| {
format!(
"{} {}",
temporal_conversions::timestamp_ms_to_datetime(x),
tz
)
})
} else {
dyn_primitive!(array, i64, temporal_conversions::timestamp_ms_to_datetime)
}
}
Timestamp(TimeUnit::Microsecond, tz) => {
if let Some(tz) = tz {
dyn_primitive!(array, i64, |x| {
format!(
"{} {}",
temporal_conversions::timestamp_us_to_datetime(x),
tz
)
})
} else {
dyn_primitive!(array, i64, temporal_conversions::timestamp_us_to_datetime)
}
}
Timestamp(TimeUnit::Nanosecond, tz) => {
if let Some(tz) = tz {
dyn_primitive!(array, i64, |x| {
format!(
"{} {}",
temporal_conversions::timestamp_ns_to_datetime(x),
tz
)
})
} else {
dyn_primitive!(array, i64, temporal_conversions::timestamp_ns_to_datetime)
}
}
Interval(IntervalUnit::YearMonth) => {
dyn_primitive!(array, i32, |x| format!("{}m", x))
}
Interval(IntervalUnit::DayTime) => {
dyn_primitive!(array, days_ms, |x: days_ms| format!(
"{}d{}ms",
x.days(),
x.milliseconds()
))
}
Duration(TimeUnit::Second) => dyn_primitive!(array, i64, |x| format!("{}s", x)),
Duration(TimeUnit::Millisecond) => dyn_primitive!(array, i64, |x| format!("{}ms", x)),
Duration(TimeUnit::Microsecond) => dyn_primitive!(array, i64, |x| format!("{}us", x)),
Expand Down Expand Up @@ -123,29 +164,29 @@ pub fn get_value_display<'a>(array: &'a dyn Array) -> Result<Box<dyn Fn(usize) -
}
List(_) => {
let f = |x: Box<dyn Array>| {
let display = get_value_display(x.as_ref()).unwrap();
let display = get_value_display(x.as_ref());
let string_values = (0..x.len()).map(|i| display(i)).collect::<Vec<String>>();
format!("[{}]", string_values.join(", "))
};
dyn_display!(array, ListArray<i32>, f)
}
FixedSizeList(_, _) => {
let f = |x: Box<dyn Array>| {
let display = get_value_display(x.as_ref()).unwrap();
let display = get_value_display(x.as_ref());
let string_values = (0..x.len()).map(|i| display(i)).collect::<Vec<String>>();
format!("[{}]", string_values.join(", "))
};
dyn_display!(array, FixedSizeListArray, f)
}
LargeList(_) => {
let f = |x: Box<dyn Array>| {
let display = get_value_display(x.as_ref()).unwrap();
let display = get_value_display(x.as_ref());
let string_values = (0..x.len()).map(|i| display(i)).collect::<Vec<String>>();
format!("[{}]", string_values.join(", "))
};
dyn_display!(array, ListArray<i64>, f)
}
DataType::Dictionary(key_type, _) => match key_type.as_ref() {
Dictionary(key_type, _) => match key_type.as_ref() {
DataType::Int8 => dyn_dict!(array, i8),
DataType::Int16 => dyn_dict!(array, i16),
DataType::Int32 => dyn_dict!(array, i32),
Expand All @@ -162,7 +203,7 @@ pub fn get_value_display<'a>(array: &'a dyn Array) -> Result<Box<dyn Fn(usize) -
.values()
.iter()
.map(|x| get_value_display(x.as_ref()))
.collect::<Result<Vec<_>>>()?;
.collect::<Vec<_>>();
Box::new(move |row: usize| {
let mut string = displays
.iter()
Expand All @@ -181,19 +222,19 @@ pub fn get_value_display<'a>(array: &'a dyn Array) -> Result<Box<dyn Fn(usize) -
string
})
}
_ => unreachable!(),
})
Union(_) => todo!(),
}
}

/// Returns a function of index returning the string representation of the item of `array`.
/// This outputs an empty string on nulls.
pub fn get_display<'a>(array: &'a dyn Array) -> Result<Box<dyn Fn(usize) -> String + 'a>> {
let value_display = get_value_display(array)?;
Ok(Box::new(move |row| {
pub fn get_display<'a>(array: &'a dyn Array) -> Box<dyn Fn(usize) -> String + 'a> {
let value_display = get_value_display(array);
Box::new(move |row| {
if array.is_null(row) {
"".to_string()
} else {
value_display(row)
}
}))
})
}
Loading