rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-05-29 19:30:37 +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

12
src/promql/src/extension_plan/range_manipulate.rs
View File

@@ -115,7 +115,11 @@ impl RangeManipulate {
// process time index column
// the raw timestamp field is preserved. And a new timestamp_range field is appended to the last.
let Some(ts_col_index) = input_schema.index_of_column_by_name(None, time_index)? else {
return Err(datafusion::common::field_not_found(None::<TableReference>, time_index, input_schema.as_ref()))
return Err(datafusion::common::field_not_found(
None::<TableReference>,
time_index,
input_schema.as_ref(),
));
};
let ts_col_field = columns[ts_col_index].field();
let timestamp_range_field = Field::new(
@@ -128,7 +132,11 @@ impl RangeManipulate {
// process value columns
for name in field_columns {
let Some(index) = input_schema.index_of_column_by_name(None, name)? else {
return Err(datafusion::common::field_not_found(None::<TableReference>, name, input_schema.as_ref()))
return Err(datafusion::common::field_not_found(
None::<TableReference>,
name,
input_schema.as_ref(),
));
};
columns[index] = DFField::from(RangeArray::convert_field(columns[index].field()));
}

4
src/promql/src/planner.rs
View File

@@ -604,7 +604,7 @@ impl PromPlanner {
let exprs = result_set
.into_iter()
.map(|col| DfExpr::Column(col.into()))
.chain(self.create_tag_column_exprs()?.into_iter())
.chain(self.create_tag_column_exprs()?)
.chain(Some(self.create_time_index_column_expr()?))
.collect::<Vec<_>>();
// reuse this variable for simplicity
@@ -1040,7 +1040,7 @@ impl PromPlanner {
exprs.push(expr);
}
utils::conjunction(exprs.into_iter()).context(ValueNotFoundSnafu {
utils::conjunction(exprs).context(ValueNotFoundSnafu {
table: self.ctx.table_name.clone().unwrap(),
})
}