Skip to content

Commit 84de48d

Browse files
committed
cargo clippy
1 parent 55add74 commit 84de48d

File tree

9 files changed

+48
-33
lines changed

9 files changed

+48
-33
lines changed

Cargo.lock

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/api/src/helper.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,8 @@ impl TryFrom<ConcreteDataType> for ColumnDataTypeWrapper {
111111
TimeType::Microsecond(_) => ColumnDataType::TimeMicrosecond,
112112
TimeType::Nanosecond(_) => ColumnDataType::TimeNanosecond,
113113
},
114-
ConcreteDataType::Interval(_) => {
115-
todo!("ColumnDataType: Interval datatype not supported yet")
116-
}
117-
ConcreteDataType::Null(_)
114+
ConcreteDataType::Interval(_)
115+
| ConcreteDataType::Null(_)
118116
| ConcreteDataType::List(_)
119117
| ConcreteDataType::Dictionary(_) => {
120118
return error::IntoColumnDataTypeSnafu { from: datatype }.fail()

src/common/grpc-expr/src/insert.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -424,8 +424,10 @@ fn values_to_vector(data_type: &ConcreteDataType, values: Values) -> VectorRef {
424424
)),
425425
},
426426

427-
ConcreteDataType::Interval(_) => todo!("Interval type is not supported yet"),
428-
ConcreteDataType::Null(_) | ConcreteDataType::List(_) | ConcreteDataType::Dictionary(_) => {
427+
ConcreteDataType::Interval(_)
428+
| ConcreteDataType::Null(_)
429+
| ConcreteDataType::List(_)
430+
| ConcreteDataType::Dictionary(_) => {
429431
unreachable!()
430432
}
431433
}
@@ -554,8 +556,10 @@ fn convert_values(data_type: &ConcreteDataType, values: Values) -> Vec<Value> {
554556
.map(|v| Value::Time(Time::new_nanosecond(v)))
555557
.collect(),
556558

557-
ConcreteDataType::Interval(_) => todo!("Interval type is not supported yet"),
558-
ConcreteDataType::Null(_) | ConcreteDataType::List(_) | ConcreteDataType::Dictionary(_) => {
559+
ConcreteDataType::Interval(_)
560+
| ConcreteDataType::Null(_)
561+
| ConcreteDataType::List(_)
562+
| ConcreteDataType::Dictionary(_) => {
559563
unreachable!()
560564
}
561565
}

src/datatypes/src/data_type.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ use crate::type_id::LogicalTypeId;
2828
use crate::types::{
2929
BinaryType, BooleanType, DateTimeType, DateType, DictionaryType, Float32Type, Float64Type,
3030
Int16Type, Int32Type, Int64Type, Int8Type, IntervalDayTimeType, IntervalMonthDayNanoType,
31-
IntervalType, IntervalYearMonthType, ListType, NullType, StringType, TimeMillisecondType, TimeType, TimestampMicrosecondType,
32-
TimestampMillisecondType, TimestampNanosecondType, TimestampSecondType, TimestampType,
33-
UInt16Type, UInt32Type, UInt64Type, UInt8Type,
31+
IntervalType, IntervalYearMonthType, ListType, NullType, StringType, TimeMillisecondType,
32+
TimeType, TimestampMicrosecondType, TimestampMillisecondType, TimestampNanosecondType,
33+
TimestampSecondType, TimestampType, UInt16Type, UInt32Type, UInt64Type, UInt8Type,
3434
};
3535
use crate::value::Value;
3636
use crate::vectors::MutableVector;

src/datatypes/src/value.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ use common_base::bytes::{Bytes, StringBytes};
2222
use common_telemetry::logging;
2323
use common_time::date::Date;
2424
use common_time::datetime::DateTime;
25-
use common_time::time::Time;
2625
use common_time::interval::IntervalUnit;
26+
use common_time::time::Time;
2727
use common_time::timestamp::{TimeUnit, Timestamp};
2828
use common_time::Interval;
2929
use datafusion_common::ScalarValue;

src/datatypes/src/vectors/eq.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ use crate::vectors::constant::ConstantVector;
2222
use crate::vectors::{
2323
BinaryVector, BooleanVector, DateTimeVector, DateVector, IntervalDayTimeVector,
2424
IntervalMonthDayNanoVector, IntervalYearMonthVector, ListVector, PrimitiveVector, StringVector,
25-
TimeMicrosecondVector, TimeMillisecondVector, TimeNanosecondVector,
26-
TimeSecondVector, TimestampMicrosecondVector, TimestampMillisecondVector, TimestampNanosecondVector,
25+
TimeMicrosecondVector, TimeMillisecondVector, TimeNanosecondVector, TimeSecondVector,
26+
TimestampMicrosecondVector, TimestampMillisecondVector, TimestampNanosecondVector,
2727
TimestampSecondVector, Vector,
2828
};
2929
use crate::with_match_primitive_type_id;

src/datatypes/src/vectors/helper.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,10 @@ use crate::value::{ListValue, ListValueRef};
3333
use crate::vectors::{
3434
BinaryVector, BooleanVector, ConstantVector, DateTimeVector, DateVector, Float32Vector,
3535
Float64Vector, Int16Vector, Int32Vector, Int64Vector, Int8Vector, IntervalMonthDayNanoVector,
36-
ListVector, ListVectorBuilder, MutableVector, NullVector, StringVector,
37-
TimeMicrosecondVector,
38-
TimeMillisecondVector, TimeNanosecondVector, TimeSecondVector, TimestampMicrosecondVector, TimestampMillisecondVector, TimestampNanosecondVector,
39-
TimestampSecondVector, UInt16Vector, UInt32Vector, UInt64Vector, UInt8Vector, Vector,
40-
VectorRef,
36+
ListVector, ListVectorBuilder, MutableVector, NullVector, StringVector, TimeMicrosecondVector,
37+
TimeMillisecondVector, TimeNanosecondVector, TimeSecondVector, TimestampMicrosecondVector,
38+
TimestampMillisecondVector, TimestampNanosecondVector, TimestampSecondVector, UInt16Vector,
39+
UInt32Vector, UInt64Vector, UInt8Vector, Vector, VectorRef,
4140
};
4241

4342
/// Helper functions for `Vector`.

src/datatypes/src/vectors/primitive.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,9 +494,9 @@ mod tests {
494494
use crate::serialize::Serializable;
495495
use crate::types::Int64Type;
496496
use crate::vectors::{
497-
TimeMicrosecondVector, TimeMillisecondVector, TimeNanosecondVector, TimeSecondVector,
497+
IntervalDayTimeVector, IntervalYearMonthVector, TimeMicrosecondVector,
498+
TimeMillisecondVector, TimeNanosecondVector, TimeSecondVector,
498499
};
499-
use crate::vectors::{IntervalDayTimeVector, IntervalYearMonthVector};
500500

501501
fn check_vec(v: Int32Vector) {
502502
assert_eq!(4, v.len());

src/servers/src/postgres/types.rs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -97,18 +97,14 @@ pub(super) fn encode_value(value: &Value, builder: &mut DataRowEncoder) -> PgWir
9797
})))
9898
}
9999
}
100-
Value::Interval(_) => Err(PgWireError::ApiError(Box::new(Error::Internal {
101-
err_msg: format!(
102-
"cannot write value {:?} in postgres protocol: unimplemented",
103-
&value
104-
),
105-
}))),
106-
Value::List(_) => Err(PgWireError::ApiError(Box::new(Error::Internal {
107-
err_msg: format!(
108-
"cannot write value {:?} in postgres protocol: unimplemented",
109-
&value
110-
),
111-
}))),
100+
Value::Interval(_) | Value::List(_) => {
101+
Err(PgWireError::ApiError(Box::new(Error::Internal {
102+
err_msg: format!(
103+
"cannot write value {:?} in postgres protocol: unimplemented",
104+
&value
105+
),
106+
})))
107+
}
112108
}
113109
}
114110

0 commit comments

Comments
 (0)