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: support cast negative numbet to decimal #5130

Closed
wants to merge 3 commits into from
Closed

fix: support cast negative numbet to decimal #5130

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ecf306a
Refactor decimal formatting logic to handle
Weijun-H Nov 27, 2023
d5e710e
chore
Weijun-H Nov 27, 2023
e4ebcaa
simplify logic
Weijun-H Nov 27, 2023
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
187 changes: 176 additions & 11 deletions arrow-cast/src/cast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2634,8 +2634,16 @@ where
T::Native: DecimalCast + ArrowNativeTypeOp,
{
let value_str = value_str.trim();
let parts: Vec<&str> = value_str.split('.').collect();
if parts.len() > 2 {

let negative = value_str.starts_with('-');

let parts: Vec<&str> = if negative {
value_str[1..].split('.').collect()
} else {
value_str.split('.').collect()
};

if parts.len() > 2 || parts[0].starts_with('+') || parts[0].starts_with('-') {
return Err(ArrowError::InvalidArgumentError(format!(
"Invalid decimal format: {value_str:?}"
)));
Expand All @@ -2645,7 +2653,7 @@ where
let decimals = if parts.len() == 2 { parts[1] } else { "" };

// Adjust decimal based on scale
let number_decimals = if decimals.len() > scale {
let mut number_decimals = if decimals.len() > scale {
let decimal_number = i256::from_string(decimals).ok_or_else(|| {
ArrowError::InvalidArgumentError(format!("Cannot parse decimal format: {value_str}"))
})?;
Expand Down Expand Up @@ -2682,9 +2690,14 @@ where
let padding = if scale > decimals.len() { scale } else { 0 };

let decimals = format!("{decimals:0<padding$}");

format!("{integers}{decimals}")
};

if negative {
number_decimals.insert(0, '-');
}

let value = i256::from_string(number_decimals.as_str()).ok_or_else(|| {
ArrowError::InvalidArgumentError(format!(
"Cannot convert {} to {}: Overflow",
Expand Down Expand Up @@ -8220,6 +8233,95 @@ mod tests {
),
"0.127"
);
assert_eq!(
Decimal128Type::format_decimal(
parse_string_to_decimal_native::<Decimal128Type>("-123.45", 2).unwrap(),
38,
2,
),
"-123.45"
);
assert_eq!(
Decimal128Type::format_decimal(
parse_string_to_decimal_native::<Decimal128Type>("-12345", 2).unwrap(),
38,
2,
),
"-12345.00"
);
assert_eq!(
Decimal128Type::format_decimal(
parse_string_to_decimal_native::<Decimal128Type>("-0.12345", 2).unwrap(),
38,
2,
),
"-0.12"
);
assert_eq!(
Decimal128Type::format_decimal(
parse_string_to_decimal_native::<Decimal128Type>("-.12345", 2).unwrap(),
38,
2,
),
"-0.12"
);
assert_eq!(
Decimal128Type::format_decimal(
parse_string_to_decimal_native::<Decimal128Type>("-.1265", 2).unwrap(),
38,
2,
),
"-0.13"
);
assert_eq!(
Decimal128Type::format_decimal(
parse_string_to_decimal_native::<Decimal128Type>("-.1265", 2).unwrap(),
38,
2,
),
"-0.13"
);

assert_eq!(
Decimal256Type::format_decimal(
parse_string_to_decimal_native::<Decimal256Type>("-123.45", 3).unwrap(),
38,
3,
),
"-123.450"
);
assert_eq!(
Decimal256Type::format_decimal(
parse_string_to_decimal_native::<Decimal256Type>("-12345", 3).unwrap(),
38,
3,
),
"-12345.000"
);
assert_eq!(
Decimal256Type::format_decimal(
parse_string_to_decimal_native::<Decimal256Type>("-0.12345", 3).unwrap(),
38,
3,
),
"-0.123"
);
assert_eq!(
Decimal256Type::format_decimal(
parse_string_to_decimal_native::<Decimal256Type>("-.12345", 3).unwrap(),
38,
3,
),
"-0.123"
);
assert_eq!(
Decimal256Type::format_decimal(
parse_string_to_decimal_native::<Decimal256Type>("-.1265", 3).unwrap(),
38,
3,
),
"-0.127"
);
}

fn test_cast_string_to_decimal(array: ArrayRef) {
Expand All @@ -8239,10 +8341,21 @@ mod tests {
assert_eq!("12345.00", decimal_arr.value_as_string(6));
assert_eq!("0.12", decimal_arr.value_as_string(7));
assert_eq!("12.23", decimal_arr.value_as_string(8));
assert!(decimal_arr.is_null(9));
assert_eq!("0.00", decimal_arr.value_as_string(10));
assert_eq!("0.00", decimal_arr.value_as_string(11));
assert!(decimal_arr.is_null(12));
// for negative numbers
assert_eq!("-123.45", decimal_arr.value_as_string(9));
assert_eq!("-1.23", decimal_arr.value_as_string(10));
assert_eq!("-0.12", decimal_arr.value_as_string(11));
assert_eq!("-0.13", decimal_arr.value_as_string(12));
assert_eq!("-1.26", decimal_arr.value_as_string(13));
assert_eq!("-12345.00", decimal_arr.value_as_string(14));
assert_eq!("-12345.00", decimal_arr.value_as_string(15));
assert_eq!("-0.12", decimal_arr.value_as_string(16));
assert_eq!("-12.23", decimal_arr.value_as_string(17));
// for null values
assert!(decimal_arr.is_null(18));
assert_eq!("0.00", decimal_arr.value_as_string(19));
assert_eq!("0.00", decimal_arr.value_as_string(20));
assert!(decimal_arr.is_null(21));

// Decimal256
let output_type = DataType::Decimal256(76, 3);
Expand All @@ -8260,10 +8373,21 @@ mod tests {
assert_eq!("12345.000", decimal_arr.value_as_string(6));
assert_eq!("0.123", decimal_arr.value_as_string(7));
assert_eq!("12.234", decimal_arr.value_as_string(8));
assert!(decimal_arr.is_null(9));
assert_eq!("0.000", decimal_arr.value_as_string(10));
assert_eq!("0.000", decimal_arr.value_as_string(11));
assert!(decimal_arr.is_null(12));
// for negative numbers
assert_eq!("-123.450", decimal_arr.value_as_string(9));
assert_eq!("-1.235", decimal_arr.value_as_string(10));
assert_eq!("-0.123", decimal_arr.value_as_string(11));
assert_eq!("-0.127", decimal_arr.value_as_string(12));
assert_eq!("-1.263", decimal_arr.value_as_string(13));
assert_eq!("-12345.000", decimal_arr.value_as_string(14));
assert_eq!("-12345.000", decimal_arr.value_as_string(15));
assert_eq!("-0.123", decimal_arr.value_as_string(16));
assert_eq!("-12.234", decimal_arr.value_as_string(17));
// for null values
assert!(decimal_arr.is_null(18));
assert_eq!("0.000", decimal_arr.value_as_string(19));
assert_eq!("0.000", decimal_arr.value_as_string(20));
assert!(decimal_arr.is_null(21));
}

#[test]
Expand All @@ -8278,6 +8402,15 @@ mod tests {
Some("12345"),
Some("000.123"),
Some("12.234000"),
Some("-123.45"),
Some("-1.2345"),
Some("-0.12345"),
Some("-0.1267"),
Some("-1.263"),
Some("-12345.0"),
Some("-12345"),
Some("-000.123"),
Some("-12.234000"),
None,
Some(""),
Some(" "),
Expand All @@ -8300,6 +8433,15 @@ mod tests {
Some("12345"),
Some("000.123"),
Some("12.234000"),
Some("-123.45"),
Some("-1.2345"),
Some("-0.12345"),
Some("-0.1267"),
Some("-1.263"),
Some("-12345.0"),
Some("-12345"),
Some("-000.123"),
Some("-12.234000"),
None,
Some(""),
Some(" "),
Expand Down Expand Up @@ -8947,6 +9089,29 @@ mod tests {
.cloned()
}

#[test]
fn test() {
let array = LargeStringArray::from(vec![Some("-0.12345")]);

// Decimal128
let output_type = DataType::Decimal128(38, 2);
assert!(can_cast_types(array.data_type(), &output_type));

let casted_array = cast(&array, &output_type).unwrap();
let decimal_arr = casted_array.as_primitive::<Decimal128Type>();

assert_eq!("-0.12", decimal_arr.value_as_string(0));

// Decimal256
let output_type = DataType::Decimal256(76, 3);
assert!(can_cast_types(array.data_type(), &output_type));

let casted_array = cast(&array, &output_type).unwrap();
let decimal_arr = casted_array.as_primitive::<Decimal256Type>();

assert_eq!("-0.123", decimal_arr.value_as_string(0));
}

#[test]
fn test_cast_from_interval_to_duration() {
let nullable = CastOptions::default();
Expand Down
Loading