Skip to content

Commit c7c28d8

Browse files
feat(geo): add native LineString, MultiPoint, MultiLineString types (#8679)
Complete the set of OGC simple-feature geometries alongside the existing Point/Polygon/MultiPolygon: - vortex.geo.linestring - List<Struct<x, y[, z][, m]>> - vortex.geo.multipoint - List<Struct<x, y[, z][, m]>> - vortex.geo.multilinestring - List<List<Struct<x, y[, z][, m]>>> Each mirrors the existing Polygon/MultiPolygon extension types. Wire them through the DuckDB integration so they surface as GEOMETRY like the existing native types: the dtype -> GEOMETRY mapping, per-type WKB exporters, and native-geometry-column recognition for predicate pushdown. Tests cover dtype validation across all four dimensions, Arrow field import/export (including that the shape-identical types resolve by name), and WKB-literal decode round-trips. Signed-off-by: Nemo Yu <[email protected]>
1 parent fa000ff commit c7c28d8

13 files changed

Lines changed: 1499 additions & 2 deletions

File tree

‎vortex-duckdb/src/convert/dtype.rs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ use vortex::extension::datetime::Time;
5858
use vortex::extension::datetime::TimeUnit;
5959
use vortex::extension::datetime::Timestamp;
6060
use vortex_geo::extension::GeoMetadata;
61+
use vortex_geo::extension::LineString;
62+
use vortex_geo::extension::MultiLineString;
63+
use vortex_geo::extension::MultiPoint;
6164
use vortex_geo::extension::MultiPolygon;
6265
use vortex_geo::extension::Point;
6366
use vortex_geo::extension::Polygon;
@@ -248,10 +251,13 @@ impl TryFrom<&DType> for LogicalType {
248251
return temporal_to_duckdb(temporal);
249252
}
250253

251-
// Native Point/Polygon and WKB all surface to DuckDB as GEOMETRY so `ST_*` bind.
254+
// Native geometry types and WKB all surface to DuckDB as GEOMETRY so `ST_*` bind.
252255
if let Some(geo) = ext_dtype
253256
.metadata_opt::<Point>()
257+
.or_else(|| ext_dtype.metadata_opt::<LineString>())
258+
.or_else(|| ext_dtype.metadata_opt::<MultiPoint>())
254259
.or_else(|| ext_dtype.metadata_opt::<Polygon>())
260+
.or_else(|| ext_dtype.metadata_opt::<MultiLineString>())
255261
.or_else(|| ext_dtype.metadata_opt::<MultiPolygon>())
256262
.or_else(|| ext_dtype.metadata_opt::<WellKnownBinary>())
257263
{

‎vortex-duckdb/src/convert/expr.rs‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ use vortex::scalar_fn::fns::like::Like;
3838
use vortex::scalar_fn::fns::like::LikeOptions;
3939
use vortex::scalar_fn::fns::literal::Literal;
4040
use vortex::scalar_fn::fns::operators::Operator;
41+
use vortex_geo::extension::LineString;
42+
use vortex_geo::extension::MultiLineString;
43+
use vortex_geo::extension::MultiPoint;
4144
use vortex_geo::extension::MultiPolygon;
4245
use vortex_geo::extension::Point;
4346
use vortex_geo::extension::Polygon;
@@ -107,7 +110,14 @@ fn is_native_geo_column(fields: Option<&[DuckdbField]>, name: &str) -> bool {
107110
.flatten()
108111
.filter(|field| field.name == name)
109112
.any(|field| match field.dtype.as_extension_opt() {
110-
Some(ext) => ext.is::<Point>() || ext.is::<Polygon>() || ext.is::<MultiPolygon>(),
113+
Some(ext) => {
114+
ext.is::<Point>()
115+
|| ext.is::<LineString>()
116+
|| ext.is::<MultiPoint>()
117+
|| ext.is::<Polygon>()
118+
|| ext.is::<MultiLineString>()
119+
|| ext.is::<MultiPolygon>()
120+
}
111121
None => false,
112122
})
113123
}

‎vortex-duckdb/src/exporter/extension.rs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ use vortex::array::arrays::extension::ExtensionArrayExt;
88
use vortex::array::extension::datetime::AnyTemporal;
99
use vortex::error::VortexResult;
1010
use vortex::error::vortex_bail;
11+
use vortex_geo::extension::LineString;
12+
use vortex_geo::extension::LineStringData;
13+
use vortex_geo::extension::MultiLineString;
14+
use vortex_geo::extension::MultiLineStringData;
15+
use vortex_geo::extension::MultiPoint;
16+
use vortex_geo::extension::MultiPointData;
1117
use vortex_geo::extension::MultiPolygon;
1218
use vortex_geo::extension::MultiPolygonData;
1319
use vortex_geo::extension::Point;
@@ -37,10 +43,22 @@ pub(crate) fn new_exporter(
3743
return geo::new_point_exporter(PointData::try_from(ext)?, ctx);
3844
}
3945

46+
if ext.ext_dtype().is::<LineString>() {
47+
return geo::new_linestring_exporter(LineStringData::try_from(ext)?, ctx);
48+
}
49+
50+
if ext.ext_dtype().is::<MultiPoint>() {
51+
return geo::new_multipoint_exporter(MultiPointData::try_from(ext)?, ctx);
52+
}
53+
4054
if ext.ext_dtype().is::<Polygon>() {
4155
return geo::new_polygon_exporter(PolygonData::try_from(ext)?, ctx);
4256
}
4357

58+
if ext.ext_dtype().is::<MultiLineString>() {
59+
return geo::new_multilinestring_exporter(MultiLineStringData::try_from(ext)?, ctx);
60+
}
61+
4462
if ext.ext_dtype().is::<MultiPolygon>() {
4563
return geo::new_multipolygon_exporter(MultiPolygonData::try_from(ext)?, ctx);
4664
}

‎vortex-duckdb/src/exporter/geo.rs‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
use vortex::array::ExecutionCtx;
55
use vortex::array::arrays::VarBinViewArray;
66
use vortex::error::VortexResult;
7+
use vortex_geo::extension::LineStringData;
8+
use vortex_geo::extension::MultiLineStringData;
9+
use vortex_geo::extension::MultiPointData;
710
use vortex_geo::extension::MultiPolygonData;
811
use vortex_geo::extension::PointData;
912
use vortex_geo::extension::PolygonData;
@@ -51,3 +54,35 @@ pub(crate) fn new_multipolygon_exporter(
5154
let values = multipolygon.to_wkb(ctx)?.execute::<VarBinViewArray>(ctx)?;
5255
new_exporter(values, ctx)
5356
}
57+
58+
/// Create an exporter for a native `LineString` column, serialized to WKB via
59+
/// [`LineStringData::to_wkb`] (see [`new_point_exporter`]).
60+
pub(crate) fn new_linestring_exporter(
61+
linestring: LineStringData,
62+
ctx: &mut ExecutionCtx,
63+
) -> VortexResult<Box<dyn ColumnExporter>> {
64+
let values = linestring.to_wkb(ctx)?.execute::<VarBinViewArray>(ctx)?;
65+
new_exporter(values, ctx)
66+
}
67+
68+
/// Create an exporter for a native `MultiPoint` column, serialized to WKB via
69+
/// [`MultiPointData::to_wkb`] (see [`new_point_exporter`]).
70+
pub(crate) fn new_multipoint_exporter(
71+
multipoint: MultiPointData,
72+
ctx: &mut ExecutionCtx,
73+
) -> VortexResult<Box<dyn ColumnExporter>> {
74+
let values = multipoint.to_wkb(ctx)?.execute::<VarBinViewArray>(ctx)?;
75+
new_exporter(values, ctx)
76+
}
77+
78+
/// Create an exporter for a native `MultiLineString` column, serialized to WKB via
79+
/// [`MultiLineStringData::to_wkb`] (see [`new_point_exporter`]).
80+
pub(crate) fn new_multilinestring_exporter(
81+
multilinestring: MultiLineStringData,
82+
ctx: &mut ExecutionCtx,
83+
) -> VortexResult<Box<dyn ColumnExporter>> {
84+
let values = multilinestring
85+
.to_wkb(ctx)?
86+
.execute::<VarBinViewArray>(ctx)?;
87+
new_exporter(values, ctx)
88+
}

0 commit comments

Comments
 (0)