diff --git a/Cargo.lock b/Cargo.lock index 54e9b0a2964b..eee95568ccd1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3883,7 +3883,7 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "greptime-proto" version = "0.1.0" -source = "git+https://github.com/GreptimeTeam/greptime-proto.git?rev=2c14c6e22dfe957f40bb88dd01fb8530656de89b#2c14c6e22dfe957f40bb88dd01fb8530656de89b" +source = "git+https://github.com/GreptimeTeam/greptime-proto.git?rev=aba235025ac5643c12bfdcefd656af11ad58ea8e#aba235025ac5643c12bfdcefd656af11ad58ea8e" dependencies = [ "prost 0.12.4", "serde", diff --git a/Cargo.toml b/Cargo.toml index ce4a4ced837b..061e0e8b186f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -116,7 +116,7 @@ etcd-client = { git = "https://github.com/MichaelScofield/etcd-client.git", rev fst = "0.4.7" futures = "0.3" futures-util = "0.3" -greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "2c14c6e22dfe957f40bb88dd01fb8530656de89b" } +greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "aba235025ac5643c12bfdcefd656af11ad58ea8e" } humantime = "2.1" humantime-serde = "1.1" itertools = "0.10" diff --git a/src/api/src/helper.rs b/src/api/src/helper.rs index 3f74d2ccc77c..60af91742d19 100644 --- a/src/api/src/helper.rs +++ b/src/api/src/helper.rs @@ -20,21 +20,20 @@ use common_decimal::Decimal128; use common_time::interval::IntervalUnit; use common_time::time::Time; use common_time::timestamp::TimeUnit; -use common_time::{Date, DateTime, Duration, Interval, Timestamp}; +use common_time::{Date, DateTime, Interval, Timestamp}; use datatypes::prelude::{ConcreteDataType, ValueRef}; use datatypes::scalars::ScalarVector; use datatypes::types::{ - DurationType, Int16Type, Int8Type, IntervalType, TimeType, TimestampType, UInt16Type, UInt8Type, + Int16Type, Int8Type, IntervalType, TimeType, TimestampType, UInt16Type, UInt8Type, }; use datatypes::value::{OrderedF32, OrderedF64, Value}; use datatypes::vectors::{ - BinaryVector, BooleanVector, DateTimeVector, DateVector, Decimal128Vector, - DurationMicrosecondVector, DurationMillisecondVector, DurationNanosecondVector, - DurationSecondVector, Float32Vector, Float64Vector, Int32Vector, Int64Vector, - IntervalDayTimeVector, IntervalMonthDayNanoVector, IntervalYearMonthVector, PrimitiveVector, - StringVector, TimeMicrosecondVector, TimeMillisecondVector, TimeNanosecondVector, - TimeSecondVector, TimestampMicrosecondVector, TimestampMillisecondVector, - TimestampNanosecondVector, TimestampSecondVector, UInt32Vector, UInt64Vector, VectorRef, + BinaryVector, BooleanVector, DateTimeVector, DateVector, Decimal128Vector, Float32Vector, + Float64Vector, Int32Vector, Int64Vector, IntervalDayTimeVector, IntervalMonthDayNanoVector, + IntervalYearMonthVector, PrimitiveVector, StringVector, TimeMicrosecondVector, + TimeMillisecondVector, TimeNanosecondVector, TimeSecondVector, TimestampMicrosecondVector, + TimestampMillisecondVector, TimestampNanosecondVector, TimestampSecondVector, UInt32Vector, + UInt64Vector, VectorRef, }; use greptime_proto::v1; use greptime_proto::v1::column_data_type_extension::TypeExt; @@ -127,14 +126,6 @@ impl From for ConcreteDataType { ColumnDataType::IntervalMonthDayNano => { ConcreteDataType::interval_month_day_nano_datatype() } - ColumnDataType::DurationSecond => ConcreteDataType::duration_second_datatype(), - ColumnDataType::DurationMillisecond => { - ConcreteDataType::duration_millisecond_datatype() - } - ColumnDataType::DurationMicrosecond => { - ConcreteDataType::duration_microsecond_datatype() - } - ColumnDataType::DurationNanosecond => ConcreteDataType::duration_nanosecond_datatype(), ColumnDataType::Decimal128 => { if let Some(TypeExt::DecimalType(d)) = datatype_wrapper .datatype_ext @@ -212,11 +203,7 @@ impl_column_type_functions_with_snake!( TimeNanosecond, IntervalYearMonth, IntervalDayTime, - IntervalMonthDayNano, - DurationSecond, - DurationMillisecond, - DurationMicrosecond, - DurationNanosecond + IntervalMonthDayNano ); impl ColumnDataTypeWrapper { @@ -270,16 +257,11 @@ impl TryFrom for ColumnDataTypeWrapper { IntervalType::DayTime(_) => ColumnDataType::IntervalDayTime, IntervalType::MonthDayNano(_) => ColumnDataType::IntervalMonthDayNano, }, - ConcreteDataType::Duration(d) => match d { - DurationType::Second(_) => ColumnDataType::DurationSecond, - DurationType::Millisecond(_) => ColumnDataType::DurationMillisecond, - DurationType::Microsecond(_) => ColumnDataType::DurationMicrosecond, - DurationType::Nanosecond(_) => ColumnDataType::DurationNanosecond, - }, ConcreteDataType::Decimal128(_) => ColumnDataType::Decimal128, ConcreteDataType::Null(_) | ConcreteDataType::List(_) - | ConcreteDataType::Dictionary(_) => { + | ConcreteDataType::Dictionary(_) + | ConcreteDataType::Duration(_) => { return error::IntoColumnDataTypeSnafu { from: datatype }.fail() } }; @@ -409,22 +391,6 @@ pub fn values_with_capacity(datatype: ColumnDataType, capacity: usize) -> Values interval_month_day_nano_values: Vec::with_capacity(capacity), ..Default::default() }, - ColumnDataType::DurationSecond => Values { - duration_second_values: Vec::with_capacity(capacity), - ..Default::default() - }, - ColumnDataType::DurationMillisecond => Values { - duration_millisecond_values: Vec::with_capacity(capacity), - ..Default::default() - }, - ColumnDataType::DurationMicrosecond => Values { - duration_microsecond_values: Vec::with_capacity(capacity), - ..Default::default() - }, - ColumnDataType::DurationNanosecond => Values { - duration_nanosecond_values: Vec::with_capacity(capacity), - ..Default::default() - }, ColumnDataType::Decimal128 => Values { decimal128_values: Vec::with_capacity(capacity), ..Default::default() @@ -476,14 +442,8 @@ pub fn push_vals(column: &mut Column, origin_count: usize, vector: VectorRef) { .interval_month_day_nano_values .push(convert_i128_to_interval(val.to_i128())), }, - Value::Duration(val) => match val.unit() { - TimeUnit::Second => values.duration_second_values.push(val.value()), - TimeUnit::Millisecond => values.duration_millisecond_values.push(val.value()), - TimeUnit::Microsecond => values.duration_microsecond_values.push(val.value()), - TimeUnit::Nanosecond => values.duration_nanosecond_values.push(val.value()), - }, Value::Decimal128(val) => values.decimal128_values.push(convert_to_pb_decimal128(val)), - Value::List(_) => unreachable!(), + Value::List(_) | Value::Duration(_) => unreachable!(), }); column.null_mask = null_mask.into_vec(); } @@ -585,10 +545,6 @@ pub fn pb_value_to_value_ref<'a>( let interval = Interval::from_month_day_nano(v.months, v.days, v.nanoseconds); ValueRef::Interval(interval) } - ValueData::DurationSecondValue(v) => ValueRef::Duration(Duration::new_second(*v)), - ValueData::DurationMillisecondValue(v) => ValueRef::Duration(Duration::new_millisecond(*v)), - ValueData::DurationMicrosecondValue(v) => ValueRef::Duration(Duration::new_microsecond(*v)), - ValueData::DurationNanosecondValue(v) => ValueRef::Duration(Duration::new_nanosecond(*v)), ValueData::Decimal128Value(v) => { // get precision and scale from datatype_extension if let Some(TypeExt::DecimalType(d)) = datatype_ext @@ -683,26 +639,15 @@ pub fn pb_values_to_vector_ref(data_type: &ConcreteDataType, values: Values) -> )) } }, - ConcreteDataType::Duration(unit) => match unit { - DurationType::Second(_) => Arc::new(DurationSecondVector::from_vec( - values.duration_second_values, - )), - DurationType::Millisecond(_) => Arc::new(DurationMillisecondVector::from_vec( - values.duration_millisecond_values, - )), - DurationType::Microsecond(_) => Arc::new(DurationMicrosecondVector::from_vec( - values.duration_microsecond_values, - )), - DurationType::Nanosecond(_) => Arc::new(DurationNanosecondVector::from_vec( - values.duration_nanosecond_values, - )), - }, ConcreteDataType::Decimal128(d) => Arc::new(Decimal128Vector::from_values( values.decimal128_values.iter().map(|x| { Decimal128::from_value_precision_scale(x.hi, x.lo, d.precision(), d.scale()).into() }), )), - ConcreteDataType::Null(_) | ConcreteDataType::List(_) | ConcreteDataType::Dictionary(_) => { + ConcreteDataType::Null(_) + | ConcreteDataType::List(_) + | ConcreteDataType::Dictionary(_) + | ConcreteDataType::Duration(_) => { unreachable!() } } @@ -851,26 +796,6 @@ pub fn pb_values_to_values(data_type: &ConcreteDataType, values: Values) -> Vec< )) }) .collect(), - ConcreteDataType::Duration(DurationType::Second(_)) => values - .duration_second_values - .into_iter() - .map(|v| Value::Duration(Duration::new_second(v))) - .collect(), - ConcreteDataType::Duration(DurationType::Millisecond(_)) => values - .duration_millisecond_values - .into_iter() - .map(|v| Value::Duration(Duration::new_millisecond(v))) - .collect(), - ConcreteDataType::Duration(DurationType::Microsecond(_)) => values - .duration_microsecond_values - .into_iter() - .map(|v| Value::Duration(Duration::new_microsecond(v))) - .collect(), - ConcreteDataType::Duration(DurationType::Nanosecond(_)) => values - .duration_nanosecond_values - .into_iter() - .map(|v| Value::Duration(Duration::new_nanosecond(v))) - .collect(), ConcreteDataType::Decimal128(d) => values .decimal128_values .into_iter() @@ -883,7 +808,10 @@ pub fn pb_values_to_values(data_type: &ConcreteDataType, values: Values) -> Vec< )) }) .collect(), - ConcreteDataType::Null(_) | ConcreteDataType::List(_) | ConcreteDataType::Dictionary(_) => { + ConcreteDataType::Null(_) + | ConcreteDataType::List(_) + | ConcreteDataType::Dictionary(_) + | ConcreteDataType::Duration(_) => { unreachable!() } } @@ -995,24 +923,10 @@ pub fn to_proto_value(value: Value) -> Option { )), }, }, - Value::Duration(v) => match v.unit() { - TimeUnit::Second => v1::Value { - value_data: Some(ValueData::DurationSecondValue(v.value())), - }, - TimeUnit::Millisecond => v1::Value { - value_data: Some(ValueData::DurationMillisecondValue(v.value())), - }, - TimeUnit::Microsecond => v1::Value { - value_data: Some(ValueData::DurationMicrosecondValue(v.value())), - }, - TimeUnit::Nanosecond => v1::Value { - value_data: Some(ValueData::DurationNanosecondValue(v.value())), - }, - }, Value::Decimal128(v) => v1::Value { value_data: Some(ValueData::Decimal128Value(convert_to_pb_decimal128(v))), }, - Value::List(_) => return None, + Value::List(_) | Value::Duration(_) => return None, }; Some(proto_value) @@ -1049,10 +963,6 @@ pub fn proto_value_type(value: &v1::Value) -> Option { ValueData::IntervalYearMonthValue(_) => ColumnDataType::IntervalYearMonth, ValueData::IntervalDayTimeValue(_) => ColumnDataType::IntervalDayTime, ValueData::IntervalMonthDayNanoValue(_) => ColumnDataType::IntervalMonthDayNano, - ValueData::DurationSecondValue(_) => ColumnDataType::DurationSecond, - ValueData::DurationMillisecondValue(_) => ColumnDataType::DurationMillisecond, - ValueData::DurationMicrosecondValue(_) => ColumnDataType::DurationMicrosecond, - ValueData::DurationNanosecondValue(_) => ColumnDataType::DurationNanosecond, ValueData::Decimal128Value(_) => ColumnDataType::Decimal128, }; Some(value_type) @@ -1110,14 +1020,8 @@ pub fn value_to_grpc_value(value: Value) -> GrpcValue { ValueData::IntervalMonthDayNanoValue(convert_i128_to_interval(v.to_i128())) } }), - Value::Duration(v) => Some(match v.unit() { - TimeUnit::Second => ValueData::DurationSecondValue(v.value()), - TimeUnit::Millisecond => ValueData::DurationMillisecondValue(v.value()), - TimeUnit::Microsecond => ValueData::DurationMicrosecondValue(v.value()), - TimeUnit::Nanosecond => ValueData::DurationNanosecondValue(v.value()), - }), Value::Decimal128(v) => Some(ValueData::Decimal128Value(convert_to_pb_decimal128(v))), - Value::List(_) => unreachable!(), + Value::List(_) | Value::Duration(_) => unreachable!(), }, } } @@ -1127,16 +1031,15 @@ mod tests { use std::sync::Arc; use datatypes::types::{ - DurationMillisecondType, DurationSecondType, Int32Type, IntervalDayTimeType, - IntervalMonthDayNanoType, IntervalYearMonthType, TimeMillisecondType, TimeSecondType, - TimestampMillisecondType, TimestampSecondType, UInt32Type, + Int32Type, IntervalDayTimeType, IntervalMonthDayNanoType, IntervalYearMonthType, + TimeMillisecondType, TimeSecondType, TimestampMillisecondType, TimestampSecondType, + UInt32Type, }; use datatypes::vectors::{ - BooleanVector, DurationMicrosecondVector, DurationMillisecondVector, - DurationNanosecondVector, DurationSecondVector, IntervalDayTimeVector, - IntervalMonthDayNanoVector, IntervalYearMonthVector, TimeMicrosecondVector, - TimeMillisecondVector, TimeNanosecondVector, TimeSecondVector, TimestampMicrosecondVector, - TimestampMillisecondVector, TimestampNanosecondVector, TimestampSecondVector, Vector, + BooleanVector, IntervalDayTimeVector, IntervalMonthDayNanoVector, IntervalYearMonthVector, + TimeMicrosecondVector, TimeMillisecondVector, TimeNanosecondVector, TimeSecondVector, + TimestampMicrosecondVector, TimestampMillisecondVector, TimestampNanosecondVector, + TimestampSecondVector, Vector, }; use paste::paste; @@ -1212,10 +1115,6 @@ mod tests { let values = values.interval_month_day_nano_values; assert_eq!(2, values.capacity()); - let values = values_with_capacity(ColumnDataType::DurationMillisecond, 2); - let values = values.duration_millisecond_values; - assert_eq!(2, values.capacity()); - let values = values_with_capacity(ColumnDataType::Decimal128, 2); let values = values.decimal128_values; assert_eq!(2, values.capacity()); @@ -1303,10 +1202,6 @@ mod tests { ConcreteDataType::interval_datatype(IntervalUnit::MonthDayNano), ColumnDataTypeWrapper::interval_month_day_nano_datatype().into() ); - assert_eq!( - ConcreteDataType::duration_millisecond_datatype(), - ColumnDataTypeWrapper::duration_millisecond_datatype().into() - ); assert_eq!( ConcreteDataType::decimal128_datatype(10, 2), ColumnDataTypeWrapper::decimal128_datatype(10, 2).into() @@ -1399,12 +1294,6 @@ mod tests { .try_into() .unwrap() ); - assert_eq!( - ColumnDataTypeWrapper::duration_millisecond_datatype(), - ConcreteDataType::duration_millisecond_datatype() - .try_into() - .unwrap() - ); assert_eq!( ColumnDataTypeWrapper::decimal128_datatype(10, 2), @@ -1558,48 +1447,6 @@ mod tests { }); } - #[test] - fn test_column_put_duration_values() { - let mut column = Column { - column_name: "test".to_string(), - semantic_type: 0, - values: Some(Values { - ..Default::default() - }), - null_mask: vec![], - datatype: 0, - ..Default::default() - }; - - let vector = Arc::new(DurationNanosecondVector::from_vec(vec![1, 2, 3])); - push_vals(&mut column, 3, vector); - assert_eq!( - vec![1, 2, 3], - column.values.as_ref().unwrap().duration_nanosecond_values - ); - - let vector = Arc::new(DurationMicrosecondVector::from_vec(vec![7, 8, 9])); - push_vals(&mut column, 3, vector); - assert_eq!( - vec![7, 8, 9], - column.values.as_ref().unwrap().duration_microsecond_values - ); - - let vector = Arc::new(DurationMillisecondVector::from_vec(vec![4, 5, 6])); - push_vals(&mut column, 3, vector); - assert_eq!( - vec![4, 5, 6], - column.values.as_ref().unwrap().duration_millisecond_values - ); - - let vector = Arc::new(DurationSecondVector::from_vec(vec![10, 11, 12])); - push_vals(&mut column, 3, vector); - assert_eq!( - vec![10, 11, 12], - column.values.as_ref().unwrap().duration_second_values - ); - } - #[test] fn test_column_put_vector() { use crate::v1::SemanticType; @@ -1701,39 +1548,6 @@ mod tests { assert_eq!(expect, actual); } - #[test] - fn test_convert_duration_values() { - // second - let actual = pb_values_to_values( - &ConcreteDataType::Duration(DurationType::Second(DurationSecondType)), - Values { - duration_second_values: vec![1_i64, 2_i64, 3_i64], - ..Default::default() - }, - ); - let expect = vec![ - Value::Duration(Duration::new_second(1_i64)), - Value::Duration(Duration::new_second(2_i64)), - Value::Duration(Duration::new_second(3_i64)), - ]; - assert_eq!(expect, actual); - - // millisecond - let actual = pb_values_to_values( - &ConcreteDataType::Duration(DurationType::Millisecond(DurationMillisecondType)), - Values { - duration_millisecond_values: vec![1_i64, 2_i64, 3_i64], - ..Default::default() - }, - ); - let expect = vec![ - Value::Duration(Duration::new_millisecond(1_i64)), - Value::Duration(Duration::new_millisecond(2_i64)), - Value::Duration(Duration::new_millisecond(3_i64)), - ]; - assert_eq!(expect, actual); - } - #[test] fn test_convert_interval_values() { // year_month diff --git a/src/common/grpc-expr/src/insert.rs b/src/common/grpc-expr/src/insert.rs index 3bb731367005..d8d6ae7736d2 100644 --- a/src/common/grpc-expr/src/insert.rs +++ b/src/common/grpc-expr/src/insert.rs @@ -163,8 +163,8 @@ mod tests { ); let column_defs = create_expr.column_defs; - assert_eq!(column_defs[6].name, create_expr.time_index); - assert_eq!(8, column_defs.len()); + assert_eq!(column_defs[5].name, create_expr.time_index); + assert_eq!(7, column_defs.len()); assert_eq!( ConcreteDataType::string_datatype(), @@ -241,21 +241,6 @@ mod tests { ) ); - assert_eq!( - ConcreteDataType::duration_millisecond_datatype(), - ConcreteDataType::from( - ColumnDataTypeWrapper::try_new( - column_defs - .iter() - .find(|c| c.name == "duration") - .unwrap() - .data_type, - None - ) - .unwrap() - ) - ); - assert_eq!( ConcreteDataType::timestamp_millisecond_datatype(), ConcreteDataType::from( @@ -302,7 +287,7 @@ mod tests { let add_columns = find_new_columns(&schema, &insert_batch.0).unwrap().unwrap(); - assert_eq!(6, add_columns.add_columns.len()); + assert_eq!(5, add_columns.add_columns.len()); let host_column = &add_columns.add_columns[0]; assert_eq!( ConcreteDataType::string_datatype(), @@ -351,20 +336,7 @@ mod tests { ) ); - let duration_column = &add_columns.add_columns[4]; - - assert_eq!( - ConcreteDataType::duration_millisecond_datatype(), - ConcreteDataType::from( - ColumnDataTypeWrapper::try_new( - duration_column.column_def.as_ref().unwrap().data_type, - None - ) - .unwrap() - ) - ); - - let decimal_column = &add_columns.add_columns[5]; + let decimal_column = &add_columns.add_columns[4]; assert_eq!( ConcreteDataType::decimal128_datatype(38, 10), ConcreteDataType::from( @@ -474,19 +446,6 @@ mod tests { ..Default::default() }; - let duration_vals = Values { - duration_millisecond_values: vec![100, 101], - ..Default::default() - }; - let duration_column = Column { - column_name: "duration".to_string(), - semantic_type: SemanticType::Field as i32, - values: Some(duration_vals), - null_mask: vec![0], - datatype: ColumnDataType::DurationMillisecond as i32, - ..Default::default() - }; - let ts_vals = Values { timestamp_millisecond_values: vec![100, 101], ..Default::default() @@ -524,7 +483,6 @@ mod tests { mem_column, time_column, interval_column, - duration_column, ts_column, decimal_column, ], diff --git a/src/common/grpc/src/select.rs b/src/common/grpc/src/select.rs index 6b53a5900c73..df4131bde6fe 100644 --- a/src/common/grpc/src/select.rs +++ b/src/common/grpc/src/select.rs @@ -15,16 +15,14 @@ use api::helper::{convert_i128_to_interval, convert_to_pb_decimal128}; use api::v1::column::Values; use common_base::BitVec; -use datatypes::types::{DurationType, IntervalType, TimeType, TimestampType, WrapperType}; +use datatypes::types::{IntervalType, TimeType, TimestampType, WrapperType}; use datatypes::vectors::{ - BinaryVector, BooleanVector, DateTimeVector, DateVector, Decimal128Vector, - DurationMicrosecondVector, DurationMillisecondVector, DurationNanosecondVector, - DurationSecondVector, Float32Vector, Float64Vector, Int16Vector, Int32Vector, Int64Vector, - Int8Vector, IntervalDayTimeVector, IntervalMonthDayNanoVector, IntervalYearMonthVector, - StringVector, TimeMicrosecondVector, TimeMillisecondVector, TimeNanosecondVector, - TimeSecondVector, TimestampMicrosecondVector, TimestampMillisecondVector, - TimestampNanosecondVector, TimestampSecondVector, UInt16Vector, UInt32Vector, UInt64Vector, - UInt8Vector, VectorRef, + BinaryVector, BooleanVector, DateTimeVector, DateVector, Decimal128Vector, Float32Vector, + Float64Vector, Int16Vector, Int32Vector, Int64Vector, Int8Vector, IntervalDayTimeVector, + IntervalMonthDayNanoVector, IntervalYearMonthVector, StringVector, TimeMicrosecondVector, + TimeMillisecondVector, TimeNanosecondVector, TimeSecondVector, TimestampMicrosecondVector, + TimestampMillisecondVector, TimestampNanosecondVector, TimestampSecondVector, UInt16Vector, + UInt32Vector, UInt64Vector, UInt8Vector, VectorRef, }; use snafu::OptionExt; @@ -72,7 +70,7 @@ macro_rules! convert_arrow_array_to_grpc_vals { return Ok(vals); }, )+ - ConcreteDataType::Null(_) | ConcreteDataType::List(_) | ConcreteDataType::Dictionary(_) => unreachable!("Should not send {:?} in gRPC", $data_type), + ConcreteDataType::Null(_) | ConcreteDataType::List(_) | ConcreteDataType::Dictionary(_) | ConcreteDataType::Duration(_) => unreachable!("Should not send {:?} in gRPC", $data_type), } }}; } @@ -215,30 +213,6 @@ pub fn values(arrays: &[VectorRef]) -> Result { interval_month_day_nano_values, |x| { convert_i128_to_interval(x.into_native()) } ), - ( - ConcreteDataType::Duration(DurationType::Second(_)), - DurationSecondVector, - duration_second_values, - |x| { x.into_native() } - ), - ( - ConcreteDataType::Duration(DurationType::Millisecond(_)), - DurationMillisecondVector, - duration_millisecond_values, - |x| { x.into_native() } - ), - ( - ConcreteDataType::Duration(DurationType::Microsecond(_)), - DurationMicrosecondVector, - duration_microsecond_values, - |x| { x.into_native() } - ), - ( - ConcreteDataType::Duration(DurationType::Nanosecond(_)), - DurationNanosecondVector, - duration_nanosecond_values, - |x| { x.into_native() } - ), ( ConcreteDataType::Decimal128(_), Decimal128Vector, @@ -311,16 +285,6 @@ mod tests { }) } - #[test] - fn test_convert_arrow_array_duration_second() { - let array = DurationSecondVector::from(vec![Some(1), Some(2), None, Some(3)]); - let array: VectorRef = Arc::new(array); - - let values = values(&[array]).unwrap(); - - assert_eq!(vec![1, 2, 3], values.duration_second_values); - } - #[test] fn test_convert_arrow_array_decimal128() { let array = Decimal128Vector::from(vec![Some(1), Some(2), None, Some(3)]); diff --git a/src/operator/src/req_convert/common.rs b/src/operator/src/req_convert/common.rs index 3c63d0f4b075..0073e934b993 100644 --- a/src/operator/src/req_convert/common.rs +++ b/src/operator/src/req_convert/common.rs @@ -161,22 +161,6 @@ fn push_column_to_rows(column: Column, rows: &mut [Row]) -> Result<()> { IntervalMonthDayNanoValue, interval_month_day_nano_values ), - (DurationSecond, DurationSecondValue, duration_second_values), - ( - DurationMillisecond, - DurationMillisecondValue, - duration_millisecond_values - ), - ( - DurationMicrosecond, - DurationMicrosecondValue, - duration_microsecond_values - ), - ( - DurationNanosecond, - DurationNanosecondValue, - duration_nanosecond_values - ), (Decimal128, Decimal128Value, decimal128_values), );