Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2025-01-27 20:35:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Convert Filesize to Int (#14491)

Browse source 
# Description
Fixes the conversion of Value::Filesize to Value::Int allowing things
like `ps | polars into-df` to work correctly.
This commit is contained in:
Jack Wright 2024-12-03 04:08:41 -08:00 committed by GitHub
parent a70e77ba48
commit c63bb81c3e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 30 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/conversion.rs
View file

@ -34,28 +34,28 @@ const VALUES_CAPACITY: usize = 10;
macro_rules! value_to_primitive { macro_rules! value_to_primitive {
($value:ident, u8) => { ($value:ident, u8) => {
$value.as_int().map(|v| v as u8) value_to_int($value).map(|v| v as u8)
}; };
($value:ident, u16) => { ($value:ident, u16) => {
$value.as_int().map(|v| v as u16) value_to_int($value).map(|v| v as u16)
}; };
($value:ident, u32) => { ($value:ident, u32) => {
$value.as_int().map(|v| v as u32) value_to_int($value).map(|v| v as u32)
}; };
($value:ident, u64) => { ($value:ident, u64) => {
$value.as_int().map(|v| v as u64) value_to_int($value).map(|v| v as u64)
}; };
($value:ident, i8) => { ($value:ident, i8) => {
$value.as_int().map(|v| v as i8) value_to_int($value).map(|v| v as i8)
}; };
($value:ident, i16) => { ($value:ident, i16) => {
$value.as_int().map(|v| v as i16) value_to_int($value).map(|v| v as i16)
}; };
($value:ident, i32) => { ($value:ident, i32) => {
$value.as_int().map(|v| v as i32) value_to_int($value).map(|v| v as i32)
}; };
($value:ident, i64) => { ($value:ident, i64) => {
$value.as_int() value_to_int($value)
}; };
($value:ident, f32) => { ($value:ident, f32) => {
$value.as_float().map(|v| v as f32) $value.as_float().map(|v| v as f32)
@ -341,7 +341,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
let series_values: Result<Vec<_>, _> = column let series_values: Result<Vec<_>, _> = column
.values .values
.iter() .iter()
.map(|v| value_to_option(v, |v| v.as_int().map(|v| v as u8))) .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as u8)))
.collect(); .collect();
Ok(Series::new(name, series_values?)) Ok(Series::new(name, series_values?))
} }
@ -349,7 +349,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
let series_values: Result<Vec<_>, _> = column let series_values: Result<Vec<_>, _> = column
.values .values
.iter() .iter()
.map(|v| value_to_option(v, |v| v.as_int().map(|v| v as u16))) .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as u16)))
.collect(); .collect();
Ok(Series::new(name, series_values?)) Ok(Series::new(name, series_values?))
} }
@ -357,7 +357,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
let series_values: Result<Vec<_>, _> = column let series_values: Result<Vec<_>, _> = column
.values .values
.iter() .iter()
.map(|v| value_to_option(v, |v| v.as_int().map(|v| v as u32))) .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as u32)))
.collect(); .collect();
Ok(Series::new(name, series_values?)) Ok(Series::new(name, series_values?))
} }
@ -365,7 +365,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
let series_values: Result<Vec<_>, _> = column let series_values: Result<Vec<_>, _> = column
.values .values
.iter() .iter()
.map(|v| value_to_option(v, |v| v.as_int().map(|v| v as u64))) .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as u64)))
.collect(); .collect();
Ok(Series::new(name, series_values?)) Ok(Series::new(name, series_values?))
} }
@ -373,7 +373,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
let series_values: Result<Vec<_>, _> = column let series_values: Result<Vec<_>, _> = column
.values .values
.iter() .iter()
.map(|v| value_to_option(v, |v| v.as_int().map(|v| v as i8))) .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as i8)))
.collect(); .collect();
Ok(Series::new(name, series_values?)) Ok(Series::new(name, series_values?))
} }
@ -381,7 +381,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
let series_values: Result<Vec<_>, _> = column let series_values: Result<Vec<_>, _> = column
.values .values
.iter() .iter()
.map(|v| value_to_option(v, |v| v.as_int().map(|v| v as i16))) .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as i16)))
.collect(); .collect();
Ok(Series::new(name, series_values?)) Ok(Series::new(name, series_values?))
} }
@ -389,7 +389,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
let series_values: Result<Vec<_>, _> = column let series_values: Result<Vec<_>, _> = column
.values .values
.iter() .iter()
.map(|v| value_to_option(v, |v| v.as_int().map(|v| v as i32))) .map(|v| value_to_option(v, |v| value_to_int(v).map(|v| v as i32)))
.collect(); .collect();
Ok(Series::new(name, series_values?)) Ok(Series::new(name, series_values?))
} }
@ -397,7 +397,7 @@ fn typed_column_to_series(name: PlSmallStr, column: TypedColumn) -> Result<Serie
let series_values: Result<Vec<_>, _> = column let series_values: Result<Vec<_>, _> = column
.values .values
.iter() .iter()
.map(|v| value_to_option(v, |v| v.as_int())) .map(|v| value_to_option(v, value_to_int))
.collect(); .collect();
Ok(Series::new(name, series_values?)) Ok(Series::new(name, series_values?))
} }
@ -1364,6 +1364,20 @@ fn time_from_midnight(nanos: i64, span: Span) -> Result<Value, ShellError> {
}) })
} }
// this takes into non-int types that we should represent as int like filesize
fn value_to_int(value: &Value) -> Result<i64, ShellError> {
match value {
Value::Int { val, .. } => Ok(*val),
Value::Filesize { val, .. } => Ok((*val).into()),
_ => Err(ShellError::CantConvert {
to_type: "int".into(),
from_type: value.get_type().to_string(),
span: value.span(),
help: None,
}),
}
}
fn value_to_option<T, F>(value: &Value, func: F) -> Result<Option<T>, ShellError> fn value_to_option<T, F>(value: &Value, func: F) -> Result<Option<T>, ShellError>
where where
F: FnOnce(&Value) -> Result<T, ShellError>, F: FnOnce(&Value) -> Result<T, ShellError>,