-
Notifications
You must be signed in to change notification settings - Fork 1.8k
[DRAFT] Extension Type Registry Draft #18552
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.
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
base: main
Are you sure you want to change the base?
Changes from all commits
6d8774a
3d23b9f
31ca29f
2d58c76
7511f4a
9a9469a
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,198 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| use crate::error::_internal_err; | ||
| use crate::types::{ | ||
| LogicalType, NativeType, TypeParameter, TypeSignature, ValuePrettyPrinter, | ||
| }; | ||
| use crate::ScalarValue; | ||
| use crate::{Result, _internal_datafusion_err}; | ||
| use arrow_schema::extension::{ExtensionType, Opaque, Uuid}; | ||
| use std::sync::{Arc, LazyLock}; | ||
| use uuid::Bytes; | ||
|
|
||
| impl LogicalType for Uuid { | ||
| fn native(&self) -> &NativeType { | ||
| &NativeType::FixedSizeBinary(16) | ||
| } | ||
|
|
||
| fn signature(&self) -> TypeSignature<'_> { | ||
| TypeSignature::Extension { | ||
| name: Uuid::NAME, | ||
| parameters: vec![], | ||
| } | ||
| } | ||
|
|
||
| fn pretty_printer(&self) -> &Arc<dyn ValuePrettyPrinter> { | ||
| static PRETTY_PRINTER: LazyLock<Arc<dyn ValuePrettyPrinter>> = | ||
| LazyLock::new(|| Arc::new(UuidValuePrettyPrinter {})); | ||
| &PRETTY_PRINTER | ||
| } | ||
| } | ||
|
|
||
| #[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash)] | ||
| struct UuidValuePrettyPrinter; | ||
|
|
||
| impl ValuePrettyPrinter for UuidValuePrettyPrinter { | ||
| fn pretty_print_scalar(&self, value: &ScalarValue) -> Result<String> { | ||
| match value { | ||
| ScalarValue::FixedSizeBinary(16, value) => match value { | ||
| Some(value) => { | ||
| let bytes = Bytes::try_from(value.as_slice()).map_err(|_| { | ||
| _internal_datafusion_err!( | ||
| "Invalid UUID bytes even though type is correct." | ||
| ) | ||
| })?; | ||
| let uuid = uuid::Uuid::from_bytes(bytes); | ||
| Ok(format!("arrow.uuid({uuid})")) | ||
| } | ||
| None => Ok("arrow.uuid(NULL)".to_owned()), | ||
| }, | ||
| _ => _internal_err!("Wrong scalar given to "), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /// Represents the canonical [Opaque extension type](https://arrow.apache.org/docs/format/CanonicalExtensions.html#opaque). | ||
| /// | ||
| /// In the context of DataFusion, a common use case of the opaque type is when an extension type | ||
| /// is unknown to DataFusion. Contrary to [UnresolvedExtensionType], the extension type has | ||
| /// already been checked against the extension type registry and was not found. | ||
| impl LogicalType for Opaque { | ||
| fn native(&self) -> &NativeType { | ||
| &NativeType::FixedSizeBinary(16) | ||
| } | ||
|
|
||
| fn signature(&self) -> TypeSignature<'_> { | ||
| let parameter = TypeParameter::Type(TypeSignature::Extension { | ||
| name: self.metadata().type_name(), | ||
| parameters: vec![], | ||
| }); | ||
| TypeSignature::Extension { | ||
| name: Opaque::NAME, | ||
| parameters: vec![parameter], | ||
| } | ||
| } | ||
|
|
||
| fn pretty_printer(&self) -> &Arc<dyn ValuePrettyPrinter> { | ||
| static PRETTY_PRINTER: LazyLock<Arc<dyn ValuePrettyPrinter>> = | ||
| LazyLock::new(|| Arc::new(OpaqueValuePrettyPrinter {})); | ||
| &PRETTY_PRINTER | ||
| } | ||
| } | ||
|
|
||
| // TODO Other canonical extension types. | ||
|
|
||
| #[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash)] | ||
| struct OpaqueValuePrettyPrinter; | ||
|
|
||
| impl ValuePrettyPrinter for OpaqueValuePrettyPrinter { | ||
| fn pretty_print_scalar(&self, value: &ScalarValue) -> Result<String> { | ||
| Ok(format!("arrow.opaque({value})")) | ||
| } | ||
| } | ||
|
|
||
| /// Represents an unresolved extension type with a given native type and name. | ||
| /// | ||
| /// This does not necessarily indicate that DataFusion does not understand the extension type. For | ||
| /// this purpose, see [OpaqueType]. However, it does indicate that the extension type was not yet | ||
| /// checked against the extension type registry. | ||
| /// | ||
| /// This extension type exists because it is often challenging to gain access to an extension type | ||
| /// registry. Especially because extension type support is relatively new, and therefore this | ||
| /// consideration was not taken into account by users. This provides a workaround such that | ||
| /// unresolved extension types can be resolved at a later point in time where access to the registry | ||
| /// is available. | ||
| pub struct UnresolvedExtensionType { | ||
| /// The name of the underlying extension type. | ||
| name: String, | ||
| /// The metadata of the underlying extension type. | ||
| metadata: Option<String>, | ||
| /// The underlying native type. | ||
| native_type: NativeType, | ||
| } | ||
|
|
||
| impl UnresolvedExtensionType { | ||
| /// Creates a new [UnresolvedExtensionType]. | ||
| pub fn new(name: String, metadata: Option<String>, native_type: NativeType) -> Self { | ||
| Self { | ||
| name, | ||
| metadata, | ||
| native_type, | ||
| } | ||
| } | ||
|
|
||
| /// The name of the unresolved extension type. | ||
| pub fn name(&self) -> &str { | ||
| &self.name | ||
| } | ||
|
|
||
| /// The metadata of the unresolved extension type. | ||
| pub fn metadata(&self) -> Option<&str> { | ||
| self.metadata.as_deref() | ||
| } | ||
| } | ||
|
|
||
| impl LogicalType for UnresolvedExtensionType { | ||
| fn native(&self) -> &NativeType { | ||
| &self.native_type | ||
| } | ||
|
|
||
| fn signature(&self) -> TypeSignature<'_> { | ||
| let inner_type = TypeParameter::Type(TypeSignature::Extension { | ||
| name: &self.name, | ||
| parameters: vec![], | ||
| }); | ||
| TypeSignature::Extension { | ||
| name: "datafusion.unresolved", | ||
| parameters: vec![inner_type], | ||
| } | ||
| } | ||
|
|
||
| fn pretty_printer(&self) -> &Arc<dyn ValuePrettyPrinter> { | ||
| static PRETTY_PRINTER: LazyLock<Arc<dyn ValuePrettyPrinter>> = | ||
| LazyLock::new(|| Arc::new(UnresolvedValuePrettyPrinter {})); | ||
| &PRETTY_PRINTER | ||
| } | ||
| } | ||
|
|
||
| #[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash)] | ||
| struct UnresolvedValuePrettyPrinter {} | ||
|
|
||
| impl ValuePrettyPrinter for UnresolvedValuePrettyPrinter { | ||
| fn pretty_print_scalar(&self, value: &ScalarValue) -> Result<String> { | ||
| Ok(format!("datafusion.unresolved({value})")) | ||
| } | ||
|
Comment on lines
+177
to
+179
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should this error? Like, if this code is called, it meant a programming error led to the logical type not being resolved? Or maybe this should be unified with the Opaque logical type for now (in other words, we'll always construct
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I am not sure. I think this will depend on how we want to handle the whole unresolved situation. I was more thinking into the direction that we have a logical plan invariant (maybe only on the executable level) that ensures that no unresolved type is part of the plan / expressions when creating the execution plan. I think pretty printing is somewhat of a special case as it doesn't directly introduce wrong behavior and printing a value in, for example, error messages should maybe include the information that it is unresolved. Once we introduce extensions necessary for planning (e.g., the sorting stuff I was experimenting with), an error should probably be returned as you mentioned. Unifying with |
||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use super::*; | ||
|
|
||
| #[test] | ||
| pub fn test_pretty_print_uuid() { | ||
| let my_uuid = uuid::Uuid::nil(); | ||
| let uuid = ScalarValue::FixedSizeBinary(16, Some(my_uuid.as_bytes().to_vec())); | ||
|
|
||
| let printer = UuidValuePrettyPrinter::default(); | ||
| let pretty_printed = printer.pretty_print_scalar(&uuid).unwrap(); | ||
| assert_eq!( | ||
| pretty_printed, | ||
| "arrow.uuid(00000000-0000-0000-0000-000000000000)" | ||
| ); | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| use crate::Result; | ||
| use crate::ScalarValue; | ||
| use arrow::array::Array; | ||
| use std::fmt::Debug; | ||
|
|
||
| /// Implements pretty printing for a set of types. | ||
| /// | ||
| /// For example, the default pretty-printer for a byte array might not be adequate for a UUID type, | ||
| /// which is physically stored as a fixed-length byte array. This extension allows the user to | ||
| /// override the default pretty-printer for a given type. | ||
| pub trait ValuePrettyPrinter: Debug + Sync + Send { | ||
| /// Pretty print a scalar value. | ||
| /// | ||
| /// # Error | ||
| /// | ||
| /// Will return an error if the given `df_type` is not supported by this pretty printer. | ||
| fn pretty_print_scalar(&self, value: &ScalarValue) -> Result<String>; | ||
|
|
||
| /// Pretty print a specific value of a given array. | ||
| /// | ||
| /// # Error | ||
| /// | ||
| /// Will return an error if the given `df_type` is not supported by this pretty printer. | ||
| fn pretty_print_array(&self, array: &dyn Array, index: usize) -> Result<String> { | ||
| let value = ScalarValue::try_from_array(array, index)?; | ||
| self.pretty_print_scalar(&value) | ||
| } | ||
| } | ||
|
|
||
| /// The default pretty printer. | ||
| /// | ||
| /// Uses the arrow implementation of printing values. | ||
| #[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash)] | ||
| pub struct DefaultValuePrettyPrinter; | ||
|
|
||
| impl ValuePrettyPrinter for DefaultValuePrettyPrinter { | ||
| fn pretty_print_scalar(&self, value: &ScalarValue) -> Result<String> { | ||
| Ok(value.to_string()) | ||
| } | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not sure mixing the canonical extension "Opaque" and
Opaquehere is a good idea, but I do think this logical type is a good one to have...it is a place where we can define what happens to a field withARROW:extension:namein the absence of any other guidance (e.g., here we would print values identically to the storage type...we could define equality here using byte-for-byte equality of metadata if we want to be strict, or using storage type equality if we want to be lenient).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah maybe I misunderstood the Opaque type here.
Yes, exactly. I think we can still discuss what's is the stance on how lenient we want to be with unknown types, especially regarding code that is relevant for planning / computations etc.
If I get this correctly, this should be another logical type called something like
datafusion.unknown?