refactor(query): introduces ReturnType, ZeroSizeType, AccessType (#17935)

* return type

Signed-off-by: coldWater <[email protected]>

* AccessType

Signed-off-by: coldWater <[email protected]>

* zero size type

Signed-off-by: coldWater <[email protected]>

* refine SimpleValueType

Signed-off-by: coldWater <[email protected]>

* function

Signed-off-by: coldWater <[email protected]>

---------

Signed-off-by: coldWater <[email protected]>

Author: forsaken628

src/common/native/src/read/array/double.rs

@@ -17,9 +17,9 @@ use std::io::Cursor;
 use std::marker::PhantomData;
 
 use databend_common_column::buffer::Buffer;
+use databend_common_expression::types::AccessType;
 use databend_common_expression::types::Number;
 use databend_common_expression::types::NumberType;
-use databend_common_expression::types::ValueType;
 use databend_common_expression::Column;
 use databend_common_expression::TableDataType;
 

src/common/native/src/read/array/interval.rs

@@ -16,8 +16,8 @@ use std::io::Cursor;
 
 use databend_common_column::buffer::Buffer;
 use databend_common_column::types::months_days_micros;
+use databend_common_expression::types::AccessType;
 use databend_common_expression::types::IntervalType;
-use databend_common_expression::types::ValueType;
 use databend_common_expression::Column;
 use databend_common_expression::TableDataType;
 

src/query/expression/benches/bench.rs

@@ -19,9 +19,9 @@ use databend_common_column::bitmap::Bitmap;
 use databend_common_column::buffer::Buffer;
 use databend_common_expression::arrow::deserialize_column;
 use databend_common_expression::arrow::serialize_column;
-use databend_common_expression::types::ArgType;
 use databend_common_expression::types::BinaryType;
 use databend_common_expression::types::DecimalType;
+use databend_common_expression::types::ReturnType;
 use databend_common_expression::types::StringType;
 use databend_common_expression::Column;
 use databend_common_expression::DataBlock;

src/query/expression/src/aggregate/group_hash.rs

@@ -467,6 +467,7 @@ mod tests {
     use databend_common_column::bitmap::Bitmap;
 
     use super::*;
+    use crate::types::AccessType;
     use crate::types::ArgType;
     use crate::types::Int32Type;
     use crate::types::NullableColumn;

src/query/expression/src/aggregate/payload_flush.rs

@@ -28,15 +28,16 @@ use crate::types::i256;
 use crate::types::nullable::NullableColumn;
 use crate::types::string::StringColumn;
 use crate::types::string::StringColumnBuilder;
+use crate::types::AccessType;
 use crate::types::ArgType;
 use crate::types::BooleanType;
 use crate::types::DataType;
 use crate::types::DateType;
 use crate::types::DecimalSize;
 use crate::types::NumberDataType;
 use crate::types::NumberType;
+use crate::types::ReturnType;
 use crate::types::TimestampType;
-use crate::types::ValueType;
 use crate::with_number_mapped_type;
 use crate::Column;
 use crate::ColumnBuilder;
@@ -287,7 +288,7 @@ impl Payload {
     ) -> Column {
         let len = state.probe_state.row_count;
         let iter = (0..len).map(|idx| unsafe {
-            read::<<DecimalType<Num> as ValueType>::Scalar>(
+            read::<<DecimalType<Num> as AccessType>::Scalar>(
                 state.addresses[idx].add(col_offset) as _
             )
         });

src/query/expression/src/aggregate/payload_row.rs

@@ -23,8 +23,8 @@ use crate::types::binary::BinaryColumn;
 use crate::types::decimal::DecimalColumn;
 use crate::types::decimal::DecimalType;
 use crate::types::i256;
+use crate::types::AccessType;
 use crate::types::AnyType;
-use crate::types::ArgType;
 use crate::types::BinaryType;
 use crate::types::BooleanType;
 use crate::types::DataType;
@@ -34,7 +34,6 @@ use crate::types::NumberType;
 use crate::types::StringColumn;
 use crate::types::StringType;
 use crate::types::TimestampType;
-use crate::types::ValueType;
 use crate::with_decimal_mapped_type;
 use crate::with_number_mapped_type;
 use crate::Column;
@@ -507,7 +506,7 @@ unsafe fn row_match_string_column(
     *count = match_count;
 }
 
-unsafe fn row_match_column_type<T: ArgType>(
+unsafe fn row_match_column_type<T: AccessType>(
     col: &Column,
     validity: Option<&Bitmap>,
     address: &[*const u8],
@@ -532,7 +531,7 @@ unsafe fn row_match_column_type<T: ArgType>(
             let is_set = is_all_set || validity.get_bit_unchecked(idx);
             if is_set && is_set2 {
                 let address = address[idx].add(col_offset);
-                let scalar = read::<<T as ValueType>::Scalar>(address as _);
+                let scalar = read::<T::Scalar>(address as _);
                 let value = T::index_column_unchecked(&col, idx);
                 let value = T::to_owned_scalar(value);
 
@@ -554,7 +553,7 @@ unsafe fn row_match_column_type<T: ArgType>(
             let idx = *idx;
             let value = T::index_column_unchecked(&col, idx);
             let address = address[idx].add(col_offset);
-            let scalar = read::<<T as ValueType>::Scalar>(address as _);
+            let scalar = read::<T::Scalar>(address as _);
             let value = T::to_owned_scalar(value);
 
             if scalar.eq(&value) {

src/query/expression/src/evaluator.rs

@@ -39,11 +39,11 @@ use crate::types::boolean::BooleanDomain;
 use crate::types::nullable::NullableColumn;
 use crate::types::nullable::NullableDomain;
 use crate::types::string::StringColumnBuilder;
-use crate::types::ArgType;
 use crate::types::BooleanType;
 use crate::types::DataType;
 use crate::types::NullableType;
 use crate::types::NumberScalar;
+use crate::types::ReturnType;
 use crate::types::StringType;
 use crate::types::VariantType;
 use crate::values::Column;

src/query/expression/src/filter/select_value/mod.rs

@@ -16,8 +16,8 @@ use databend_common_column::bitmap::Bitmap;
 use databend_common_exception::Result;
 
 use crate::types::string::StringColumn;
+use crate::types::AccessType;
 use crate::types::AnyType;
-use crate::types::ValueType;
 use crate::with_mapped_cmp_method;
 use crate::LikePattern;
 use crate::SelectOp;
@@ -31,7 +31,7 @@ mod select_scalar;
 
 impl Selector<'_> {
     #[allow(clippy::too_many_arguments)]
-    pub(crate) fn select_type_values_cmp<T: ValueType>(
+    pub(crate) fn select_type_values_cmp<T: AccessType>(
         &self,
         op: &SelectOp,
         left: Value<AnyType>,
@@ -62,7 +62,7 @@ impl Selector<'_> {
 
     #[allow(clippy::too_many_arguments)]
     pub(crate) fn select_type_values<
-        T: ValueType,
+        T: AccessType,
         C: Fn(T::ScalarRef<'_>, T::ScalarRef<'_>) -> bool,
     >(
         &self,

src/query/expression/src/filter/select_value/select_column.rs

@@ -17,13 +17,13 @@ use databend_common_exception::Result;
 
 use crate::filter::SelectStrategy;
 use crate::filter::Selector;
-use crate::types::ValueType;
+use crate::types::AccessType;
 
 impl Selector<'_> {
     // Select indices by comparing two columns.
     #[allow(clippy::too_many_arguments)]
     pub(crate) fn select_columns<
-        T: ValueType,
+        T: AccessType,
         C: Fn(T::ScalarRef<'_>, T::ScalarRef<'_>) -> bool,
         const FALSE: bool,
     >(

src/query/expression/src/filter/select_value/select_column_scalar.rs

@@ -18,14 +18,14 @@ use databend_common_exception::Result;
 use crate::filter::SelectStrategy;
 use crate::filter::Selector;
 use crate::types::string::StringColumn;
-use crate::types::ValueType;
+use crate::types::AccessType;
 use crate::LikePattern;
 
 impl<'a> Selector<'a> {
     // Select indices by comparing scalar and column.
     #[allow(clippy::too_many_arguments)]
     pub(crate) fn select_column_scalar<
-        T: ValueType,
+        T: AccessType,
         C: Fn(T::ScalarRef<'_>, T::ScalarRef<'_>) -> bool,
         const FALSE: bool,
     >(