Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: use `error` module 🧹

pull/24376/head
Stuart Carnie 2023-04-18 16:50:48 +10:00
parent dbf7e73d3e
commit b2dfe30a42
No known key found for this signature in database
GPG Key ID: 848D9C9718D78B4F
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
iox_query_influxql/src/plan/planner/select.rs
View File

@ -1,5 +1,6 @@
use crate::plan::error;
use arrow::datatypes::DataType;
use datafusion::common::{DFSchemaRef, DataFusionError, Result};
use datafusion::common::{DFSchemaRef, Result};
use datafusion::logical_expr::utils::find_column_exprs;
use datafusion::logical_expr::{Expr, LogicalPlan, LogicalPlanBuilder};
use datafusion_util::AsExpr;
@ -15,15 +16,11 @@ use std::ops::Deref;
/// column in `columns`.
pub(crate) fn check_exprs_satisfy_columns(columns: &[Expr], exprs: &[Expr]) -> Result<()> {
if !columns.iter().all(|c| matches!(c, Expr::Column(_))) {
return Err(DataFusionError::Internal(
"expected Expr::Column".to_owned(),
));
return error::internal("expected Expr::Column");
}
let column_exprs = find_column_exprs(exprs);
if column_exprs.iter().any(|expr| !columns.contains(expr)) {
return Err(DataFusionError::Plan(
"mixing aggregate and non-aggregate columns is not supported".to_owned(),
));
return error::query("mixing aggregate and non-aggregate columns is not supported");
}
Ok(())
}