-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[logical-types branch] Backport native and logical types (#13016)
* Backport native and logical types from #12853 * Fix clippy error on wasmtest (#12844) --------- Co-authored-by: Jonah Gao <[email protected]>
- Loading branch information
1 parent
22cb506
commit 861a8b7
Showing
7 changed files
with
513 additions
and
3 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,39 @@ | ||
// 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::{LogicalType, NativeType}; | ||
|
||
#[derive(Debug)] | ||
pub struct BuiltinType { | ||
native: NativeType, | ||
} | ||
|
||
impl LogicalType for BuiltinType { | ||
fn native(&self) -> &NativeType { | ||
&self.native | ||
} | ||
|
||
fn name(&self) -> Option<&str> { | ||
None | ||
} | ||
} | ||
|
||
impl From<NativeType> for BuiltinType { | ||
fn from(native: NativeType) -> Self { | ||
Self { native } | ||
} | ||
} |
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,118 @@ | ||
// 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 core::fmt; | ||
use std::{cmp::Ordering, hash::Hash, sync::Arc}; | ||
|
||
use super::NativeType; | ||
|
||
/// 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::Utf8 | ||
/// } | ||
/// | ||
/// fn signature(&self) -> TypeSignature<'_> { | ||
/// TypeSignature::Extension { | ||
/// name: "JSON", | ||
/// parameters: &[], | ||
/// } | ||
/// } | ||
/// } | ||
/// ``` | ||
pub trait LogicalType: Sync + Send { | ||
fn native(&self) -> &NativeType; | ||
fn signature(&self) -> TypeSignature<'_>; | ||
} | ||
|
||
impl fmt::Debug for dyn LogicalType { | ||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::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.native().eq(other.native()) && 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,22 @@ | ||
// 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 logical; | ||
mod native; | ||
|
||
pub use logical::*; | ||
pub use native::*; |
Oops, something went wrong.