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

perf(rust, python): more conservative JIT sort settings #5080

Merged
merged 1 commit into from
Oct 3, 2022
Merged

perf(rust, python): more conservative JIT sort settings #5080

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions polars/polars-core/src/frame/hash_join/sort_merge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,15 +180,16 @@ pub(super) fn sort_or_hash_inner(
let size_factor_lhs = s_left.len() as f32 / s_right.len() as f32;
let size_factor_acceptable = std::env::var("POLARS_JOIN_SORT_FACTOR")
.map(|s| s.parse::<f32>().unwrap())
.unwrap_or(3.0);
.unwrap_or(1.0);
let is_numeric = s_left.is_numeric_physical();
match (s_left.is_sorted(), s_right.is_sorted()) {
(IsSorted::Ascending, IsSorted::Ascending) => {
if verbose {
eprintln!("inner join: keys are sorted: use sorted merge join");
}
(par_sorted_merge_inner(s_left, s_right), true)
}
(IsSorted::Ascending, _) if size_factor_rhs < size_factor_acceptable => {
(IsSorted::Ascending, _) if is_numeric && size_factor_rhs < size_factor_acceptable => {
if verbose {
eprintln!("right key will be reverse sorted in inner join operation.")
}
Expand All @@ -211,7 +212,7 @@ pub(super) fn sort_or_hash_inner(

((left, right), true)
}
(_, IsSorted::Ascending) if size_factor_lhs < size_factor_acceptable => {
(_, IsSorted::Ascending) if is_numeric && size_factor_lhs < size_factor_acceptable => {
if verbose {
eprintln!("left key will be reverse sorted in inner join operation.")
}
Expand Down Expand Up @@ -248,7 +249,8 @@ pub(super) fn sort_or_hash_left(s_left: &Series, s_right: &Series, verbose: bool
let size_factor_rhs = s_right.len() as f32 / s_left.len() as f32;
let size_factor_acceptable = std::env::var("POLARS_JOIN_SORT_FACTOR")
.map(|s| s.parse::<f32>().unwrap())
.unwrap_or(3.0);
.unwrap_or(1.0);
let is_numeric = s_left.is_numeric_physical();

match (s_left.is_sorted(), s_right.is_sorted()) {
(IsSorted::Ascending, IsSorted::Ascending) => {
Expand All @@ -258,7 +260,7 @@ pub(super) fn sort_or_hash_left(s_left: &Series, s_right: &Series, verbose: bool
let (left_idx, right_idx) = par_sorted_merge_left(s_left, s_right);
to_left_join_ids(left_idx, right_idx)
}
(IsSorted::Ascending, _) if size_factor_rhs < size_factor_acceptable => {
(IsSorted::Ascending, _) if is_numeric && size_factor_rhs < size_factor_acceptable => {
if verbose {
eprintln!("right key will be reverse sorted in left join operation.")
}
Expand Down