Apache DataFusion SQL Query Engine
fix: cast `[]` to `FixedSizeList(0, _)` (#23381)
Jeffrey Vo9dc0f4b50c62
diff --git a/datafusion/common/src/scalar/mod.rs b/datafusion/common/src/scalar/mod.rsindex 3d2e8d08ac..ddfe32edd4 100644--- a/datafusion/common/src/scalar/mod.rs+++ b/datafusion/common/src/scalar/mod.rs@@ -11460,4 +11460,14 @@ mod tests {assert_eq!(utf8view_buffer_bytes(keys), one_len);assert_eq!(keys.value(0), strings.value(0));}++ #[test]+ fn test_zero_size_fsl() {+ let s = ScalarValue::new_default(&DataType::FixedSizeList(+ Field::new("a", DataType::Int32, true).into(),+ 0,+ ))+ .unwrap();+ assert_eq!(s.to_string(), "[]");+ }}diff --git a/datafusion/common/src/utils/mod.rs b/datafusion/common/src/utils/mod.rsindex 30a6c45dfc..f71cf23d53 100644--- a/datafusion/common/src/utils/mod.rs+++ b/datafusion/common/src/utils/mod.rs@@ -613,7 +613,8 @@ impl SingleRowListArrayBuilder {/// Build a single element [`FixedSizeListArray`]pub fn build_fixed_size_list_array(self, list_size: usize) -> FixedSizeListArray {let (field, arr) = self.into_field_and_arr();- FixedSizeListArray::new(field, list_size as i32, arr, None)+ FixedSizeListArray::try_new_with_length(field, list_size as i32, arr, None, 1)+ .unwrap()}/// Build a single element [`FixedSizeListArray`] and wrap as [`ScalarValue::FixedSizeList`]diff --git a/datafusion/sqllogictest/test_files/array/array_empty.slt b/datafusion/sqllogictest/test_files/array/array_empty.sltindex 62ac5f66b7..15cf2b4860 100644--- a/datafusion/sqllogictest/test_files/array/array_empty.slt+++ b/datafusion/sqllogictest/test_files/array/array_empty.slt@@ -45,11 +45,10 @@ select empty(arrow_cast(make_array(), 'LargeList(Int64)'));----true-#TODO: https://github.com/apache/datafusion/issues/9158-#query B-#select empty(arrow_cast(make_array(), 'FixedSizeList(0, Null)'));-#-----#true+query B+select empty(arrow_cast(make_array(), 'FixedSizeList(0, Null)'));+----+true# empty scalar function #3query Bdiff --git a/datafusion/sqllogictest/test_files/array/cardinality.slt b/datafusion/sqllogictest/test_files/array/cardinality.sltindex c0ad54e97a..21e94b53b2 100644--- a/datafusion/sqllogictest/test_files/array/cardinality.slt+++ b/datafusion/sqllogictest/test_files/array/cardinality.slt@@ -98,12 +98,10 @@ select cardinality(arrow_cast(make_array(), 'LargeList(Int64)')), cardinality(ar----0 0-#TODO-#https://github.com/apache/datafusion/issues/9158-#query II-#select cardinality(arrow_cast(make_array(), 'FixedSizeList(1, Null)')), cardinality(arrow_cast(make_array(make_array()), 'FixedSizeList(1, List(Int64))'))-#-----#NULL 0+query II+select cardinality(arrow_cast(make_array(null), 'FixedSizeList(1, Null)')), cardinality(arrow_cast(make_array(make_array()), 'FixedSizeList(1, List(Int64))'))+----+1 0# cardinality of NULL arrays should return NULLquery IIdiff --git a/datafusion/sqllogictest/test_files/arrow_typeof.slt b/datafusion/sqllogictest/test_files/arrow_typeof.sltindex e00909ad5f..17fcb7fa36 100644--- a/datafusion/sqllogictest/test_files/arrow_typeof.slt+++ b/datafusion/sqllogictest/test_files/arrow_typeof.slt@@ -397,12 +397,21 @@ select arrow_cast(null, 'FixedSizeList(1, Int64)');----NULL-#TODO: arrow-rs doesn't support it yet-#query ?-#select arrow_cast('1', 'FixedSizeList(1, Int64)');-#-----#[1]+query ?+select arrow_cast([], 'FixedSizeList(0, Null)');+----+[]++query ? rowsort+select arrow_cast(a, 'FixedSizeList(0, Null)') from values ([]), (NULL) t(a);+----+NULL+[]+query ?+select arrow_cast('1', 'FixedSizeList(1, Int64)');+----+[1]query ?select arrow_cast([1], 'FixedSizeList(1, Int64)');