Skip to content

Commit

Permalink
Update itertools requirement from 0.13 to 0.14 (#13965)
Browse files Browse the repository at this point in the history
* Update itertools requirement from 0.13 to 0.14

Updates the requirements on [itertools](https://github.com/rust-itertools/itertools) to permit the latest version.
- [Changelog](https://github.com/rust-itertools/itertools/blob/master/CHANGELOG.md)
- [Commits](rust-itertools/itertools@v0.13.0...v0.13.0)

---
updated-dependencies:
- dependency-name: itertools
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* Fix build

* Simplify

* Update CLI lock

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: jonahgao <[email protected]>
  • Loading branch information
dependabot[bot] and jonahgao authored Jan 3, 2025
1 parent 264f4c5 commit 63265fd
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ futures = "0.3"
half = { version = "2.2.1", default-features = false }
hashbrown = { version = "0.14.5", features = ["raw"] }
indexmap = "2.0.0"
itertools = "0.13"
itertools = "0.14"
log = "^0.4"
object_store = { version = "0.11.0", default-features = false }
parking_lot = "0.12"
Expand Down
31 changes: 20 additions & 11 deletions datafusion-cli/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -1208,7 +1208,7 @@ fn ensure_distribution(
// We store the updated children in `new_children`.
let children = izip!(
children.into_iter(),
plan.required_input_ordering().iter(),
plan.required_input_ordering(),
plan.maintains_input_order(),
repartition_status_flags.into_iter()
)
Expand Down Expand Up @@ -1275,7 +1275,7 @@ fn ensure_distribution(
let ordering_satisfied = child
.plan
.equivalence_properties()
.ordering_satisfy_requirement(required_input_ordering);
.ordering_satisfy_requirement(&required_input_ordering);
if (!ordering_satisfied || !order_preserving_variants_desirable)
&& child.data
{
Expand Down
12 changes: 6 additions & 6 deletions datafusion/core/src/physical_optimizer/sanity_checker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -131,18 +131,18 @@ pub fn check_plan_sanity(
check_finiteness_requirements(Arc::clone(&plan), optimizer_options)?;

for ((idx, child), sort_req, dist_req) in izip!(
plan.children().iter().enumerate(),
plan.required_input_ordering().iter(),
plan.required_input_distribution().iter()
plan.children().into_iter().enumerate(),
plan.required_input_ordering(),
plan.required_input_distribution(),
) {
let child_eq_props = child.equivalence_properties();
if let Some(sort_req) = sort_req {
if !child_eq_props.ordering_satisfy_requirement(sort_req) {
if !child_eq_props.ordering_satisfy_requirement(&sort_req) {
let plan_str = get_plan_string(&plan);
return plan_err!(
"Plan: {:?} does not satisfy order requirements: {}. Child-{} order: {}",
plan_str,
format_physical_sort_requirement_list(sort_req),
format_physical_sort_requirement_list(&sort_req),
idx,
child_eq_props.oeq_class
);
Expand All @@ -151,7 +151,7 @@ pub fn check_plan_sanity(

if !child
.output_partitioning()
.satisfy(dist_req, child_eq_props)
.satisfy(&dist_req, child_eq_props)
{
let plan_str = get_plan_string(&plan);
return plan_err!(
Expand Down

0 comments on commit 63265fd

Please sign in to comment.