Skip to content

Commit 63265fd

Browse files
Update itertools requirement from 0.13 to 0.14 (#13965)
* 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]>
1 parent 264f4c5 commit 63265fd

File tree

4 files changed

+29
-20
lines changed

4 files changed

+29
-20
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ futures = "0.3"
129129
half = { version = "2.2.1", default-features = false }
130130
hashbrown = { version = "0.14.5", features = ["raw"] }
131131
indexmap = "2.0.0"
132-
itertools = "0.13"
132+
itertools = "0.14"
133133
log = "^0.4"
134134
object_store = { version = "0.11.0", default-features = false }
135135
parking_lot = "0.12"

datafusion-cli/Cargo.lock

Lines changed: 20 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

datafusion/core/src/physical_optimizer/enforce_distribution.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1208,7 +1208,7 @@ fn ensure_distribution(
12081208
// We store the updated children in `new_children`.
12091209
let children = izip!(
12101210
children.into_iter(),
1211-
plan.required_input_ordering().iter(),
1211+
plan.required_input_ordering(),
12121212
plan.maintains_input_order(),
12131213
repartition_status_flags.into_iter()
12141214
)
@@ -1275,7 +1275,7 @@ fn ensure_distribution(
12751275
let ordering_satisfied = child
12761276
.plan
12771277
.equivalence_properties()
1278-
.ordering_satisfy_requirement(required_input_ordering);
1278+
.ordering_satisfy_requirement(&required_input_ordering);
12791279
if (!ordering_satisfied || !order_preserving_variants_desirable)
12801280
&& child.data
12811281
{

datafusion/core/src/physical_optimizer/sanity_checker.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,18 +131,18 @@ pub fn check_plan_sanity(
131131
check_finiteness_requirements(Arc::clone(&plan), optimizer_options)?;
132132

133133
for ((idx, child), sort_req, dist_req) in izip!(
134-
plan.children().iter().enumerate(),
135-
plan.required_input_ordering().iter(),
136-
plan.required_input_distribution().iter()
134+
plan.children().into_iter().enumerate(),
135+
plan.required_input_ordering(),
136+
plan.required_input_distribution(),
137137
) {
138138
let child_eq_props = child.equivalence_properties();
139139
if let Some(sort_req) = sort_req {
140-
if !child_eq_props.ordering_satisfy_requirement(sort_req) {
140+
if !child_eq_props.ordering_satisfy_requirement(&sort_req) {
141141
let plan_str = get_plan_string(&plan);
142142
return plan_err!(
143143
"Plan: {:?} does not satisfy order requirements: {}. Child-{} order: {}",
144144
plan_str,
145-
format_physical_sort_requirement_list(sort_req),
145+
format_physical_sort_requirement_list(&sort_req),
146146
idx,
147147
child_eq_props.oeq_class
148148
);
@@ -151,7 +151,7 @@ pub fn check_plan_sanity(
151151

152152
if !child
153153
.output_partitioning()
154-
.satisfy(dist_req, child_eq_props)
154+
.satisfy(&dist_req, child_eq_props)
155155
{
156156
let plan_str = get_plan_string(&plan);
157157
return plan_err!(

0 commit comments

Comments
 (0)