You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ag...@apache.org on 2023/01/27 01:29:42 UTC
[arrow-datafusion-python] branch main updated: fix clippy for new Rust version (#154)
This is an automated email from the ASF dual-hosted git repository.
agrove pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion-python.git
The following commit(s) were added to refs/heads/main by this push:
new 34d7204 fix clippy for new Rust version (#154)
34d7204 is described below
commit 34d720484112b8cf8f3a8f9ea4b0218b270cf8c2
Author: Andy Grove <an...@gmail.com>
AuthorDate: Thu Jan 26 18:29:38 2023 -0700
fix clippy for new Rust version (#154)
---
src/catalog.rs | 5 ++---
src/context.rs | 3 +--
src/dataframe.rs | 3 +--
src/errors.rs | 14 +++++++-------
src/pyarrow_filter_expression.rs | 15 +++++----------
src/udaf.rs | 12 ++++++------
src/udf.rs | 2 +-
src/utils.rs | 5 ++---
8 files changed, 25 insertions(+), 34 deletions(-)
diff --git a/src/catalog.rs b/src/catalog.rs
index 2929a88..9009606 100644
--- a/src/catalog.rs
+++ b/src/catalog.rs
@@ -77,8 +77,7 @@ impl PyCatalog {
match self.catalog.schema(name) {
Some(database) => Ok(PyDatabase::new(database)),
None => Err(PyKeyError::new_err(format!(
- "Database with name {} doesn't exist.",
- name
+ "Database with name {name} doesn't exist."
))),
}
}
@@ -94,7 +93,7 @@ impl PyDatabase {
if let Some(table) = wait_for_future(py, self.database.table(name)) {
Ok(PyTable::new(table))
} else {
- Err(DataFusionError::Common(format!("Table not found: {}", name)).into())
+ Err(DataFusionError::Common(format!("Table not found: {name}")).into())
}
}
diff --git a/src/context.rs b/src/context.rs
index 6021ba0..3990a4c 100644
--- a/src/context.rs
+++ b/src/context.rs
@@ -476,8 +476,7 @@ fn convert_table_partition_cols(
.map(|(name, ty)| match ty.as_str() {
"string" => Ok((name, DataType::Utf8)),
_ => Err(DataFusionError::Common(format!(
- "Unsupported data type '{}' for partition column",
- ty
+ "Unsupported data type '{ty}' for partition column"
))),
})
.collect::<Result<Vec<_>, _>>()
diff --git a/src/dataframe.rs b/src/dataframe.rs
index b56cadf..caa3958 100644
--- a/src/dataframe.rs
+++ b/src/dataframe.rs
@@ -178,8 +178,7 @@ impl PyDataFrame {
"anti" => JoinType::LeftAnti,
how => {
return Err(DataFusionError::Common(format!(
- "The join type {} does not exist or is not implemented",
- how
+ "The join type {how} does not exist or is not implemented"
))
.into());
}
diff --git a/src/errors.rs b/src/errors.rs
index 69a476d..c9abf06 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -34,10 +34,10 @@ pub enum DataFusionError {
impl fmt::Display for DataFusionError {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self {
- DataFusionError::ExecutionError(e) => write!(f, "DataFusion error: {:?}", e),
- DataFusionError::ArrowError(e) => write!(f, "Arrow error: {:?}", e),
- DataFusionError::PythonError(e) => write!(f, "Python error {:?}", e),
- DataFusionError::Common(e) => write!(f, "{}", e),
+ DataFusionError::ExecutionError(e) => write!(f, "DataFusion error: {e:?}"),
+ DataFusionError::ArrowError(e) => write!(f, "Arrow error: {e:?}"),
+ DataFusionError::PythonError(e) => write!(f, "Python error {e:?}"),
+ DataFusionError::Common(e) => write!(f, "{e}"),
}
}
}
@@ -72,13 +72,13 @@ impl From<DataFusionError> for PyErr {
impl Error for DataFusionError {}
pub fn py_type_err(e: impl Debug) -> PyErr {
- PyErr::new::<pyo3::exceptions::PyTypeError, _>(format!("{:?}", e))
+ PyErr::new::<pyo3::exceptions::PyTypeError, _>(format!("{e:?}"))
}
pub fn py_runtime_err(e: impl Debug) -> PyErr {
- PyErr::new::<pyo3::exceptions::PyRuntimeError, _>(format!("{:?}", e))
+ PyErr::new::<pyo3::exceptions::PyRuntimeError, _>(format!("{e:?}"))
}
pub fn py_datafusion_err(e: impl Debug) -> PyErr {
- PyErr::new::<pyo3::exceptions::PyRuntimeError, _>(format!("{:?}", e))
+ PyErr::new::<pyo3::exceptions::PyRuntimeError, _>(format!("{e:?}"))
}
diff --git a/src/pyarrow_filter_expression.rs b/src/pyarrow_filter_expression.rs
index 4ac0079..d351012 100644
--- a/src/pyarrow_filter_expression.rs
+++ b/src/pyarrow_filter_expression.rs
@@ -45,8 +45,7 @@ fn operator_to_py<'py>(
Operator::Or => op.getattr("or_")?,
_ => {
return Err(DataFusionError::Common(format!(
- "Unsupported operator {:?}",
- operator
+ "Unsupported operator {operator:?}"
)))
}
};
@@ -71,13 +70,11 @@ fn extract_scalar_list(exprs: &[Expr], py: Python) -> Result<Vec<PyObject>, Data
ScalarValue::Float64(Some(f)) => Ok(f.into_py(py)),
ScalarValue::Utf8(Some(s)) => Ok(s.into_py(py)),
_ => Err(DataFusionError::Common(format!(
- "PyArrow can't handle ScalarValue: {:?}",
- v
+ "PyArrow can't handle ScalarValue: {v:?}"
))),
},
_ => Err(DataFusionError::Common(format!(
- "Only a list of Literals are supported got {:?}",
- expr
+ "Only a list of Literals are supported got {expr:?}"
))),
})
.collect();
@@ -117,8 +114,7 @@ impl TryFrom<&Expr> for PyArrowFilterExpression {
ScalarValue::Float64(Some(f)) => Ok(pc.getattr("scalar")?.call1((*f,))?),
ScalarValue::Utf8(Some(s)) => Ok(pc.getattr("scalar")?.call1((s,))?),
_ => Err(DataFusionError::Common(format!(
- "PyArrow can't handle ScalarValue: {:?}",
- v
+ "PyArrow can't handle ScalarValue: {v:?}"
))),
},
Expr::BinaryExpr(BinaryExpr { left, op, right }) => {
@@ -180,8 +176,7 @@ impl TryFrom<&Expr> for PyArrowFilterExpression {
Ok(if *negated { invert.call1((ret,))? } else { ret })
}
_ => Err(DataFusionError::Common(format!(
- "Unsupported Datafusion expression {:?}",
- expr
+ "Unsupported Datafusion expression {expr:?}"
))),
};
Ok(PyArrowFilterExpression(pc_expr?.into()))
diff --git a/src/udaf.rs b/src/udaf.rs
index 9d96e2c..863d8d7 100644
--- a/src/udaf.rs
+++ b/src/udaf.rs
@@ -43,12 +43,12 @@ impl RustAccumulator {
impl Accumulator for RustAccumulator {
fn state(&self) -> Result<Vec<ScalarValue>> {
Python::with_gil(|py| self.accum.as_ref(py).call_method0("state")?.extract())
- .map_err(|e| DataFusionError::Execution(format!("{}", e)))
+ .map_err(|e| DataFusionError::Execution(format!("{e}")))
}
fn evaluate(&self) -> Result<ScalarValue> {
Python::with_gil(|py| self.accum.as_ref(py).call_method0("evaluate")?.extract())
- .map_err(|e| DataFusionError::Execution(format!("{}", e)))
+ .map_err(|e| DataFusionError::Execution(format!("{e}")))
}
fn update_batch(&mut self, values: &[ArrayRef]) -> Result<()> {
@@ -64,7 +64,7 @@ impl Accumulator for RustAccumulator {
self.accum
.as_ref(py)
.call_method1("update", py_args)
- .map_err(|e| DataFusionError::Execution(format!("{}", e)))?;
+ .map_err(|e| DataFusionError::Execution(format!("{e}")))?;
Ok(())
})
@@ -78,13 +78,13 @@ impl Accumulator for RustAccumulator {
let state = state
.data()
.to_pyarrow(py)
- .map_err(|e| DataFusionError::Execution(format!("{}", e)))?;
+ .map_err(|e| DataFusionError::Execution(format!("{e}")))?;
// 2. call merge
self.accum
.as_ref(py)
.call_method1("merge", (state,))
- .map_err(|e| DataFusionError::Execution(format!("{}", e)))?;
+ .map_err(|e| DataFusionError::Execution(format!("{e}")))?;
Ok(())
})
@@ -100,7 +100,7 @@ pub fn to_rust_accumulator(accum: PyObject) -> AccumulatorFunctionImplementation
let accum = Python::with_gil(|py| {
accum
.call0(py)
- .map_err(|e| DataFusionError::Execution(format!("{}", e)))
+ .map_err(|e| DataFusionError::Execution(format!("{e}")))
})?;
Ok(Box::new(RustAccumulator::new(accum)))
})
diff --git a/src/udf.rs b/src/udf.rs
index ba9af68..4804f99 100644
--- a/src/udf.rs
+++ b/src/udf.rs
@@ -49,7 +49,7 @@ fn to_rust_function(func: PyObject) -> ScalarFunctionImplementation {
let value = func
.as_ref(py)
.call(py_args, None)
- .map_err(|e| DataFusionError::Execution(format!("{:?}", e)))?;
+ .map_err(|e| DataFusionError::Execution(format!("{e:?}")))?;
// 3. cast to arrow::array::Array
let array_data = ArrayData::from_pyarrow(value).unwrap();
diff --git a/src/utils.rs b/src/utils.rs
index 0eb46ca..4158b74 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -38,9 +38,8 @@ pub(crate) fn parse_volatility(value: &str) -> Result<Volatility, DataFusionErro
"volatile" => Volatility::Volatile,
value => {
return Err(DataFusionError::Common(format!(
- "Unsupportad volatility type: `{}`, supported \
- values are: immutable, stable and volatile.",
- value
+ "Unsupportad volatility type: `{value}`, supported \
+ values are: immutable, stable and volatile."
)))
}
})