add support for DuckDB arrays when using Arrow's FixedSizeList

duckdb · Jun 3, 2024 · c5c104c · c5c104c
1 parent 7f09171
commit c5c104c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/vtab/arrow.rs b/src/vtab/arrow.rs
@@ -196,8 +196,8 @@ pub fn to_duckdb_logical_type(data_type: &DataType) -> Result<LogicalType, Box<d
         Ok(LogicalType::list(&to_duckdb_logical_type(child.data_type())?))
     } else if let DataType::LargeList(child) = data_type {
         Ok(LogicalType::list(&to_duckdb_logical_type(child.data_type())?))
-    } else if let DataType::FixedSizeList(child, _) = data_type {
-        Ok(LogicalType::list(&to_duckdb_logical_type(child.data_type())?))
+    } else if let DataType::FixedSizeList(child, array_size) = data_type {
+        Ok(LogicalType::array(&to_duckdb_logical_type(child.data_type())?, *array_size as u64))
     } else {
         Err(
             format!("Unsupported data type: {data_type}, please file an issue https://github.com/wangfenjin/duckdb-rs")

diff --git a/src/vtab/logical_type.rs b/src/vtab/logical_type.rs
@@ -182,6 +182,15 @@ impl LogicalType {
         }
     }
 
+    /// Creates an array type from its child type.
+    pub fn array(child_type: &LogicalType, array_size: u64) -> Self {
+        unsafe {
+            Self {
+                ptr: duckdb_create_array_type(child_type.ptr, array_size),
+            }
+        }
+    }
+
     /// Creates a decimal type from its `width` and `scale`.
     pub fn decimal(width: u8, scale: u8) -> Self {
         unsafe {