Decimal DF scalar conversion

Author: AdamGS

vortex-datafusion/src/convert/scalars.rs

@@ -40,7 +40,29 @@ impl TryToDataFusion<ScalarValue> for Scalar {
                 let precision = decimal_type.precision();
                 let scale = decimal_type.scale();
 
-                if precision <= i128::MAX_PRECISION {
+                if precision <= i32::MAX_PRECISION {
+                    match dscalar.decimal_value() {
+                        None => ScalarValue::Decimal32(None, precision, scale),
+                        Some(DecimalValue::I32(v32)) => {
+                            ScalarValue::Decimal32(Some(v32), precision, scale)
+                        }
+                        _ => vortex_bail!(
+                            "invalid ScalarValue for decimal with precision {}",
+                            precision
+                        ),
+                    }
+                } else if precision <= i64::MAX_PRECISION {
+                    match dscalar.decimal_value() {
+                        None => ScalarValue::Decimal64(None, precision, scale),
+                        Some(DecimalValue::I64(v64)) => {
+                            ScalarValue::Decimal64(Some(v64), precision, scale)
+                        }
+                        _ => vortex_bail!(
+                            "invalid ScalarValue for decimal with precision {}",
+                            precision
+                        ),
+                    }
+                } else if precision <= i128::MAX_PRECISION {
                     match dscalar.decimal_value() {
                         None => ScalarValue::Decimal128(None, precision, scale),
                         Some(DecimalValue::I128(v128)) => {
@@ -210,6 +232,32 @@ impl FromDataFusion<ScalarValue> for Scalar {
                         .unwrap_or_else(vortex::scalar::ScalarValue::null),
                 )
             }
+            ScalarValue::Decimal32(decimal, precision, scale) => {
+                let decimal_dtype = DecimalDType::new(*precision, *scale);
+                let nullable = Nullability::Nullable;
+                if let Some(value) = decimal {
+                    Scalar::decimal(
+                        DecimalValue::I32(*value),
+                        decimal_dtype,
+                        Nullability::Nullable,
+                    )
+                } else {
+                    Scalar::null(DType::Decimal(decimal_dtype, nullable))
+                }
+            }
+            ScalarValue::Decimal64(decimal, precision, scale) => {
+                let decimal_dtype = DecimalDType::new(*precision, *scale);
+                let nullable = Nullability::Nullable;
+                if let Some(value) = decimal {
+                    Scalar::decimal(
+                        DecimalValue::I64(*value),
+                        decimal_dtype,
+                        Nullability::Nullable,
+                    )
+                } else {
+                    Scalar::null(DType::Decimal(decimal_dtype, nullable))
+                }
+            }
             ScalarValue::Decimal128(decimal, precision, scale) => {
                 let decimal_dtype = DecimalDType::new(*precision, *scale);
                 let nullable = Nullability::Nullable;