@@ -27,7 +27,6 @@ use std::iter::repeat;
27
27
use std:: str:: FromStr ;
28
28
use std:: sync:: Arc ;
29
29
30
- use crate :: arrow_datafusion_err;
31
30
use crate :: cast:: {
32
31
as_decimal128_array, as_decimal256_array, as_dictionary_array,
33
32
as_fixed_size_binary_array, as_fixed_size_list_array,
@@ -1639,18 +1638,16 @@ impl ScalarValue {
1639
1638
scale : i8 ,
1640
1639
size : usize ,
1641
1640
) -> Result < Decimal128Array > {
1642
- match value {
1641
+ Ok ( match value {
1643
1642
Some ( val) => Decimal128Array :: from ( vec ! [ val; size] )
1644
- . with_precision_and_scale ( precision, scale)
1645
- . map_err ( |e| arrow_datafusion_err ! ( e) ) ,
1643
+ . with_precision_and_scale ( precision, scale) ?,
1646
1644
None => {
1647
1645
let mut builder = Decimal128Array :: builder ( size)
1648
- . with_precision_and_scale ( precision, scale)
1649
- . map_err ( |e| arrow_datafusion_err ! ( e) ) ?;
1646
+ . with_precision_and_scale ( precision, scale) ?;
1650
1647
builder. append_nulls ( size) ;
1651
- Ok ( builder. finish ( ) )
1648
+ builder. finish ( )
1652
1649
}
1653
- }
1650
+ } )
1654
1651
}
1655
1652
1656
1653
fn build_decimal256_array (
@@ -1659,11 +1656,10 @@ impl ScalarValue {
1659
1656
scale : i8 ,
1660
1657
size : usize ,
1661
1658
) -> Result < Decimal256Array > {
1662
- std:: iter:: repeat ( value)
1659
+ Ok ( std:: iter:: repeat ( value)
1663
1660
. take ( size)
1664
1661
. collect :: < Decimal256Array > ( )
1665
- . with_precision_and_scale ( precision, scale)
1666
- . map_err ( |e| arrow_datafusion_err ! ( e) )
1662
+ . with_precision_and_scale ( precision, scale) ?)
1667
1663
}
1668
1664
1669
1665
/// Converts `Vec<ScalarValue>` where each element has type corresponding to
@@ -2053,7 +2049,7 @@ impl ScalarValue {
2053
2049
2054
2050
fn list_to_array_of_size ( arr : & dyn Array , size : usize ) -> Result < ArrayRef > {
2055
2051
let arrays = std:: iter:: repeat ( arr) . take ( size) . collect :: < Vec < _ > > ( ) ;
2056
- arrow:: compute:: concat ( arrays. as_slice ( ) ) . map_err ( |e| arrow_datafusion_err ! ( e ) )
2052
+ Ok ( arrow:: compute:: concat ( arrays. as_slice ( ) ) ? )
2057
2053
}
2058
2054
2059
2055
/// Retrieve ScalarValue for each row in `array`
0 commit comments