Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions vortex-geo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ rust-version.workspace = true
version.workspace = true

[dependencies]
arrow-array = { workspace = true }
arrow-schema = { workspace = true }
geoarrow = { workspace = true }
prost = { workspace = true }
vortex-array = { workspace = true }
vortex-error = { workspace = true }
Expand Down
175 changes: 175 additions & 0 deletions vortex-geo/src/extension/wkb.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,32 @@

use std::fmt::Display;
use std::ops::Deref;
use std::sync::Arc;

use arrow_array::ArrayRef as ArrowArrayRef;
use arrow_schema::DataType;
use arrow_schema::Field;
use arrow_schema::extension::ExtensionType;
use geoarrow::array::GenericWkbArray;
use geoarrow::array::IntoArrow;
use geoarrow::array::WkbViewArray;
use geoarrow::datatypes::Crs;
use geoarrow::datatypes::Metadata;
use geoarrow::datatypes::WkbType;
use prost::Message;
use vortex_array::ArrayRef;
use vortex_array::ExecutionCtx;
use vortex_array::IntoArray;
use vortex_array::arrays::ExtensionArray;
use vortex_array::arrays::extension::ExtensionArrayExt;
use vortex_array::arrow::ArrowExport;
use vortex_array::arrow::ArrowExportVTable;
use vortex_array::arrow::ArrowImport;
use vortex_array::arrow::ArrowImportVTable;
use vortex_array::arrow::ArrowSession;
use vortex_array::arrow::ArrowSessionExt;
use vortex_array::arrow::FromArrowArray;
use vortex_array::dtype::DType;
use vortex_array::dtype::extension::ExtDType;
use vortex_array::dtype::extension::ExtId;
use vortex_array::dtype::extension::ExtVTable;
Expand All @@ -17,6 +38,8 @@ use vortex_error::VortexResult;
use vortex_error::vortex_bail;
use vortex_error::vortex_ensure;
use vortex_error::vortex_err;
use vortex_session::registry::CachedId;
use vortex_session::registry::Id;
use wkb::reader::GeometryType;

use crate::extension::GeoMetadata;
Expand Down Expand Up @@ -140,3 +163,155 @@ impl ExtVTable for WellKnownBinary {
Wkb::try_from_bytes(storage_value.as_binary().as_slice())
}
}

static ARROW_WKB: CachedId = CachedId::new(WkbType::NAME);

impl ArrowExportVTable for WellKnownBinary {
fn arrow_ext_id(&self) -> Id {
*ARROW_WKB
}

fn vortex_id(&self) -> Id {
self.id()
}

fn to_arrow_field(
&self,
name: &str,
dtype: &DType,
session: &ArrowSession,
) -> VortexResult<Option<Field>> {
let ext_type = dtype.as_extension();
let geo_metadata = ext_type.metadata::<WellKnownBinary>();

let mut field = session.to_arrow_field(name, ext_type.storage_dtype())?;
field.try_with_extension_type(wkb_type(geo_metadata))?;

Ok(Some(field))
}

fn execute_arrow(
&self,
array: ArrayRef,
target: &Field,
ctx: &mut ExecutionCtx,
) -> VortexResult<ArrowExport> {
let is_wkb = array
.dtype()
.as_extension_opt()
.map(|ext| ext.is::<WellKnownBinary>())
.unwrap_or(false);
if !is_wkb {
return Ok(ArrowExport::Unsupported(array));
}

let Ok(wkb_meta) = target.try_extension_type::<WkbType>() else {
return Ok(ArrowExport::Unsupported(array));
};

let executed = array.execute::<ExtensionArray>(ctx)?;
let storage = executed.storage_array().clone();

let storage_field = Field::new(
String::new(),
target.data_type().clone(),
target.is_nullable(),
);
let session = ctx.session().clone();
let arrow_storage = session
.arrow()
.execute_arrow(storage, Some(&storage_field), ctx)?;

// Round-trip through the GeoArrow WKB array types: this validates that the storage
// is a binary-family Arrow array and produces the canonical physical representation
// expected for a `WkbType` extension field.
let arrow_ref: ArrowArrayRef = match target.data_type() {
DataType::Binary => Arc::new(
GenericWkbArray::<i32>::try_from((arrow_storage.as_ref(), wkb_meta))
.map_err(|e| vortex_err!("failed to construct WkbArray: {e}"))?
.into_arrow(),
),
DataType::LargeBinary => Arc::new(
GenericWkbArray::<i64>::try_from((arrow_storage.as_ref(), wkb_meta))
.map_err(|e| vortex_err!("failed to construct LargeWkbArray: {e}"))?
.into_arrow(),
),
DataType::BinaryView => Arc::new(
WkbViewArray::try_from((arrow_storage.as_ref(), wkb_meta))
.map_err(|e| vortex_err!("failed to construct WkbViewArray: {e}"))?
.into_arrow(),
),
_ => unreachable!("target data type was validated above"),
};

Ok(ArrowExport::Exported(arrow_ref))
}
}

impl ArrowImportVTable for WellKnownBinary {
fn arrow_ext_id(&self) -> Id {
*ARROW_WKB
}

fn from_arrow_field(&self, field: &Field) -> VortexResult<Option<DType>> {
let Ok(wkb_meta) = field.try_extension_type::<WkbType>() else {
return Ok(None);
};

let storage_dtype = DType::Binary(field.is_nullable().into());
Ok(Some(DType::Extension(
ExtDType::try_with_vtable(WellKnownBinary, geo_metadata(&wkb_meta), storage_dtype)?
.erased(),
)))
}

fn from_arrow_array(
&self,
array: ArrowArrayRef,
field: &Field,
dtype: &DType,
) -> VortexResult<ArrowImport> {
let Some(ext_dtype) = dtype.as_extension_opt() else {
return Ok(ArrowImport::Unsupported(array));
};
if !ext_dtype.is::<WellKnownBinary>()
|| field.try_extension_type::<WkbType>().is_err()
|| !matches!(
array.data_type(),
DataType::Binary | DataType::LargeBinary | DataType::BinaryView
)
{
return Ok(ArrowImport::Unsupported(array));
}

let storage = ArrayRef::from_arrow(array.as_ref(), field.is_nullable())?;
Ok(ArrowImport::Imported(
ExtensionArray::new(ext_dtype.clone(), storage).into_array(),
))
}
}

fn wkb_type(geo_metadata: &GeoMetadata) -> WkbType {
let metadata = Metadata::new(
geo_metadata
.crs
.as_ref()
.map(|crs| Crs::from_unknown_crs_type(crs.to_string()))
.unwrap_or_default(),
None,
);
WkbType::new(Arc::new(metadata))
}

fn geo_metadata(wkb_type: &WkbType) -> GeoMetadata {
let crs = wkb_type.metadata().crs().crs_value().map(|value| {
// `Crs::from_unknown_crs_type` stores the user's string verbatim as a JSON string
// value, so prefer the raw string when available to round-trip cleanly. For other
// CRS encodings (PROJJSON object, etc.), fall back to the JSON-encoded form.
value
.as_str()
.map(str::to_string)
.unwrap_or_else(|| value.to_string())
});
GeoMetadata { crs }
}
Loading
Loading