diff --git a/src/datatypes/src/types/primitive_type.rs b/src/datatypes/src/types/primitive_type.rs index 3bef260359..4bba31e857 100644 --- a/src/datatypes/src/types/primitive_type.rs +++ b/src/datatypes/src/types/primitive_type.rs @@ -21,15 +21,15 @@ impl PrimitiveType { } /// Create a new [DataTypeRef] from a primitive type. -pub trait CreateDataType { - fn create_data_type() -> DataTypeRef; +pub trait DataTypeBuilder { + fn build_data_type() -> DataTypeRef; } -macro_rules! impl_create_data_type { +macro_rules! impl_build_data_type { ($Type:ident) => { paste::paste! { - impl CreateDataType for $Type { - fn create_data_type() -> DataTypeRef { + impl DataTypeBuilder for $Type { + fn build_data_type() -> DataTypeRef { Arc::new(PrimitiveType::<$Type>::new()) } } @@ -63,7 +63,7 @@ macro_rules! impl_numeric { } } - impl_create_data_type!($Type); + impl_build_data_type!($Type); }; } diff --git a/src/datatypes/src/vectors/primitive.rs b/src/datatypes/src/vectors/primitive.rs index 0caa466884..e7fa024169 100644 --- a/src/datatypes/src/vectors/primitive.rs +++ b/src/datatypes/src/vectors/primitive.rs @@ -9,7 +9,7 @@ use arrow2::bitmap::utils::ZipValidity; use crate::data_type::DataTypeRef; use crate::scalar::{ScalarVector, ScalarVectorBuilder}; use crate::types::primitive_traits::Primitive; -use crate::types::primitive_type::CreateDataType; +use crate::types::primitive_type::DataTypeBuilder; use crate::vectors::Vector; /// Vector for primitive data types. @@ -23,9 +23,9 @@ impl PrimitiveVector { } } -impl Vector for PrimitiveVector { +impl Vector for PrimitiveVector { fn data_type(&self) -> DataTypeRef { - T::create_data_type() + T::build_data_type() } fn as_any(&self) -> &dyn Any { @@ -41,7 +41,7 @@ impl Vector for PrimitiveVector { } } -impl ScalarVector for PrimitiveVector { +impl ScalarVector for PrimitiveVector { type RefItem<'a> = T; type Iter<'a> = PrimitiveIter<'a, T>; type Builder = PrimitiveVectorBuilder; @@ -90,7 +90,7 @@ pub struct PrimitiveVectorBuilder { mutable_array: MutablePrimitiveArray, } -impl ScalarVectorBuilder for PrimitiveVectorBuilder { +impl ScalarVectorBuilder for PrimitiveVectorBuilder { type VectorType = PrimitiveVector; fn with_capacity(capacity: usize) -> Self {