rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-05-24 00:40:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: upgrade rust toolchain to latest nightly (#2049)

Browse Source 
* chore: upgrade rust toolchain to latest nightly

* rebase develop

* update rust toolchain in ci
This commit is contained in:
LFC
2023-08-08 15:17:51 +08:00
committed by GitHub
parent 7d0d8dc6e3
commit 46fa3eb629
127 changed files with 551 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/datasource/src/file_format/orc.rs
View File

@@ -198,9 +198,8 @@ mod tests {
#[tokio::test]
async fn test_orc_infer_schema() {
let orc = OrcFormat::default();
let store = test_store(&test_data_root());
let schema = orc.infer_schema(&store, "test.orc").await.unwrap();
let schema = OrcFormat.infer_schema(&store, "test.orc").await.unwrap();
let formatted: Vec<_> = format_schema(schema);
assert_eq!(

5
src/common/datasource/src/file_format/tests.rs
View File

@@ -181,7 +181,7 @@ async fn test_parquet_exec() {
.await;
assert_batches_eq!(
vec![
[
"+-----+-------+",
"| num | str |",
"+-----+-------+",
@@ -198,8 +198,7 @@ async fn test_parquet_exec() {
async fn test_orc_opener() {
let root = test_util::get_data_dir("tests/orc").display().to_string();
let store = test_store(&root);
let orc = OrcFormat::default();
let schema = orc.infer_schema(&store, "test.orc").await.unwrap();
let schema = OrcFormat.infer_schema(&store, "test.orc").await.unwrap();
let schema = Arc::new(schema);
let orc_opener = OrcOpener::new(store.clone(), schema.clone(), None);

2
src/common/function-macro/Cargo.toml
View File

@@ -10,7 +10,7 @@ proc-macro = true
[dependencies]
backtrace = "0.3"
common-telemetry = { path = "../telemetry" }
proc-macro2 = "1.0"
proc-macro2 = "1.0.66"
quote = "1.0"
syn = "1.0"

4
src/common/function-macro/src/lib.rs
View File

@@ -146,7 +146,9 @@ pub fn print_caller(args: TokenStream, input: TokenStream) -> TokenStream {
.expect("Expected an ident!")
.to_string();
if ident == "depth" {
let Lit::Int(i) = &name_value.lit else { panic!("Expected 'depth' to be a valid int!") };
let Lit::Int(i) = &name_value.lit else {
panic!("Expected 'depth' to be a valid int!")
};
depth = i.base10_parse::<usize>().expect("Invalid 'depth' value");
break;
}

2
src/common/function/src/scalars/function_registry.rs
View File

@@ -89,7 +89,7 @@ mod tests {
#[test]
fn test_function_registry() {
let registry = FunctionRegistry::default();
let func = Arc::new(TestAndFunction::default());
let func = Arc::new(TestAndFunction);
assert!(registry.get_function("test_and").is_none());
assert!(registry.functions().is_empty());

4
src/common/function/src/scalars/math.rs
View File

@@ -26,7 +26,7 @@ pub(crate) struct MathFunction;
impl MathFunction {
pub fn register(registry: &FunctionRegistry) {
registry.register(Arc::new(PowFunction::default()));
registry.register(Arc::new(RateFunction::default()))
registry.register(Arc::new(PowFunction));
registry.register(Arc::new(RateFunction))
}
}

2
src/common/function/src/scalars/math/pow.rs
View File

@@ -85,7 +85,7 @@ mod tests {
use super::*;
#[test]
fn test_pow_function() {
let pow = PowFunction::default();
let pow = PowFunction;
assert_eq!("pow", pow.name());
assert_eq!(

2
src/common/function/src/scalars/math/rate.rs
View File

@@ -80,7 +80,7 @@ mod tests {
use super::*;
#[test]
fn test_rate_function() {
let rate = RateFunction::default();
let rate = RateFunction;
assert_eq!("prom_rate", rate.name());
assert_eq!(
ConcreteDataType::float64_datatype(),

2
src/common/function/src/scalars/numpy.rs
View File

@@ -25,6 +25,6 @@ pub(crate) struct NumpyFunction;
impl NumpyFunction {
pub fn register(registry: &FunctionRegistry) {
registry.register(Arc::new(ClipFunction::default()));
registry.register(Arc::new(ClipFunction));
}
}

20
src/common/function/src/scalars/numpy/clip.rs
View File

@@ -156,7 +156,7 @@ mod tests {
#[test]
fn test_clip_signature() {
let clip = ClipFunction::default();
let clip = ClipFunction;
assert_eq!("clip", clip.name());
assert_eq!(
@@ -202,8 +202,6 @@ mod tests {
#[test]
fn test_clip_fn_signed() {
let clip = ClipFunction::default();
// eval with signed integers
let args: Vec<VectorRef> = vec![
Arc::new(Int32Vector::from_values(0..10)),
@@ -217,7 +215,9 @@ mod tests {
)),
];
let vector = clip.eval(FunctionContext::default(), &args).unwrap();
let vector = ClipFunction
.eval(FunctionContext::default(), &args)
.unwrap();
assert_eq!(10, vector.len());
// clip([0, 1, 2, 3, 4, 5, 6, 7, 8, 9], 3, 6) = [3, 3, 3, 3, 4, 5, 6, 6, 6, 6]
@@ -234,8 +234,6 @@ mod tests {
#[test]
fn test_clip_fn_unsigned() {
let clip = ClipFunction::default();
// eval with unsigned integers
let args: Vec<VectorRef> = vec![
Arc::new(UInt8Vector::from_values(0..10)),
@@ -249,7 +247,9 @@ mod tests {
)),
];
let vector = clip.eval(FunctionContext::default(), &args).unwrap();
let vector = ClipFunction
.eval(FunctionContext::default(), &args)
.unwrap();
assert_eq!(10, vector.len());
// clip([0, 1, 2, 3, 4, 5, 6, 7, 8, 9], 3, 6) = [3, 3, 3, 3, 4, 5, 6, 6, 6, 6]
@@ -266,8 +266,6 @@ mod tests {
#[test]
fn test_clip_fn_float() {
let clip = ClipFunction::default();
// eval with floats
let args: Vec<VectorRef> = vec![
Arc::new(Int8Vector::from_values(0..10)),
@@ -281,7 +279,9 @@ mod tests {
)),
];
let vector = clip.eval(FunctionContext::default(), &args).unwrap();
let vector = ClipFunction
.eval(FunctionContext::default(), &args)
.unwrap();
assert_eq!(10, vector.len());
// clip([0, 1, 2, 3, 4, 5, 6, 7, 8, 9], 3, 6) = [3, 3, 3, 3, 4, 5, 6, 6, 6, 6]

4
src/common/function/src/scalars/numpy/interp.rs
View File

@@ -291,7 +291,7 @@ mod tests {
];
let vector = interp(&args).unwrap();
assert_eq!(4, vector.len());
let res = vec![3.0, 3.0, 2.5, 0.0];
let res = [3.0, 3.0, 2.5, 0.0];
for (i, item) in res.iter().enumerate().take(vector.len()) {
assert!(matches!(vector.get(i),Value::Float64(v) if v==*item));
}
@@ -305,7 +305,7 @@ mod tests {
let left = vec![-1];
let right = vec![2];
let expect = vec![-1.0, 3.0, 2.5, 2.0, 0.0, 2.0];
let expect = [-1.0, 3.0, 2.5, 2.0, 0.0, 2.0];
let args: Vec<VectorRef> = vec![
Arc::new(Float64Vector::from_vec(x)),

2
src/common/function/src/scalars/timestamp.rs
View File

@@ -22,6 +22,6 @@ pub(crate) struct TimestampFunction;
impl TimestampFunction {
pub fn register(registry: &FunctionRegistry) {
registry.register(Arc::new(ToUnixtimeFunction::default()));
registry.register(Arc::new(ToUnixtimeFunction));
}
}

12
src/common/function/src/scalars/timestamp/to_unixtime.rs
View File

@@ -162,7 +162,7 @@ mod tests {
#[test]
fn test_string_to_unixtime() {
let f = ToUnixtimeFunction::default();
let f = ToUnixtimeFunction;
assert_eq!("to_unixtime", f.name());
assert_eq!(
ConcreteDataType::int64_datatype(),
@@ -190,7 +190,7 @@ mod tests {
Some("2022-06-30T23:59:60Z"),
Some("invalid_time_stamp"),
];
let results = vec![Some(1677652502), None, Some(1656633600), None];
let results = [Some(1677652502), None, Some(1656633600), None];
let args: Vec<VectorRef> = vec![Arc::new(StringVector::from(times.clone()))];
let vector = f.eval(FunctionContext::default(), &args).unwrap();
assert_eq!(4, vector.len());
@@ -211,7 +211,7 @@ mod tests {
#[test]
fn test_int_to_unixtime() {
let f = ToUnixtimeFunction::default();
let f = ToUnixtimeFunction;
assert_eq!("to_unixtime", f.name());
assert_eq!(
ConcreteDataType::int64_datatype(),
@@ -234,7 +234,7 @@ mod tests {
));
let times = vec![Some(3_i64), None, Some(5_i64), None];
let results = vec![Some(3), None, Some(5), None];
let results = [Some(3), None, Some(5), None];
let args: Vec<VectorRef> = vec![Arc::new(Int64Vector::from(times.clone()))];
let vector = f.eval(FunctionContext::default(), &args).unwrap();
assert_eq!(4, vector.len());
@@ -255,7 +255,7 @@ mod tests {
#[test]
fn test_timestamp_to_unixtime() {
let f = ToUnixtimeFunction::default();
let f = ToUnixtimeFunction;
assert_eq!("to_unixtime", f.name());
assert_eq!(
ConcreteDataType::int64_datatype(),
@@ -283,7 +283,7 @@ mod tests {
Some(TimestampSecond::new(42)),
None,
];
let results = vec![Some(123), None, Some(42), None];
let results = [Some(123), None, Some(42), None];
let ts_vector: TimestampSecondVector = build_vector_from_slice(&times);
let args: Vec<VectorRef> = vec![Arc::new(ts_vector)];
let vector = f.eval(FunctionContext::default(), &args).unwrap();

2
src/common/function/src/scalars/udf.rs
View File

@@ -77,7 +77,7 @@ mod tests {
#[test]
fn test_create_udf() {
let f = Arc::new(TestAndFunction::default());
let f = Arc::new(TestAndFunction);
let args: Vec<VectorRef> = vec![
Arc::new(ConstantVector::new(

16
src/common/grpc/src/flight.rs
View File

@@ -249,7 +249,9 @@ mod test {
)
.unwrap();
assert_eq!(flight_data.len(), 3);
let [d1, d2, d3] = flight_data.as_slice() else { unreachable!() };
let [d1, d2, d3] = flight_data.as_slice() else {
unreachable!()
};
let decoder = &mut FlightDecoder::default();
assert!(decoder.schema.is_none());
@@ -263,19 +265,25 @@ mod test {
let message = decoder.try_decode(d1.clone()).unwrap();
assert!(matches!(message, FlightMessage::Schema(_)));
let FlightMessage::Schema(decoded_schema) = message else { unreachable!() };
let FlightMessage::Schema(decoded_schema) = message else {
unreachable!()
};
assert_eq!(decoded_schema, schema);
let _ = decoder.schema.as_ref().unwrap();
let message = decoder.try_decode(d2.clone()).unwrap();
assert!(matches!(message, FlightMessage::Recordbatch(_)));
let FlightMessage::Recordbatch(actual_batch) = message else { unreachable!() };
let FlightMessage::Recordbatch(actual_batch) = message else {
unreachable!()
};
assert_eq!(actual_batch, batch1);
let message = decoder.try_decode(d3.clone()).unwrap();
assert!(matches!(message, FlightMessage::Recordbatch(_)));
let FlightMessage::Recordbatch(actual_batch) = message else { unreachable!() };
let FlightMessage::Recordbatch(actual_batch) = message else {
unreachable!()
};
assert_eq!(actual_batch, batch2);
}

3
src/common/meta/src/key/datanode_table.rs
View File

@@ -123,7 +123,8 @@ impl DatanodeTableManager {
let Some(curr) = resp
.prev_kv
.map(|kv| DatanodeTableValue::try_from_raw_value(kv.value))
.transpose()? else {
.transpose()?
else {
return UnexpectedSnafu {
err_msg: format!("compare_and_put expect None but failed with current value None, key: {key}, val: {val:?}"),
}.fail();

2
src/common/meta/src/key/table_info.rs
View File

@@ -81,7 +81,7 @@ impl TableInfoManager {
let Some(curr) = curr else {
return UnexpectedSnafu {
err_msg: format!("compare_and_put expect None but failed with current value None, table_id: {table_id}, table_info: {table_info:?}"),
}.fail()
}.fail();
};
ensure!(
&curr.table_info == table_info,

8
src/common/meta/src/key/table_name.rs
View File

@@ -163,10 +163,11 @@ impl TableNameManager {
let Some(curr) = result
.prev_kv
.map(|x| TableNameValue::try_from_raw_value(x.value))
.transpose()? else {
.transpose()?
else {
return UnexpectedSnafu {
err_msg: format!("compare_and_put expect None but failed with current value None, key: {key}, value: {value:?}"),
}.fail()
}.fail();
};
ensure!(
curr.table_id == table_id,
@@ -226,7 +227,8 @@ impl TableNameManager {
// name, then the table must not exist at the first place.
return TableNotExistSnafu {
table_name: TableName::from(key).to_string(),
}.fail();
}
.fail();
};
ensure!(

2
src/common/meta/src/key/table_region.rs
View File

@@ -91,7 +91,7 @@ impl TableRegionManager {
let Some(curr) = curr else {
return UnexpectedSnafu {
err_msg: format!("compare_and_put expect None but failed with current value None, table_id: {table_id}, region_distribution: {region_distribution:?}"),
}.fail()
}.fail();
};
ensure!(
&curr.region_distribution == region_distribution,

2
src/common/meta/src/kv_backend/memory.rs
View File

@@ -236,7 +236,7 @@ impl<T: ErrorExt + Send + Sync + 'static> KvBackend for MemoryKvBackend<T> {
start: key,
end: range_end,
};
kvs.drain_filter(|key, _| range.contains(key))
kvs.extract_if(|key, _| range.contains(key))
.map(Into::into)
.collect::<Vec<_>>()
};

2
src/common/meta/src/lib.rs
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#![feature(btree_drain_filter)]
#![feature(btree_extract_if)]
pub mod error;
pub mod heartbeat;

5
src/common/procedure/src/local.rs
View File

@@ -474,7 +474,10 @@ impl ProcedureManager for LocalManager {
if message.parent_id.is_none() {
// This is the root procedure. We only submit the root procedure as it will
// submit sub-procedures to the manager.
let Some(loaded_procedure) = self.manager_ctx.load_one_procedure_from_message(*procedure_id, message) else {
let Some(loaded_procedure) = self
.manager_ctx
.load_one_procedure_from_message(*procedure_id, message)
else {
// Try to load other procedures.
continue;
};

4
src/common/query/src/logical_plan/expr.rs
View File

@@ -44,7 +44,9 @@ pub fn build_filter_from_timestamp(
ts_col_name: &str,
time_range: Option<&TimestampRange>,
) -> Option<Expr> {
let Some(time_range) = time_range else { return None; };
let Some(time_range) = time_range else {
return None;
};
let ts_col_expr = DfExpr::Column(Column {
relation: None,
name: ts_col_name.to_string(),

2
src/common/substrait/src/extension_serializer.rs
View File

@@ -60,7 +60,7 @@ impl SerializerRegistry for ExtensionSerializer {
name if name == EmptyMetric::name() => Err(DataFusionError::Substrait(
"EmptyMetric should not be serialized".to_string(),
)),
name if name == "MergeScan" => Ok(vec![]),
"MergeScan" => Ok(vec![]),
other => Err(DataFusionError::NotImplemented(format!(
"Serizlize logical plan for {}",
other