-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(logical-types): add NativeType and LogicalType (#12853)
* [logical-types] add NativeType and LogicalType * Add license header * Add NativeField and derivates * Support TypeSignatures * Fix doc * Add documentation * Fix doc tests * Remove dummy test * From NativeField to LogicalField * Add default_cast_for * Add type order with can_cast_types * Rename NativeType Utf8 to String * NativeType from &DataType * Add builtin types * From LazyLock to OnceLock
- Loading branch information
1 parent
89e96b4
commit b40a298
Showing
6 changed files
with
717 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
// 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::types::{LogicalTypeRef, NativeType}; | ||
use std::sync::{Arc, OnceLock}; | ||
|
||
macro_rules! singleton { | ||
($name:ident, $getter:ident, $ty:ident) => { | ||
// TODO: Use LazyLock instead of getter function when MSRV gets bumped | ||
static $name: OnceLock<LogicalTypeRef> = OnceLock::new(); | ||
|
||
#[doc = "Getter for singleton instance of a logical type representing"] | ||
#[doc = concat!("[`NativeType::", stringify!($ty), "`].")] | ||
pub fn $getter() -> LogicalTypeRef { | ||
Arc::clone($name.get_or_init(|| Arc::new(NativeType::$ty))) | ||
} | ||
}; | ||
} | ||
|
||
singleton!(LOGICAL_NULL, logical_null, Null); | ||
singleton!(LOGICAL_BOOLEAN, logical_boolean, Boolean); | ||
singleton!(LOGICAL_INT8, logical_int8, Int8); | ||
singleton!(LOGICAL_INT16, logical_int16, Int16); | ||
singleton!(LOGICAL_INT32, logical_int32, Int32); | ||
singleton!(LOGICAL_INT64, logical_int64, Int64); | ||
singleton!(LOGICAL_UINT8, logical_uint8, UInt8); | ||
singleton!(LOGICAL_UINT16, logical_uint16, UInt16); | ||
singleton!(LOGICAL_UINT32, logical_uint32, UInt32); | ||
singleton!(LOGICAL_UINT64, logical_uint64, UInt64); | ||
singleton!(LOGICAL_FLOAT16, logical_float16, Float16); | ||
singleton!(LOGICAL_FLOAT32, logical_float32, Float32); | ||
singleton!(LOGICAL_FLOAT64, logical_float64, Float64); | ||
singleton!(LOGICAL_DATE, logical_date, Date); | ||
singleton!(LOGICAL_BINARY, logical_binary, Binary); | ||
singleton!(LOGICAL_STRING, logical_string, String); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,114 @@ | ||
// 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 arrow_schema::{Field, Fields, UnionFields}; | ||
use std::hash::{Hash, Hasher}; | ||
use std::{ops::Deref, sync::Arc}; | ||
|
||
use super::{LogicalTypeRef, NativeType}; | ||
|
||
/// A record of a logical type, its name and its nullability. | ||
#[derive(Debug, Clone, Eq, PartialOrd, Ord)] | ||
pub struct LogicalField { | ||
pub name: String, | ||
pub logical_type: LogicalTypeRef, | ||
pub nullable: bool, | ||
} | ||
|
||
impl PartialEq for LogicalField { | ||
fn eq(&self, other: &Self) -> bool { | ||
self.name == other.name | ||
&& self.logical_type.eq(&other.logical_type) | ||
&& self.nullable == other.nullable | ||
} | ||
} | ||
|
||
impl Hash for LogicalField { | ||
fn hash<H: Hasher>(&self, state: &mut H) { | ||
self.name.hash(state); | ||
self.logical_type.hash(state); | ||
self.nullable.hash(state); | ||
} | ||
} | ||
|
||
impl From<&Field> for LogicalField { | ||
fn from(value: &Field) -> Self { | ||
Self { | ||
name: value.name().clone(), | ||
logical_type: Arc::new(NativeType::from(value.data_type().clone())), | ||
nullable: value.is_nullable(), | ||
} | ||
} | ||
} | ||
|
||
/// A reference counted [`LogicalField`]. | ||
pub type LogicalFieldRef = Arc<LogicalField>; | ||
|
||
/// A cheaply cloneable, owned collection of [`LogicalFieldRef`]. | ||
#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)] | ||
pub struct LogicalFields(Arc<[LogicalFieldRef]>); | ||
|
||
impl Deref for LogicalFields { | ||
type Target = [LogicalFieldRef]; | ||
|
||
fn deref(&self) -> &Self::Target { | ||
self.0.as_ref() | ||
} | ||
} | ||
|
||
impl From<&Fields> for LogicalFields { | ||
fn from(value: &Fields) -> Self { | ||
value | ||
.iter() | ||
.map(|field| Arc::new(LogicalField::from(field.as_ref()))) | ||
.collect() | ||
} | ||
} | ||
|
||
impl FromIterator<LogicalFieldRef> for LogicalFields { | ||
fn from_iter<T: IntoIterator<Item = LogicalFieldRef>>(iter: T) -> Self { | ||
Self(iter.into_iter().collect()) | ||
} | ||
} | ||
|
||
/// A cheaply cloneable, owned collection of [`LogicalFieldRef`] and their | ||
/// corresponding type ids. | ||
#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)] | ||
pub struct LogicalUnionFields(Arc<[(i8, LogicalFieldRef)]>); | ||
|
||
impl Deref for LogicalUnionFields { | ||
type Target = [(i8, LogicalFieldRef)]; | ||
|
||
fn deref(&self) -> &Self::Target { | ||
self.0.as_ref() | ||
} | ||
} | ||
|
||
impl From<&UnionFields> for LogicalUnionFields { | ||
fn from(value: &UnionFields) -> Self { | ||
value | ||
.iter() | ||
.map(|(i, field)| (i, Arc::new(LogicalField::from(field.as_ref())))) | ||
.collect() | ||
} | ||
} | ||
|
||
impl FromIterator<(i8, LogicalFieldRef)> for LogicalUnionFields { | ||
fn from_iter<T: IntoIterator<Item = (i8, LogicalFieldRef)>>(iter: T) -> Self { | ||
Self(iter.into_iter().collect()) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,128 @@ | ||
// 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 super::NativeType; | ||
use crate::error::Result; | ||
use arrow_schema::DataType; | ||
use core::fmt; | ||
use std::{cmp::Ordering, hash::Hash, sync::Arc}; | ||
|
||
/// Signature that uniquely identifies a type among other types. | ||
#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)] | ||
pub enum TypeSignature<'a> { | ||
/// Represents a built-in native type. | ||
Native(&'a NativeType), | ||
/// Represents an arrow-compatible extension type. | ||
/// (<https://arrow.apache.org/docs/format/Columnar.html#extension-types>) | ||
/// | ||
/// The `name` should contain the same value as 'ARROW:extension:name'. | ||
Extension { | ||
name: &'a str, | ||
parameters: &'a [TypeParameter<'a>], | ||
}, | ||
} | ||
|
||
#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)] | ||
pub enum TypeParameter<'a> { | ||
Type(TypeSignature<'a>), | ||
Number(i128), | ||
} | ||
|
||
/// A reference counted [`LogicalType`]. | ||
pub type LogicalTypeRef = Arc<dyn LogicalType>; | ||
|
||
/// Representation of a logical type with its signature and its native backing | ||
/// type. | ||
/// | ||
/// The logical type is meant to be used during the DataFusion logical planning | ||
/// phase in order to reason about logical types without worrying about their | ||
/// underlying physical implementation. | ||
/// | ||
/// ### Extension types | ||
/// | ||
/// [`LogicalType`] is a trait in order to allow the possibility of declaring | ||
/// extension types: | ||
/// | ||
/// ``` | ||
/// use datafusion_common::types::{LogicalType, NativeType, TypeSignature}; | ||
/// | ||
/// struct JSON {} | ||
/// | ||
/// impl LogicalType for JSON { | ||
/// fn native(&self) -> &NativeType { | ||
/// &NativeType::String | ||
/// } | ||
/// | ||
/// fn signature(&self) -> TypeSignature<'_> { | ||
/// TypeSignature::Extension { | ||
/// name: "JSON", | ||
/// parameters: &[], | ||
/// } | ||
/// } | ||
/// } | ||
/// ``` | ||
pub trait LogicalType: Sync + Send { | ||
/// Get the native backing type of this logical type. | ||
fn native(&self) -> &NativeType; | ||
/// Get the unique type signature for this logical type. Logical types with identical | ||
/// signatures are considered equal. | ||
fn signature(&self) -> TypeSignature<'_>; | ||
|
||
/// Get the default physical type to cast `origin` to in order to obtain a physical type | ||
/// that is logically compatible with this logical type. | ||
fn default_cast_for(&self, origin: &DataType) -> Result<DataType> { | ||
self.native().default_cast_for(origin) | ||
} | ||
} | ||
|
||
impl fmt::Debug for dyn LogicalType { | ||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
f.debug_tuple("LogicalType") | ||
.field(&self.signature()) | ||
.field(&self.native()) | ||
.finish() | ||
} | ||
} | ||
|
||
impl PartialEq for dyn LogicalType { | ||
fn eq(&self, other: &Self) -> bool { | ||
self.signature().eq(&other.signature()) | ||
} | ||
} | ||
|
||
impl Eq for dyn LogicalType {} | ||
|
||
impl PartialOrd for dyn LogicalType { | ||
fn partial_cmp(&self, other: &Self) -> Option<Ordering> { | ||
Some(self.cmp(other)) | ||
} | ||
} | ||
|
||
impl Ord for dyn LogicalType { | ||
fn cmp(&self, other: &Self) -> Ordering { | ||
self.signature() | ||
.cmp(&other.signature()) | ||
.then(self.native().cmp(other.native())) | ||
} | ||
} | ||
|
||
impl Hash for dyn LogicalType { | ||
fn hash<H: std::hash::Hasher>(&self, state: &mut H) { | ||
self.signature().hash(state); | ||
self.native().hash(state); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
// 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. | ||
|
||
mod builtin; | ||
mod field; | ||
mod logical; | ||
mod native; | ||
|
||
pub use builtin::*; | ||
pub use field::*; | ||
pub use logical::*; | ||
pub use native::*; |
Oops, something went wrong.