Skip to content
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

fix: Materialize smallest dyn ints to use feature gate for i8/i16 #20108

Merged
merged 2 commits into from
Dec 3, 2024
Merged

fix: Materialize smallest dyn ints to use feature gate for i8/i16 #20108

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7a60ff
fix: Materialize smallest dyn ints to use feature gate for i8/i16
lukemanley Dec 2, 2024
edcd377
fix
lukemanley Dec 2, 2024
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
52 changes: 28 additions & 24 deletions crates/polars-core/src/utils/supertype.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,35 +465,39 @@ pub fn materialize_dyn_int(v: i128) -> AnyValue<'static> {
fn materialize_dyn_int_pos(v: i128) -> AnyValue<'static> {
// Try to get the "smallest" fitting value.
// TODO! next breaking go to true smallest.
match u8::try_from(v).ok() {
Some(v) => AnyValue::UInt8(v),
None => match u16::try_from(v).ok() {
Some(v) => AnyValue::UInt16(v),
None => match u32::try_from(v).ok() {
Some(v) => AnyValue::UInt32(v),
None => match u64::try_from(v).ok() {
Some(v) => AnyValue::UInt64(v),
None => AnyValue::Null,
},
},
#[cfg(feature = "dtype-u8")]
if let Ok(v) = u8::try_from(v) {
return AnyValue::UInt8(v);
}
#[cfg(feature = "dtype-u16")]
if let Ok(v) = u16::try_from(v) {
return AnyValue::UInt16(v);
}
match u32::try_from(v).ok() {
Some(v) => AnyValue::UInt32(v),
None => match u64::try_from(v).ok() {
Some(v) => AnyValue::UInt64(v),
None => AnyValue::Null,
},
}
}

fn materialize_smallest_dyn_int(v: i128) -> AnyValue<'static> {
match i8::try_from(v).ok() {
Some(v) => AnyValue::Int8(v),
None => match i16::try_from(v).ok() {
Some(v) => AnyValue::Int16(v),
None => match i32::try_from(v).ok() {
Some(v) => AnyValue::Int32(v),
None => match i64::try_from(v).ok() {
Some(v) => AnyValue::Int64(v),
None => match u64::try_from(v).ok() {
Some(v) => AnyValue::UInt64(v),
None => AnyValue::Null,
},
},
#[cfg(feature = "dtype-i8")]
if let Ok(v) = i8::try_from(v) {
return AnyValue::Int8(v);
}
#[cfg(feature = "dtype-i16")]
if let Ok(v) = i16::try_from(v) {
return AnyValue::Int16(v);
}
match i32::try_from(v).ok() {
Some(v) => AnyValue::Int32(v),
None => match i64::try_from(v).ok() {
Some(v) => AnyValue::Int64(v),
None => match u64::try_from(v).ok() {
Some(v) => AnyValue::UInt64(v),
None => AnyValue::Null,
},
},
}
Expand Down