feat(geo): add native LineString, MultiPoint, MultiLineString types

vortex-duckdb/src/convert/dtype.rs

@@ -58,6 +58,9 @@ use vortex::extension::datetime::Time;
 use vortex::extension::datetime::TimeUnit;
 use vortex::extension::datetime::Timestamp;
 use vortex_geo::extension::GeoMetadata;
+use vortex_geo::extension::LineString;
+use vortex_geo::extension::MultiLineString;
+use vortex_geo::extension::MultiPoint;
 use vortex_geo::extension::MultiPolygon;
 use vortex_geo::extension::Point;
 use vortex_geo::extension::Polygon;
@@ -248,10 +251,13 @@ impl TryFrom<&DType> for LogicalType {
                     return temporal_to_duckdb(temporal);
                 }
 
-                // Native Point/Polygon and WKB all surface to DuckDB as GEOMETRY so `ST_*` bind.
+                // Native geometry types and WKB all surface to DuckDB as GEOMETRY so `ST_*` bind.
                 if let Some(geo) = ext_dtype
                     .metadata_opt::<Point>()
+                    .or_else(|| ext_dtype.metadata_opt::<LineString>())
+                    .or_else(|| ext_dtype.metadata_opt::<MultiPoint>())
                     .or_else(|| ext_dtype.metadata_opt::<Polygon>())
+                    .or_else(|| ext_dtype.metadata_opt::<MultiLineString>())
                     .or_else(|| ext_dtype.metadata_opt::<MultiPolygon>())
                     .or_else(|| ext_dtype.metadata_opt::<WellKnownBinary>())
                 {

vortex-duckdb/src/convert/expr.rs

@@ -38,6 +38,9 @@ use vortex::scalar_fn::fns::like::Like;
 use vortex::scalar_fn::fns::like::LikeOptions;
 use vortex::scalar_fn::fns::literal::Literal;
 use vortex::scalar_fn::fns::operators::Operator;
+use vortex_geo::extension::LineString;
+use vortex_geo::extension::MultiLineString;
+use vortex_geo::extension::MultiPoint;
 use vortex_geo::extension::MultiPolygon;
 use vortex_geo::extension::Point;
 use vortex_geo::extension::Polygon;
@@ -107,7 +110,14 @@ fn is_native_geo_column(fields: Option<&[DuckdbField]>, name: &str) -> bool {
         .flatten()
         .filter(|field| field.name == name)
         .any(|field| match field.dtype.as_extension_opt() {
-            Some(ext) => ext.is::<Point>() || ext.is::<Polygon>() || ext.is::<MultiPolygon>(),
+            Some(ext) => {
+                ext.is::<Point>()
+                    || ext.is::<LineString>()
+                    || ext.is::<MultiPoint>()
+                    || ext.is::<Polygon>()
+                    || ext.is::<MultiLineString>()
+                    || ext.is::<MultiPolygon>()
+            }
             None => false,
         })
 }

vortex-duckdb/src/exporter/extension.rs

@@ -8,6 +8,12 @@ use vortex::array::arrays::extension::ExtensionArrayExt;
 use vortex::array::extension::datetime::AnyTemporal;
 use vortex::error::VortexResult;
 use vortex::error::vortex_bail;
+use vortex_geo::extension::LineString;
+use vortex_geo::extension::LineStringData;
+use vortex_geo::extension::MultiLineString;
+use vortex_geo::extension::MultiLineStringData;
+use vortex_geo::extension::MultiPoint;
+use vortex_geo::extension::MultiPointData;
 use vortex_geo::extension::MultiPolygon;
 use vortex_geo::extension::MultiPolygonData;
 use vortex_geo::extension::Point;
@@ -37,10 +43,22 @@ pub(crate) fn new_exporter(
         return geo::new_point_exporter(PointData::try_from(ext)?, ctx);
     }
 
+    if ext.ext_dtype().is::<LineString>() {
+        return geo::new_linestring_exporter(LineStringData::try_from(ext)?, ctx);
+    }
+
+    if ext.ext_dtype().is::<MultiPoint>() {
+        return geo::new_multipoint_exporter(MultiPointData::try_from(ext)?, ctx);
+    }
+
     if ext.ext_dtype().is::<Polygon>() {
         return geo::new_polygon_exporter(PolygonData::try_from(ext)?, ctx);
     }
 
+    if ext.ext_dtype().is::<MultiLineString>() {
+        return geo::new_multilinestring_exporter(MultiLineStringData::try_from(ext)?, ctx);
+    }
+
     if ext.ext_dtype().is::<MultiPolygon>() {
         return geo::new_multipolygon_exporter(MultiPolygonData::try_from(ext)?, ctx);
     }

vortex-duckdb/src/exporter/geo.rs

@@ -4,6 +4,9 @@
 use vortex::array::ExecutionCtx;
 use vortex::array::arrays::VarBinViewArray;
 use vortex::error::VortexResult;
+use vortex_geo::extension::LineStringData;
+use vortex_geo::extension::MultiLineStringData;
+use vortex_geo::extension::MultiPointData;
 use vortex_geo::extension::MultiPolygonData;
 use vortex_geo::extension::PointData;
 use vortex_geo::extension::PolygonData;
@@ -51,3 +54,35 @@ pub(crate) fn new_multipolygon_exporter(
     let values = multipolygon.to_wkb(ctx)?.execute::<VarBinViewArray>(ctx)?;
     new_exporter(values, ctx)
 }
+
+/// Create an exporter for a native `LineString` column, serialized to WKB via
+/// [`LineStringData::to_wkb`] (see [`new_point_exporter`]).
+pub(crate) fn new_linestring_exporter(
+    linestring: LineStringData,
+    ctx: &mut ExecutionCtx,
+) -> VortexResult<Box<dyn ColumnExporter>> {
+    let values = linestring.to_wkb(ctx)?.execute::<VarBinViewArray>(ctx)?;
+    new_exporter(values, ctx)
+}
+
+/// Create an exporter for a native `MultiPoint` column, serialized to WKB via
+/// [`MultiPointData::to_wkb`] (see [`new_point_exporter`]).
+pub(crate) fn new_multipoint_exporter(
+    multipoint: MultiPointData,
+    ctx: &mut ExecutionCtx,
+) -> VortexResult<Box<dyn ColumnExporter>> {
+    let values = multipoint.to_wkb(ctx)?.execute::<VarBinViewArray>(ctx)?;
+    new_exporter(values, ctx)
+}
+
+/// Create an exporter for a native `MultiLineString` column, serialized to WKB via
+/// [`MultiLineStringData::to_wkb`] (see [`new_point_exporter`]).
+pub(crate) fn new_multilinestring_exporter(
+    multilinestring: MultiLineStringData,
+    ctx: &mut ExecutionCtx,
+) -> VortexResult<Box<dyn ColumnExporter>> {
+    let values = multilinestring
+        .to_wkb(ctx)?
+        .execute::<VarBinViewArray>(ctx)?;
+    new_exporter(values, ctx)
+}