Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

perf: set compat_level when calling to_arrow #85

Merged
merged 6 commits into from
Jul 25, 2024
Merged

perf: set compat_level when calling to_arrow #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b81a9f1
perf: set future=True when calling to_arrow
ruihe774 Jul 2, 2024
e464301
chore: use my polars repo temporarily
ruihe774 Jul 7, 2024
d400901
feat(rust): auto select compat_level in PySeries::into_py
ruihe774 Jul 7, 2024
fe8c861
feat(rust): auto select compat_level in PySeries::extract_bound
ruihe774 Jul 7, 2024
061320e
chore: update patches (temporarily)
ruihe774 Jul 22, 2024
e8d957d
feat: use _import_arrow_from_c instead of _import_from_c
ruihe774 Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,10 @@ polars-core = { version = "0.41.0", default-features = false }
polars-ffi = { version = "0.41.0", default-features = false }
polars-plan = { version = "0.41.0", default-feautres = false }
polars-lazy = { version = "0.41.0", default-features = false }

[patch.crates-io]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we point this to the main branch until 0.42 is released.

Copy link
Contributor Author

@ruihe774 ruihe774 Jul 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cargo only recognizes patches defined in the root project and not in dependencies. pyo3-polars is meant to be a dependency of projects that use it. So unless they declare patches in their Cargo.toml, patches are not in effect.

Patches declared here are only for testing. We can only wait for 0.42.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright. 0.42 is planned in ca. 2 weeks.

polars = { git = "https://github.com/pola-rs/polars.git" }
polars-core = { git = "https://github.com/pola-rs/polars.git" }
polars-ffi = { git = "https://github.com/pola-rs/polars.git" }
polars-plan = { git = "https://github.com/pola-rs/polars.git" }
polars-lazy = { git = "https://github.com/pola-rs/polars.git" }
4 changes: 2 additions & 2 deletions pyo3-polars-derive/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ fn create_field_function(

match result {
Ok(out) => {
let out = polars_core::export::arrow::ffi::export_field_to_c(&out.to_arrow(true));
let out = polars_core::export::arrow::ffi::export_field_to_c(&out.to_arrow(CompatLevel::newest()));
*return_value = out;
},
Err(err) => {
Expand Down Expand Up @@ -278,7 +278,7 @@ fn create_field_function_from_with_dtype(
let mapper = polars_plan::dsl::FieldsMapper::new(&inputs);
let dtype = polars_core::datatypes::DataType::#dtype;
let out = mapper.with_dtype(dtype).unwrap();
let out = polars_core::export::arrow::ffi::export_field_to_c(&out.to_arrow(true));
let out = polars_core::export::arrow::ffi::export_field_to_c(&out.to_arrow(CompatLevel::newest()));
*return_value = out;
}
)
Expand Down
8 changes: 2 additions & 6 deletions pyo3-polars/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,8 @@ impl std::convert::From<PyPolarsErr> for PyErr {
PolarsError::StringCacheMismatch(err) => {
StringCacheMismatchError::new_err(err.to_string())
}
PolarsError::SQLInterface(err) => {
SQLInterface::new_err(err.to_string())
},
PolarsError::SQLSyntax(err) => {
SQLSyntax::new_err(err.to_string())
}
PolarsError::SQLInterface(err) => SQLInterface::new_err(err.to_string()),
PolarsError::SQLSyntax(err) => SQLSyntax::new_err(err.to_string()),
PolarsError::Context { error, .. } => convert(error),
}
}
Expand Down
28 changes: 23 additions & 5 deletions pyo3-polars/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ use polars::export::arrow;
use polars::prelude::*;
use pyo3::ffi::Py_uintptr_t;
use pyo3::prelude::*;

use pyo3::types::PyDict;
#[cfg(feature = "lazy")]
use {polars_lazy::frame::LazyFrame, polars_plan::plans::DslPlan};

Expand Down Expand Up @@ -126,7 +126,14 @@ impl<'a> FromPyObject<'a> for PySeries {
let py_name = name.str()?;
let name = py_name.to_cow()?;

let arr = ob.call_method0("to_arrow")?;
let kwargs = PyDict::new_bound(ob.py());
if let Ok(compat_level) = ob.call_method0("_newest_compat_level") {
let compat_level = compat_level.extract().unwrap();
let compat_level =
CompatLevel::with_level(compat_level).unwrap_or(CompatLevel::newest());
kwargs.set_item("compat_level", compat_level.get_level())?;
}
let arr = ob.call_method("to_arrow", (), Some(&kwargs))?;
let arr = ffi::to_rust::array_to_rust(&arr)?;
Ok(PySeries(
Series::try_from((&*name, arr)).map_err(PyPolarsErr::from)?,
Expand Down Expand Up @@ -165,13 +172,24 @@ impl IntoPy<PyObject> for PySeries {
fn into_py(self, py: Python<'_>) -> PyObject {
let polars = py.import_bound("polars").expect("polars not installed");
let s = polars.getattr("Series").unwrap();
match s.getattr("_import_arrow_from_c") {
match s
.getattr("_import_arrow_from_c")
.or_else(|_| s.getattr("_import_from_c"))
{
// Go via polars
Ok(import_arrow_from_c) => {
// Get supported compatibility level
let compat_level = CompatLevel::with_level(
s.getattr("_newest_compat_level")
.map_or(1, |newest_compat_level| {
newest_compat_level.call0().unwrap().extract().unwrap()
}),
)
.unwrap_or(CompatLevel::newest());
// Prepare pointers on the heap.
let mut chunk_ptrs = Vec::with_capacity(self.0.n_chunks());
for i in 0..self.0.n_chunks() {
let array = self.0.to_arrow(i, true);
let array = self.0.to_arrow(i, compat_level);
let schema = Box::leak(Box::new(arrow::ffi::export_field_to_c(
&ArrowField::new("", array.data_type().clone(), true),
)));
Expand Down Expand Up @@ -208,7 +226,7 @@ impl IntoPy<PyObject> for PySeries {
Err(_) => {
let s = self.0.rechunk();
let name = s.name();
let arr = s.to_arrow(0, false);
let arr = s.to_arrow(0, CompatLevel::oldest());
let pyarrow = py.import_bound("pyarrow").expect("pyarrow not installed");

let arg = to_py_array(arr, py, pyarrow).unwrap();
Expand Down
Loading