Skip to content

Commit bc1c0ea

Browse files
timsaucertimsaucer
committed
pyo3 update required changes to deprecated interfaces
1 parent 40a61c1 commit bc1c0ea

38 files changed

+190
-173
lines changed

‎src/config.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ impl PyConfig {
4747
}
4848

4949
/// Get a configuration option
50-
pub fn get(&mut self, key: &str, py: Python) -> PyResult<PyObject> {
50+
pub fn get<'py>(&mut self, key: &str, py: Python<'py>) -> PyResult<Bound<'py, PyAny>> {
5151
let options = self.config.to_owned();
5252
for entry in options.entries() {
5353
if entry.key == key {
54-
return Ok(entry.value.into_py(py));
54+
return Ok(entry.value.into_pyobject(py)?);
5555
}
5656
}
57-
Ok(None::<String>.into_py(py))
57+
Ok(None::<String>.into_pyobject(py)?)
5858
}
5959

6060
/// Set a configuration option
@@ -66,10 +66,10 @@ impl PyConfig {
6666

6767
/// Get all configuration options
6868
pub fn get_all(&mut self, py: Python) -> PyResult<PyObject> {
69-
let dict = PyDict::new_bound(py);
69+
let dict = PyDict::new(py);
7070
let options = self.config.to_owned();
7171
for entry in options.entries() {
72-
dict.set_item(entry.key, entry.value.clone().into_py(py))?;
72+
dict.set_item(entry.key, entry.value.clone().into_pyobject(py)?)?;
7373
}
7474
Ok(dict.into())
7575
}

‎src/context.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -458,8 +458,8 @@ impl PySessionContext {
458458
let py = data.py();
459459

460460
// Instantiate pyarrow Table object & convert to Arrow Table
461-
let table_class = py.import_bound("pyarrow")?.getattr("Table")?;
462-
let args = PyTuple::new_bound(py, &[data]);
461+
let table_class = py.import("pyarrow")?.getattr("Table")?;
462+
let args = PyTuple::new(py, &[data])?;
463463
let table = table_class.call_method1("from_pylist", args)?;
464464

465465
// Convert Arrow Table to datafusion DataFrame
@@ -478,8 +478,8 @@ impl PySessionContext {
478478
let py = data.py();
479479

480480
// Instantiate pyarrow Table object & convert to Arrow Table
481-
let table_class = py.import_bound("pyarrow")?.getattr("Table")?;
482-
let args = PyTuple::new_bound(py, &[data]);
481+
let table_class = py.import("pyarrow")?.getattr("Table")?;
482+
let args = PyTuple::new(py, &[data])?;
483483
let table = table_class.call_method1("from_pydict", args)?;
484484

485485
// Convert Arrow Table to datafusion DataFrame
@@ -533,8 +533,8 @@ impl PySessionContext {
533533
let py = data.py();
534534

535535
// Instantiate pyarrow Table object & convert to Arrow Table
536-
let table_class = py.import_bound("pyarrow")?.getattr("Table")?;
537-
let args = PyTuple::new_bound(py, &[data]);
536+
let table_class = py.import("pyarrow")?.getattr("Table")?;
537+
let args = PyTuple::new(py, &[data])?;
538538
let table = table_class.call_method1("from_pandas", args)?;
539539

540540
// Convert Arrow Table to datafusion DataFrame

‎src/dataframe.rs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -545,12 +545,12 @@ impl PyDataFrame {
545545
/// Convert to Arrow Table
546546
/// Collect the batches and pass to Arrow Table
547547
fn to_arrow_table(&self, py: Python<'_>) -> PyResult<PyObject> {
548-
let batches = self.collect(py)?.to_object(py);
549-
let schema: PyObject = self.schema().into_pyobject(py)?.to_object(py);
548+
let batches = self.collect(py)?.into_pyobject(py)?;
549+
let schema = self.schema().into_pyobject(py)?;
550550

551551
// Instantiate pyarrow Table object and use its from_batches method
552-
let table_class = py.import_bound("pyarrow")?.getattr("Table")?;
553-
let args = PyTuple::new_bound(py, &[batches, schema]);
552+
let table_class = py.import("pyarrow")?.getattr("Table")?;
553+
let args = PyTuple::new(py, &[batches, schema])?;
554554
let table: PyObject = table_class.call_method1("from_batches", args)?.into();
555555
Ok(table)
556556
}
@@ -585,8 +585,7 @@ impl PyDataFrame {
585585

586586
let ffi_stream = FFI_ArrowArrayStream::new(reader);
587587
let stream_capsule_name = CString::new("arrow_array_stream").unwrap();
588-
PyCapsule::new_bound(py, ffi_stream, Some(stream_capsule_name))
589-
.map_err(PyDataFusionError::from)
588+
PyCapsule::new(py, ffi_stream, Some(stream_capsule_name)).map_err(PyDataFusionError::from)
590589
}
591590

592591
fn execute_stream(&self, py: Python) -> PyDataFusionResult<PyRecordBatchStream> {
@@ -649,8 +648,8 @@ impl PyDataFrame {
649648
/// Collect the batches, pass to Arrow Table & then convert to polars DataFrame
650649
fn to_polars(&self, py: Python<'_>) -> PyResult<PyObject> {
651650
let table = self.to_arrow_table(py)?;
652-
let dataframe = py.import_bound("polars")?.getattr("DataFrame")?;
653-
let args = PyTuple::new_bound(py, &[table]);
651+
let dataframe = py.import("polars")?.getattr("DataFrame")?;
652+
let args = PyTuple::new(py, &[table])?;
654653
let result: PyObject = dataframe.call1(args)?.into();
655654
Ok(result)
656655
}
@@ -673,7 +672,7 @@ fn print_dataframe(py: Python, df: DataFrame) -> PyDataFusionResult<()> {
673672

674673
// Import the Python 'builtins' module to access the print function
675674
// Note that println! does not print to the Python debug console and is not visible in notebooks for instance
676-
let print = py.import_bound("builtins")?.getattr("print")?;
675+
let print = py.import("builtins")?.getattr("print")?;
677676
print.call1((result,))?;
678677
Ok(())
679678
}

‎src/dataset.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ impl Dataset {
4848
// Creates a Python PyArrow.Dataset
4949
pub fn new(dataset: &Bound<'_, PyAny>, py: Python) -> PyResult<Self> {
5050
// Ensure that we were passed an instance of pyarrow.dataset.Dataset
51-
let ds = PyModule::import_bound(py, "pyarrow.dataset")?;
51+
let ds = PyModule::import(py, "pyarrow.dataset")?;
5252
let ds_attr = ds.getattr("Dataset")?;
5353
let ds_type = ds_attr.downcast::<PyType>()?;
5454
if dataset.is_instance(ds_type)? {

‎src/dataset_exec.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ impl DatasetExec {
104104
})
105105
.transpose()?;
106106

107-
let kwargs = PyDict::new_bound(py);
107+
let kwargs = PyDict::new(py);
108108

109109
kwargs.set_item("columns", columns.clone())?;
110110
kwargs.set_item(
@@ -121,7 +121,7 @@ impl DatasetExec {
121121
.0,
122122
);
123123

124-
let builtins = Python::import_bound(py, "builtins")?;
124+
let builtins = Python::import(py, "builtins")?;
125125
let pylist = builtins.getattr("list")?;
126126

127127
// Get the fragments or partitions of the dataset
@@ -198,7 +198,7 @@ impl ExecutionPlan for DatasetExec {
198198
let dataset_schema = dataset
199199
.getattr("schema")
200200
.map_err(|err| InnerDataFusionError::External(Box::new(err)))?;
201-
let kwargs = PyDict::new_bound(py);
201+
let kwargs = PyDict::new(py);
202202
kwargs
203203
.set_item("columns", self.columns.clone())
204204
.map_err(|err| InnerDataFusionError::External(Box::new(err)))?;
@@ -223,7 +223,7 @@ impl ExecutionPlan for DatasetExec {
223223
let record_batches: Bound<'_, PyIterator> = scanner
224224
.call_method0("to_batches")
225225
.map_err(|err| InnerDataFusionError::External(Box::new(err)))?
226-
.iter()
226+
.try_iter()
227227
.map_err(|err| InnerDataFusionError::External(Box::new(err)))?;
228228

229229
let record_batches = PyArrowBatchesAdapter {

‎src/errors.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,7 @@ pub fn py_datafusion_err(e: impl Debug) -> PyErr {
9191
pub fn py_unsupported_variant_err(e: impl Debug) -> PyErr {
9292
PyErr::new::<pyo3::exceptions::PyValueError, _>(format!("{e:?}"))
9393
}
94+
95+
pub fn to_datafusion_err(e: impl Debug) -> InnerDataFusionError {
96+
InnerDataFusionError::Execution(format!("{e:?}"))
97+
}

‎src/expr.rs‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ use datafusion::logical_expr::utils::exprlist_to_fields;
1919
use datafusion::logical_expr::{
2020
ExprFuncBuilder, ExprFunctionExt, LogicalPlan, WindowFunctionDefinition,
2121
};
22+
use pyo3::IntoPyObjectExt;
2223
use pyo3::{basic::CompareOp, prelude::*};
2324
use std::convert::{From, Into};
2425
use std::sync::Arc;
@@ -126,35 +127,35 @@ pub fn py_expr_list(expr: &[Expr]) -> PyResult<Vec<PyExpr>> {
126127
#[pymethods]
127128
impl PyExpr {
128129
/// Return the specific expression
129-
fn to_variant(&self, py: Python) -> PyResult<PyObject> {
130+
fn to_variant<'py>(&self, py: Python<'py>) -> PyResult<Bound<'py, PyAny>> {
130131
Python::with_gil(|_| {
131132
match &self.expr {
132-
Expr::Alias(alias) => Ok(PyAlias::from(alias.clone()).into_py(py)),
133-
Expr::Column(col) => Ok(PyColumn::from(col.clone()).into_py(py)),
133+
Expr::Alias(alias) => Ok(PyAlias::from(alias.clone()).into_bound_py_any(py)?),
134+
Expr::Column(col) => Ok(PyColumn::from(col.clone()).into_bound_py_any(py)?),
134135
Expr::ScalarVariable(data_type, variables) => {
135-
Ok(PyScalarVariable::new(data_type, variables).into_py(py))
136+
Ok(PyScalarVariable::new(data_type, variables).into_bound_py_any(py)?)
136137
}
137-
Expr::Like(value) => Ok(PyLike::from(value.clone()).into_py(py)),
138-
Expr::Literal(value) => Ok(PyLiteral::from(value.clone()).into_py(py)),
139-
Expr::BinaryExpr(expr) => Ok(PyBinaryExpr::from(expr.clone()).into_py(py)),
140-
Expr::Not(expr) => Ok(PyNot::new(*expr.clone()).into_py(py)),
141-
Expr::IsNotNull(expr) => Ok(PyIsNotNull::new(*expr.clone()).into_py(py)),
142-
Expr::IsNull(expr) => Ok(PyIsNull::new(*expr.clone()).into_py(py)),
143-
Expr::IsTrue(expr) => Ok(PyIsTrue::new(*expr.clone()).into_py(py)),
144-
Expr::IsFalse(expr) => Ok(PyIsFalse::new(*expr.clone()).into_py(py)),
145-
Expr::IsUnknown(expr) => Ok(PyIsUnknown::new(*expr.clone()).into_py(py)),
146-
Expr::IsNotTrue(expr) => Ok(PyIsNotTrue::new(*expr.clone()).into_py(py)),
147-
Expr::IsNotFalse(expr) => Ok(PyIsNotFalse::new(*expr.clone()).into_py(py)),
148-
Expr::IsNotUnknown(expr) => Ok(PyIsNotUnknown::new(*expr.clone()).into_py(py)),
149-
Expr::Negative(expr) => Ok(PyNegative::new(*expr.clone()).into_py(py)),
138+
Expr::Like(value) => Ok(PyLike::from(value.clone()).into_bound_py_any(py)?),
139+
Expr::Literal(value) => Ok(PyLiteral::from(value.clone()).into_bound_py_any(py)?),
140+
Expr::BinaryExpr(expr) => Ok(PyBinaryExpr::from(expr.clone()).into_bound_py_any(py)?),
141+
Expr::Not(expr) => Ok(PyNot::new(*expr.clone()).into_bound_py_any(py)?),
142+
Expr::IsNotNull(expr) => Ok(PyIsNotNull::new(*expr.clone()).into_bound_py_any(py)?),
143+
Expr::IsNull(expr) => Ok(PyIsNull::new(*expr.clone()).into_bound_py_any(py)?),
144+
Expr::IsTrue(expr) => Ok(PyIsTrue::new(*expr.clone()).into_bound_py_any(py)?),
145+
Expr::IsFalse(expr) => Ok(PyIsFalse::new(*expr.clone()).into_bound_py_any(py)?),
146+
Expr::IsUnknown(expr) => Ok(PyIsUnknown::new(*expr.clone()).into_bound_py_any(py)?),
147+
Expr::IsNotTrue(expr) => Ok(PyIsNotTrue::new(*expr.clone()).into_bound_py_any(py)?),
148+
Expr::IsNotFalse(expr) => Ok(PyIsNotFalse::new(*expr.clone()).into_bound_py_any(py)?),
149+
Expr::IsNotUnknown(expr) => Ok(PyIsNotUnknown::new(*expr.clone()).into_bound_py_any(py)?),
150+
Expr::Negative(expr) => Ok(PyNegative::new(*expr.clone()).into_bound_py_any(py)?),
150151
Expr::AggregateFunction(expr) => {
151-
Ok(PyAggregateFunction::from(expr.clone()).into_py(py))
152+
Ok(PyAggregateFunction::from(expr.clone()).into_bound_py_any(py)?)
152153
}
153-
Expr::SimilarTo(value) => Ok(PySimilarTo::from(value.clone()).into_py(py)),
154-
Expr::Between(value) => Ok(between::PyBetween::from(value.clone()).into_py(py)),
155-
Expr::Case(value) => Ok(case::PyCase::from(value.clone()).into_py(py)),
156-
Expr::Cast(value) => Ok(cast::PyCast::from(value.clone()).into_py(py)),
157-
Expr::TryCast(value) => Ok(cast::PyTryCast::from(value.clone()).into_py(py)),
154+
Expr::SimilarTo(value) => Ok(PySimilarTo::from(value.clone()).into_bound_py_any(py)?),
155+
Expr::Between(value) => Ok(between::PyBetween::from(value.clone()).into_bound_py_any(py)?),
156+
Expr::Case(value) => Ok(case::PyCase::from(value.clone()).into_bound_py_any(py)?),
157+
Expr::Cast(value) => Ok(cast::PyCast::from(value.clone()).into_bound_py_any(py)?),
158+
Expr::TryCast(value) => Ok(cast::PyTryCast::from(value.clone()).into_bound_py_any(py)?),
158159
Expr::ScalarFunction(value) => Err(py_unsupported_variant_err(format!(
159160
"Converting Expr::ScalarFunction to a Python object is not implemented: {:?}",
160161
value
@@ -163,29 +164,29 @@ impl PyExpr {
163164
"Converting Expr::WindowFunction to a Python object is not implemented: {:?}",
164165
value
165166
))),
166-
Expr::InList(value) => Ok(in_list::PyInList::from(value.clone()).into_py(py)),
167-
Expr::Exists(value) => Ok(exists::PyExists::from(value.clone()).into_py(py)),
167+
Expr::InList(value) => Ok(in_list::PyInList::from(value.clone()).into_bound_py_any(py)?),
168+
Expr::Exists(value) => Ok(exists::PyExists::from(value.clone()).into_bound_py_any(py)?),
168169
Expr::InSubquery(value) => {
169-
Ok(in_subquery::PyInSubquery::from(value.clone()).into_py(py))
170+
Ok(in_subquery::PyInSubquery::from(value.clone()).into_bound_py_any(py)?)
170171
}
171172
Expr::ScalarSubquery(value) => {
172-
Ok(scalar_subquery::PyScalarSubquery::from(value.clone()).into_py(py))
173+
Ok(scalar_subquery::PyScalarSubquery::from(value.clone()).into_bound_py_any(py)?)
173174
}
174175
Expr::Wildcard { qualifier, options } => Err(py_unsupported_variant_err(format!(
175176
"Converting Expr::Wildcard to a Python object is not implemented : {:?} {:?}",
176177
qualifier, options
177178
))),
178179
Expr::GroupingSet(value) => {
179-
Ok(grouping_set::PyGroupingSet::from(value.clone()).into_py(py))
180+
Ok(grouping_set::PyGroupingSet::from(value.clone()).into_bound_py_any(py)?)
180181
}
181182
Expr::Placeholder(value) => {
182-
Ok(placeholder::PyPlaceholder::from(value.clone()).into_py(py))
183+
Ok(placeholder::PyPlaceholder::from(value.clone()).into_bound_py_any(py)?)
183184
}
184185
Expr::OuterReferenceColumn(data_type, column) => Err(py_unsupported_variant_err(format!(
185186
"Converting Expr::OuterReferenceColumn to a Python object is not implemented: {:?} - {:?}",
186187
data_type, column
187188
))),
188-
Expr::Unnest(value) => Ok(unnest_expr::PyUnnestExpr::from(value.clone()).into_py(py)),
189+
Expr::Unnest(value) => Ok(unnest_expr::PyUnnestExpr::from(value.clone()).into_bound_py_any(py)?),
189190
}
190191
})
191192
}

‎src/expr/aggregate.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use datafusion::common::DataFusionError;
1919
use datafusion::logical_expr::expr::{AggregateFunction, Alias};
2020
use datafusion::logical_expr::logical_plan::Aggregate;
2121
use datafusion::logical_expr::Expr;
22-
use pyo3::prelude::*;
22+
use pyo3::{prelude::*, IntoPyObjectExt};
2323
use std::fmt::{self, Display, Formatter};
2424

2525
use super::logical_node::LogicalNode;
@@ -151,7 +151,7 @@ impl LogicalNode for PyAggregate {
151151
vec![PyLogicalPlan::from((*self.aggregate.input).clone())]
152152
}
153153

154-
fn to_variant(&self, py: Python) -> PyResult<PyObject> {
155-
Ok(self.clone().into_py(py))
154+
fn to_variant<'py>(&self, py: Python<'py>) -> PyResult<Bound<'py, PyAny>> {
155+
self.clone().into_bound_py_any(py)
156156
}
157157
}

‎src/expr/analyze.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// under the License.
1717

1818
use datafusion::logical_expr::logical_plan::Analyze;
19-
use pyo3::prelude::*;
19+
use pyo3::{prelude::*, IntoPyObjectExt};
2020
use std::fmt::{self, Display, Formatter};
2121

2222
use super::logical_node::LogicalNode;
@@ -78,7 +78,7 @@ impl LogicalNode for PyAnalyze {
7878
vec![PyLogicalPlan::from((*self.analyze.input).clone())]
7979
}
8080

81-
fn to_variant(&self, py: Python) -> PyResult<PyObject> {
82-
Ok(self.clone().into_py(py))
81+
fn to_variant<'py>(&self, py: Python<'py>) -> PyResult<Bound<'py, PyAny>> {
82+
self.clone().into_bound_py_any(py)
8383
}
8484
}

‎src/expr/create_memory_table.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use std::fmt::{self, Display, Formatter};
1919

2020
use datafusion::logical_expr::CreateMemoryTable;
21-
use pyo3::prelude::*;
21+
use pyo3::{prelude::*, IntoPyObjectExt};
2222

2323
use crate::sql::logical::PyLogicalPlan;
2424

@@ -91,7 +91,7 @@ impl LogicalNode for PyCreateMemoryTable {
9191
vec![PyLogicalPlan::from((*self.create.input).clone())]
9292
}
9393

94-
fn to_variant(&self, py: Python) -> PyResult<PyObject> {
95-
Ok(self.clone().into_py(py))
94+
fn to_variant<'py>(&self, py: Python<'py>) -> PyResult<Bound<'py, PyAny>> {
95+
self.clone().into_bound_py_any(py)
9696
}
9797
}

0 commit comments

Comments
 (0)