Skip to content

Address decimal precision storage #198

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

Merged
pbower merged 4 commits into from
Sep 10, 2026
Merged

Address decimal precision storage #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b7741d
Fix decimal precision storage
pbower Sep 9, 2026
e4182d1
Update array.rs
pbower Sep 9, 2026
9ed0b57
Update arithmetic.rs
pbower Sep 9, 2026
dfb6ec6
Update table.rs
pbower Sep 9, 2026
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
12 changes: 6 additions & 6 deletions minarrow-py/src/convert.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,11 +628,11 @@ pub fn scalar_to_py(py: Python<'_>, scalar: Scalar) -> PyResult<Py<PyAny>> {
#[cfg(feature = "large_string")]
Scalar::String64(v) => v.into_py_any(py),
#[cfg(feature = "decimal")]
Scalar::Decimal32(v, scale) => decimal_scalar_to_py(py, v as i128, scale),
Scalar::Decimal32(v, _, scale) => decimal_scalar_to_py(py, v as i128, scale),
#[cfg(feature = "decimal")]
Scalar::Decimal64(v, scale) => decimal_scalar_to_py(py, v as i128, scale),
Scalar::Decimal64(v, _, scale) => decimal_scalar_to_py(py, v as i128, scale),
#[cfg(feature = "decimal")]
Scalar::Decimal128(v, scale) => decimal_scalar_to_py(py, v, scale),
Scalar::Decimal128(v, _, scale) => decimal_scalar_to_py(py, v, scale),
#[cfg(feature = "datetime")]
Scalar::Datetime32(v) => v.into_py_any(py),
#[cfg(feature = "datetime")]
Expand Down Expand Up @@ -668,11 +668,11 @@ pub fn scalar_repr(scalar: &Scalar) -> String {
#[cfg(feature = "large_string")]
Scalar::String64(v) => format!("\"{}\"", v),
#[cfg(feature = "decimal")]
Scalar::Decimal32(v, s) => format_decimal_string(*v as i128, *s),
Scalar::Decimal32(v, _, s) => format_decimal_string(*v as i128, *s),
#[cfg(feature = "decimal")]
Scalar::Decimal64(v, s) => format_decimal_string(*v as i128, *s),
Scalar::Decimal64(v, _, s) => format_decimal_string(*v as i128, *s),
#[cfg(feature = "decimal")]
Scalar::Decimal128(v, s) => format_decimal_string(*v, *s),
Scalar::Decimal128(v, _, s) => format_decimal_string(*v, *s),
#[cfg(feature = "datetime")]
Scalar::Datetime32(v) => v.to_string(),
#[cfg(feature = "datetime")]
Expand Down
12 changes: 6 additions & 6 deletions src/conversions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1438,16 +1438,16 @@ impl From<Scalar> for Array {
#[cfg(feature = "datetime")]
Interval => Array::from_int32(IntegerArray::from_slice(&[0i32])),
#[cfg(feature = "decimal")]
Decimal32(v, s) => Array::from_decimal32(
crate::DecimalArray::from_slice(&[v], 0, s),
Decimal32(v, p, s) => Array::from_decimal32(
crate::DecimalArray::from_slice(&[v], p, s),
),
#[cfg(feature = "decimal")]
Decimal64(v, s) => Array::from_decimal64(
crate::DecimalArray::from_slice(&[v], 0, s),
Decimal64(v, p, s) => Array::from_decimal64(
crate::DecimalArray::from_slice(&[v], p, s),
),
#[cfg(feature = "decimal")]
Decimal128(v, s) => Array::from_decimal128(
crate::DecimalArray::from_slice(&[v], 0, s),
Decimal128(v, p, s) => Array::from_decimal128(
crate::DecimalArray::from_slice(&[v], p, s),
),
}
}
Expand Down
36 changes: 20 additions & 16 deletions src/enums/array.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2535,11 +2535,11 @@ impl Array {
NumericArray::Float32(a) => Some(Scalar::Float32(a.data[idx])),
NumericArray::Float64(a) => Some(Scalar::Float64(a.data[idx])),
#[cfg(feature = "decimal")]
NumericArray::Decimal32(a) => Some(Scalar::Decimal32(a.data[idx], a.scale)),
NumericArray::Decimal32(a) => Some(Scalar::Decimal32(a.data[idx], a.precision, a.scale)),
#[cfg(feature = "decimal")]
NumericArray::Decimal64(a) => Some(Scalar::Decimal64(a.data[idx], a.scale)),
NumericArray::Decimal64(a) => Some(Scalar::Decimal64(a.data[idx], a.precision, a.scale)),
#[cfg(feature = "decimal")]
NumericArray::Decimal128(a) => Some(Scalar::Decimal128(a.data[idx], a.scale)),
NumericArray::Decimal128(a) => Some(Scalar::Decimal128(a.data[idx], a.precision, a.scale)),
NumericArray::Null => Some(Scalar::Null),
},
Array::TextArray(text) => match text {
Expand Down Expand Up @@ -3139,13 +3139,14 @@ impl Array {
))
}
#[cfg(feature = "decimal")]
Scalar::Decimal32(_, scale) => {
Scalar::Decimal32(_, precision, scale) => {
let precision = *precision;
let scale = *scale;
let mut data = Vec64::<i32>::with_capacity(scalars.len());
let mut mask = Bitmask::new_set_all(scalars.len(), true);
for (i, s) in scalars.iter().enumerate() {
match s {
Scalar::Decimal32(v, _) => data.push(*v),
Scalar::Decimal32(v, _, _) => data.push(*v),
Scalar::Null => {
data.push(0);
mask.set(i, false);
Expand All @@ -3157,18 +3158,19 @@ impl Array {
Array::from_decimal32(crate::DecimalArray::new(
data,
if has_nulls { Some(mask) } else { None },
0,
precision,
scale,
))
}
#[cfg(feature = "decimal")]
Scalar::Decimal64(_, scale) => {
Scalar::Decimal64(_, precision, scale) => {
let precision = *precision;
let scale = *scale;
let mut data = Vec64::<i64>::with_capacity(scalars.len());
let mut mask = Bitmask::new_set_all(scalars.len(), true);
for (i, s) in scalars.iter().enumerate() {
match s {
Scalar::Decimal64(v, _) => data.push(*v),
Scalar::Decimal64(v, _, _) => data.push(*v),
Scalar::Null => {
data.push(0);
mask.set(i, false);
Expand All @@ -3180,18 +3182,19 @@ impl Array {
Array::from_decimal64(crate::DecimalArray::new(
data,
if has_nulls { Some(mask) } else { None },
0,
precision,
scale,
))
}
#[cfg(feature = "decimal")]
Scalar::Decimal128(_, scale) => {
Scalar::Decimal128(_, precision, scale) => {
let precision = *precision;
let scale = *scale;
let mut data = Vec64::<i128>::with_capacity(scalars.len());
let mut mask = Bitmask::new_set_all(scalars.len(), true);
for (i, s) in scalars.iter().enumerate() {
match s {
Scalar::Decimal128(v, _) => data.push(*v),
Scalar::Decimal128(v, _, _) => data.push(*v),
Scalar::Null => {
data.push(0);
mask.set(i, false);
Expand All @@ -3203,7 +3206,7 @@ impl Array {
Array::from_decimal128(crate::DecimalArray::new(
data,
if has_nulls { Some(mask) } else { None },
0,
precision,
scale,
))
}
Expand Down Expand Up @@ -7393,8 +7396,9 @@ mod arr_macro_extensions_tests {
let arr = Array::from_decimal32(d);
let s = arr.get_scalar(0).unwrap();
match s {
crate::Scalar::Decimal32(v, scale) => {
crate::Scalar::Decimal32(v, precision, scale) => {
assert_eq!(v, 12345);
assert_eq!(precision, 9);
assert_eq!(scale, 2);
}
_ => panic!("expected Scalar::Decimal32"),
Expand All @@ -7404,21 +7408,21 @@ mod arr_macro_extensions_tests {
#[cfg(feature = "scalar_type")]
#[test]
fn scalar_decimal_display() {
let s = crate::Scalar::Decimal64(12345, 2);
let s = crate::Scalar::Decimal64(12345, 18, 2);
assert_eq!(format!("{}", s), "123.45");
}

#[cfg(feature = "scalar_type")]
#[test]
fn scalar_decimal_zero_scale() {
let s = crate::Scalar::Decimal128(42, 0);
let s = crate::Scalar::Decimal128(42, 38, 0);
assert_eq!(format!("{}", s), "42");
}

#[cfg(feature = "scalar_type")]
#[test]
fn scalar_decimal_negative_scale() {
let s = crate::Scalar::Decimal32(5, -2);
let s = crate::Scalar::Decimal32(5, 9, -2);
assert_eq!(format!("{}", s), "500");
}

Expand Down
Loading
Loading