Skip to content

feat[vortex-duckdb-ext]: add vx duckdb type conversion #3588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joseph-isaacs merged 1 commit into from
Jun 22, 2025
+45 −14
Merged

feat[vortex-duckdb-ext]: add vx duckdb type conversion #3588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 43 additions & 13 deletions vortex-duckdb-ext/src/convert/dtype.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@
//! | `Timestamp` | `TIMESTAMP` |

use std::ffi::CString;
use std::sync::Arc;

use vortex::dtype::PType::{F32, F64, I8, I16, I32, I64, U8, U16, U32, U64};
use vortex::dtype::{DType, Nullability, PType, datetime};
use vortex::dtype::datetime::{DATE_ID, TIME_ID, TIMESTAMP_ID, TemporalMetadata, TimeUnit};
use vortex::dtype::{DType, DecimalDType, ExtDType, Nullability, PType, datetime};
use vortex::error::{VortexError, VortexResult, vortex_bail, vortex_err};

use crate::cpp::{self, DUCKDB_TYPE, duckdb_logical_type};
Expand Down Expand Up @@ -103,7 +105,7 @@ impl LogicalType {
/// - **Date**: Must use `TimeUnit::D`
/// - **Time**: Must use `TimeUnit::Us`
/// - **Timestamp**: Supports `TimeUnit::Ns`, `Us`, `Ms`, `S`
fn temporal_type(ext_dtype: &vortex::dtype::ExtDType) -> VortexResult<Self> {
fn temporal_type(ext_dtype: &ExtDType) -> VortexResult<Self> {
use vortex::dtype::datetime::{TemporalMetadata, TimeUnit};

let temporal_metadata = TemporalMetadata::try_from(ext_dtype)
Expand Down Expand Up @@ -150,6 +152,7 @@ impl FromLogicalType for DType {
) -> VortexResult<DType> {
Ok(match logical_type.as_type_id() {
DUCKDB_TYPE::DUCKDB_TYPE_INVALID => vortex_bail!("invalid duckdb type"),
DUCKDB_TYPE::DUCKDB_TYPE_SQLNULL => DType::Null,
DUCKDB_TYPE::DUCKDB_TYPE_BOOLEAN => DType::Bool(nullability),
DUCKDB_TYPE::DUCKDB_TYPE_TINYINT => DType::Primitive(I8, nullability),
DUCKDB_TYPE::DUCKDB_TYPE_SMALLINT => DType::Primitive(I16, nullability),
Expand All @@ -159,20 +162,48 @@ impl FromLogicalType for DType {
DUCKDB_TYPE::DUCKDB_TYPE_USMALLINT => DType::Primitive(U16, nullability),
DUCKDB_TYPE::DUCKDB_TYPE_UINTEGER => DType::Primitive(U32, nullability),
DUCKDB_TYPE::DUCKDB_TYPE_UBIGINT => DType::Primitive(U64, nullability),
DUCKDB_TYPE::DUCKDB_TYPE_FLOAT => DType::Primitive(F32, nullability),
DUCKDB_TYPE::DUCKDB_TYPE_DOUBLE => DType::Primitive(F64, nullability),
DUCKDB_TYPE::DUCKDB_TYPE_TIMESTAMP => todo!(),
DUCKDB_TYPE::DUCKDB_TYPE_DATE => todo!(),
DUCKDB_TYPE::DUCKDB_TYPE_TIME => todo!(),
DUCKDB_TYPE::DUCKDB_TYPE_INTERVAL => todo!(),
DUCKDB_TYPE::DUCKDB_TYPE_HUGEINT => todo!(),
DUCKDB_TYPE::DUCKDB_TYPE_UHUGEINT => todo!(),
DUCKDB_TYPE::DUCKDB_TYPE_FLOAT => DType::Primitive(F32, nullability),
DUCKDB_TYPE::DUCKDB_TYPE_DOUBLE => DType::Primitive(F64, nullability),

DUCKDB_TYPE::DUCKDB_TYPE_VARCHAR => DType::Utf8(nullability),
DUCKDB_TYPE::DUCKDB_TYPE_BLOB => DType::Binary(nullability),
DUCKDB_TYPE::DUCKDB_TYPE_DECIMAL => todo!(),
DUCKDB_TYPE::DUCKDB_TYPE_TIMESTAMP_S => todo!(),
DUCKDB_TYPE::DUCKDB_TYPE_TIMESTAMP_MS => todo!(),
DUCKDB_TYPE::DUCKDB_TYPE_TIMESTAMP_NS => todo!(),
DUCKDB_TYPE::DUCKDB_TYPE_DECIMAL => {
let (width, scale) = logical_type.as_decimal();
DType::Decimal(DecimalDType::new(width, scale.try_into()?), nullability)
}
DUCKDB_TYPE::DUCKDB_TYPE_DATE => DType::Extension(Arc::new(ExtDType::new(
DATE_ID.clone(),
Arc::new(DType::Primitive(I32, nullability)),
Some(TemporalMetadata::Date(TimeUnit::D).into()),
))),
DUCKDB_TYPE::DUCKDB_TYPE_TIME => DType::Extension(Arc::new(ExtDType::new(
TIME_ID.clone(),
Arc::new(DType::Primitive(I64, nullability)),
Some(TemporalMetadata::Date(TimeUnit::Us).into()),
))),
DUCKDB_TYPE::DUCKDB_TYPE_TIMESTAMP_S => DType::Extension(Arc::new(ExtDType::new(
TIMESTAMP_ID.clone(),
Arc::new(DType::Primitive(I32, nullability)),
Some(TemporalMetadata::Timestamp(TimeUnit::S, None).into()),
))),
DUCKDB_TYPE::DUCKDB_TYPE_TIMESTAMP_MS => DType::Extension(Arc::new(ExtDType::new(
TIMESTAMP_ID.clone(),
Arc::new(DType::Primitive(I32, nullability)),
Some(TemporalMetadata::Timestamp(TimeUnit::Ms, None).into()),
))),
DUCKDB_TYPE::DUCKDB_TYPE_TIMESTAMP => DType::Extension(Arc::new(ExtDType::new(
TIMESTAMP_ID.clone(),
Arc::new(DType::Primitive(I64, nullability)),
Some(TemporalMetadata::Timestamp(TimeUnit::Us, None).into()),
))),
DUCKDB_TYPE::DUCKDB_TYPE_TIMESTAMP_NS => DType::Extension(Arc::new(ExtDType::new(
TIMESTAMP_ID.clone(),
Arc::new(DType::Primitive(I64, nullability)),
Some(TemporalMetadata::Timestamp(TimeUnit::Ns, None).into()),
))),
DUCKDB_TYPE::DUCKDB_TYPE_INTERVAL => todo!(),
DUCKDB_TYPE::DUCKDB_TYPE_ENUM => todo!(),
DUCKDB_TYPE::DUCKDB_TYPE_LIST => todo!(),
DUCKDB_TYPE::DUCKDB_TYPE_STRUCT => todo!(),
Expand All @@ -185,7 +216,6 @@ impl FromLogicalType for DType {
DUCKDB_TYPE::DUCKDB_TYPE_TIMESTAMP_TZ => todo!(),
DUCKDB_TYPE::DUCKDB_TYPE_ANY => todo!(),
DUCKDB_TYPE::DUCKDB_TYPE_VARINT => todo!(),
DUCKDB_TYPE::DUCKDB_TYPE_SQLNULL => DType::Null,
DUCKDB_TYPE::DUCKDB_TYPE_STRING_LITERAL => todo!(),
DUCKDB_TYPE::DUCKDB_TYPE_INTEGER_LITERAL => todo!(),
})
Expand Down
3 changes: 2 additions & 1 deletion vortex-duckdb-ext/src/convert/scalar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ use vortex::dtype::{DType, DecimalDType, ExtDType, PType, match_each_native_simd
use vortex::error::{VortexError, VortexExpect, VortexResult, vortex_bail, vortex_err};
use vortex::scalar::{
BinaryScalar, BoolScalar, DecimalScalar, DecimalValue, ExtScalar, PrimitiveScalar, Scalar,
Utf8Scalar,
ScalarValue, Utf8Scalar,
};

use crate::convert::dtype::FromLogicalType;
Expand Down Expand Up @@ -216,6 +216,7 @@ impl TryFrom<Value> for Scalar {
};
match value.logical_type().as_type_id() {
DUCKDB_TYPE::DUCKDB_TYPE_INVALID => vortex_bail!("invalid duckdb type"),
DUCKDB_TYPE::DUCKDB_TYPE_SQLNULL => Ok(Scalar::new(DType::Null, ScalarValue::null())),
DUCKDB_TYPE::DUCKDB_TYPE_BOOLEAN => {
let bool = unsafe { cpp::duckdb_get_bool(value.as_ptr()) };
Ok(Scalar::bool(bool, Nullable))
Expand Down
Loading