Handle different list types inside type_union_resolution_coercion

blaginin · Nov 19, 2024 · 18ee213 · 18ee213
1 parent 306e7fa
commit 18ee213
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/datafusion/expr-common/src/type_coercion/binary.rs b/datafusion/expr-common/src/type_coercion/binary.rs
@@ -480,11 +480,6 @@ fn type_union_resolution_coercion(
             let new_value_type = type_union_resolution_coercion(value_type, other_type);
             new_value_type.map(|t| DataType::Dictionary(index_type.clone(), Box::new(t)))
         }
-        (DataType::List(lhs), DataType::List(rhs)) => {
-            let new_item_type =
-                type_union_resolution_coercion(lhs.data_type(), rhs.data_type());
-            new_item_type.map(|t| DataType::List(Arc::new(Field::new("item", t, true))))
-        }
         (DataType::Struct(lhs), DataType::Struct(rhs)) => {
             if lhs.len() != rhs.len() {
                 return None;
@@ -529,6 +524,7 @@ fn type_union_resolution_coercion(
             // Numeric coercion is the same as comparison coercion, both find the narrowest type
             // that can accommodate both types
             binary_numeric_coercion(lhs_type, rhs_type)
+                .or_else(|| list_coercion(lhs_type, rhs_type))
                 .or_else(|| temporal_coercion_nonstrict_timezone(lhs_type, rhs_type))
                 .or_else(|| string_coercion(lhs_type, rhs_type))
                 .or_else(|| numeric_string_coercion(lhs_type, rhs_type))

diff --git a/datafusion/sqllogictest/test_files/union.slt b/datafusion/sqllogictest/test_files/union.slt
@@ -770,4 +770,10 @@ query ?
 select make_array(arrow_cast(2, 'UInt8')) x UNION ALL SELECT make_array(arrow_cast(-2, 'Int8')) x;
 ----
 [-2]
-[2]
+[2]
+
+query ?
+select make_array(make_array(1)) x UNION ALL SELECT make_array(arrow_cast(make_array(-1), 'LargeList(Int8)')) x;
+----
+[[-1]]
+[[1]]
-Original file line number
+Diff line change
@@ Expand Up / @@ -770,4 +770,10 @@ query ? @@
     select make_array(arrow_cast(2, 'UInt8')) x UNION ALL SELECT make_array(arrow_cast(-2, 'Int8')) x;
     ----
     [-2]
-    [2]
+    [2]
+    query ?
+    select make_array(make_array(1)) x UNION ALL SELECT make_array(arrow_cast(make_array(-1), 'LargeList(Int8)')) x;
+    ----
+    [[-1]]
+    [[1]]